Hi, Le 28/01/2013 18:42, Simon Paillard a écrit : > "Filtered diff", ignoring: […] I was preparing the same request in the mean time, and filtered even more material: the English part of the documentation is identical to the one you already reviewed and accepted in the manpages/3.44-1 unblock request, and the French part is just a bunch of PO files in sync with it. Once those parts removed, please find attached the minified debdiff. About the upstream Makefile change, please note that the checkdates and translate-dates (and obviously dist-% and release) are not used at build time, so there is no actual change on that side either. Regards David
diff -Nru --exclude po4a --exclude C --exclude debian-changes manpages-fr-3.42d1p1/debian/changelog manpages-fr-3.44d1p1/debian/changelog --- manpages-fr-3.42d1p1/debian/changelog 2012-09-15 05:42:51.000000000 -0400 +++ manpages-fr-3.44d1p1/debian/changelog 2012-11-29 17:54:24.000000000 -0400 @@ -1,3 +1,16 @@ +manpages-fr (3.44d1p1-1) unstable; urgency=low + + * New release, based on manpages 3.44-1 and perkamon 3.44-1: + + new manpages: getauxval.3 secure_getenv.3 + * Translate debian specific modifications: + + motd.5 updated and motd.tail removed: due to new behaviour of sysvinit + 2.88dsf-24 + + fputs.3: missing space in putc(c,stdout) + + resolv.conf.5: Document IPv6 format for nameserver + + stat.2: Clarify description of EOVERFLOW error + + -- Simon Paillard <spaillard@debian.org> Thu, 29 Nov 2012 22:40:19 +0100 + manpages-fr (3.42d1p1-1) unstable; urgency=low [ Simon Paillard ] diff -Nru --exclude po4a --exclude C --exclude debian-changes manpages-fr-3.42d1p1/debian/control manpages-fr-3.44d1p1/debian/control --- manpages-fr-3.42d1p1/debian/control 2012-06-23 17:58:29.000000000 -0400 +++ manpages-fr-3.44d1p1/debian/control 2012-11-16 17:16:00.000000000 -0400 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7), po4a (>= 0.39) Standards-Version: 3.9.3 Vcs-Git: git://anonscm.debian.org/pkg-manpages-fr/manpages-fr.git -Vcs-Browser: http://anonscm.debian.org/git/pkg-manpages-fr/manpages-fr.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-manpages-fr/manpages-fr.git Homepage: http://traduc.org/perkamon Package: manpages-fr diff -Nru --exclude po4a --exclude C --exclude debian-changes manpages-fr-3.42d1p1/perkamon-fr/Makefile manpages-fr-3.44d1p1/perkamon-fr/Makefile --- manpages-fr-3.42d1p1/perkamon-fr/Makefile 2012-08-19 04:34:03.000000000 -0400 +++ manpages-fr-3.44d1p1/perkamon-fr/Makefile 2012-11-16 14:44:16.000000000 -0400 @@ -1,4 +1,4 @@ -PERKVERSION = 3.42 +PERKVERSION = 3.44 FRPATCH = -1 PERKFRVERSION = $(PERKVERSION)$(FRPATCH) @@ -66,32 +66,26 @@ -rm -rf perkamon perkamon-$(PERKVERSION) perkamon-fr* -rm -rf build -rm -f po4a/*/po/fr.po~ + -rm -f tmp-date dist-%: cp README.$* build/$*/ tar jcf man-pages-$*-$(PERKFRVERSION).tar.bz2 --numeric-owner -C build $* + tar Jcf man-pages-$*-$(PERKFRVERSION).tar.xz --numeric-owner -C build $* -release: clean +release: clean perkamon-$(PERKVERSION).tar.bz2 -rm -rf perkamon-fr* mkdir perkamon-fr-$(PERKFRVERSION) cp perkamon-$(PERKVERSION).tar.bz2 perkamon-fr-$(PERKFRVERSION)/ cp Makefile* README* perkamon-fr-$(PERKFRVERSION)/ tar cf - --exclude=.svn po4a | tar xf - -C perkamon-fr-$(PERKFRVERSION) tar jchf perkamon-fr-$(PERKFRVERSION).tar.bz2 --numeric-owner perkamon-fr-$(PERKFRVERSION) + tar Jchf perkamon-fr-$(PERKFRVERSION).tar.xz --numeric-owner perkamon-fr-$(PERKFRVERSION) -# Detect wrong translations of dates -checkdates: +# Automatically update dates translations +translate-dates: @for f in po4a/*/po/fr.po; do \ - msgattrib --translated --no-fuzzy $$f |\ - sed -e '/^msgid "[0-9]*-[0-9][0-9]-[0-9][0-9]"/!d; # Only keep msgid with dates \ - N;h;s/.*\n//; # Append msgstr, copy into the hold space, and only keep msgstr \ - s/"\([^ ]*\)[ ]\([^ ]*\)[ ]\([^ ]*\)"/"\3-\2-\1"/; # Rewrite components into the same order as English ones \ - s/-\([1-9]\)"/-0\1"/; s/1er/01/; # Fix special cases \ - s/janvier/01/; s/février/02/; s/mars/03/; # Convert month names to numeric values \ - s/avril/04/; s/mai/05/; s/juin/06/; s/juillet/07/; s/août/08/; # \ - s/septembre/09/; s/octobre/10/; s/novembre/11/; s/décembre/12/; # \ - H;g; # Append to the hold space, and copy into the pattern space \ - /msgid \(.*\)\n.*\nmsgstr \1$$/d; # Delete if first and last lines are identical \ - s/[^\n]*$$//'; done + ./translate-dates.pl < $$f > tmp-date && mv tmp-date $$f ; \ + done .PHONY: unpack setup translate stats disable-removed print-new-files clean release FORCE Les fichiers binaires /tmp/4Zand83HDS/manpages-fr-3.42d1p1/perkamon-fr/perkamon-3.42.tar.bz2 et /tmp/0flt9haAD8/manpages-fr-3.44d1p1/perkamon-fr/perkamon-3.42.tar.bz2 sont différents Les fichiers binaires /tmp/4Zand83HDS/manpages-fr-3.42d1p1/perkamon-fr/perkamon-3.44.tar.bz2 et /tmp/0flt9haAD8/manpages-fr-3.44d1p1/perkamon-fr/perkamon-3.44.tar.bz2 sont différents
Attachment:
signature.asc
Description: OpenPGP digital signature