Hello community, here is the log from the commit of package pv for openSUSE:Factory checked in at 2014-12-08 16:56:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pv (Old) and /work/SRC/openSUSE:Factory/.pv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pv" Changes: -------- --- /work/SRC/openSUSE:Factory/pv/pv.changes 2014-05-06 17:42:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pv.new/pv.changes 2014-12-08 16:56:44.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Dec 8 00:36:36 UTC 2014 - [email protected] + +- Update to new upstream release 1.5.7 +* show KiB instead of incorrect kiB +* work around awk bug in tests/016-numeric-timer in decimal "," + locales + +------------------------------------------------------------------- Old: ---- pv-1.5.3.tar.bz2 pv-1.5.3.tar.bz2.txt New: ---- pv-1.5.7.tar.bz2 pv-1.5.7.tar.bz2.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pv.spec ++++++ --- /var/tmp/diff_new_pack.lCIyUc/_old 2014-12-08 16:56:45.000000000 +0100 +++ /var/tmp/diff_new_pack.lCIyUc/_new 2014-12-08 16:56:45.000000000 +0100 @@ -17,7 +17,7 @@ Name: pv -Version: 1.5.3 +Version: 1.5.7 Release: 0 Summary: PipeViewer - Monitor the Progress of Data through Pipes License: Artistic-2.0 ++++++ pv-1.5.3.tar.bz2 -> pv-1.5.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/README new/pv-1.5.7/README --- old/pv-1.5.3/README 2014-05-05 00:14:04.000000000 +0200 +++ new/pv-1.5.7/README 2014-07-09 01:30:42.000000000 +0200 @@ -60,16 +60,17 @@ Jakub Hrozek <[email protected]> - Fedora package maintainer - Kevin Coyner <[email protected]> + Antoine Beaupré <[email protected]> - Debian package maintainer - C�dric Delfosse <[email protected]> - - previous Debian package maintainer + Kevin Coyner <[email protected]> + Cédric Delfosse <[email protected]> + - previous Debian package maintainers Eduardo Aguiar <[email protected]> - provided Portuguese (Brazilian) translation - St�phane Lacasse <[email protected]> + Stéphane Lacasse <[email protected]> - provided French translation Marcos Kreinacke <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/autoconf/configure.in new/pv-1.5.7/autoconf/configure.in --- old/pv-1.5.3/autoconf/configure.in 2013-02-19 22:56:52.000000000 +0100 +++ new/pv-1.5.7/autoconf/configure.in 2014-08-27 00:00:20.000000000 +0200 @@ -83,7 +83,6 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET -AC_CHECK_PROG(DO_GZIP, gzip, gzip -f9, touch) dnl AIX needs -lc128 dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/autoconf/make/filelist.mk~ new/pv-1.5.7/autoconf/make/filelist.mk~ --- old/pv-1.5.3/autoconf/make/filelist.mk~ 2014-05-05 00:17:45.000000000 +0200 +++ new/pv-1.5.7/autoconf/make/filelist.mk~ 2014-08-27 00:45:52.000000000 +0200 @@ -1,6 +1,6 @@ # Automatically generated file listings # -# Creation time: Sun May 4 23:17:45 BST 2014 +# Creation time: Tue Aug 26 23:45:51 BST 2014 allsrc = src/library/getopt.c \ src/library/gettext.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/autoconf/make/modules.mk~ new/pv-1.5.7/autoconf/make/modules.mk~ --- old/pv-1.5.3/autoconf/make/modules.mk~ 2014-05-05 00:17:45.000000000 +0200 +++ new/pv-1.5.7/autoconf/make/modules.mk~ 2014-08-27 00:45:52.000000000 +0200 @@ -1,6 +1,6 @@ # Automatically generated module linking rules # -# Creation time: Sun May 4 23:17:45 BST 2014 +# Creation time: Tue Aug 26 23:45:51 BST 2014 src/library.o: src/library/getopt.o src/library/gettext.o $(LD) $(LDFLAGS) -o $@ src/library/getopt.o src/library/gettext.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/autoconf/make/unreal.mk new/pv-1.5.7/autoconf/make/unreal.mk --- old/pv-1.5.3/autoconf/make/unreal.mk 2012-06-14 22:18:35.000000000 +0200 +++ new/pv-1.5.7/autoconf/make/unreal.mk 2014-08-27 00:51:42.000000000 +0200 @@ -7,7 +7,7 @@ index manhtml indent update-po \ doc dist release \ install uninstall \ - rpmbuild rpm srpm + rpm srpm all: $(alltarg) $(CATALOGS) @@ -83,7 +83,7 @@ distclean: clean depclean rm -f $(alltarg) src/include/config.h - rm -rf $(package)-$(version).tar* $(package)-$(version) + rm -rf $(package)-$(version).tar* $(package)-$(version) $(package)-$(version)-*.rpm rm -f *.html config.* rm Makefile @@ -132,7 +132,7 @@ rm -rf DUMMY `find $(package)-$(version) -type d -name .svn` tar cf $(package)-$(version).tar $(package)-$(version) rm -rf $(package)-$(version) - $(DO_GZIP) $(package)-$(version).tar + -gzip -f9 $(package)-$(version).tar check test: $(alltarg) sh $(srcdir)/autoconf/scripts/run-test.sh ./$(package) $(srcdir) @@ -146,7 +146,6 @@ "$(DESTDIR)$(bindir)/$(package)" $(INSTALL) -m 644 doc/quickref.1 \ "$(DESTDIR)$(mandir)/man1/$(package).1" - -$(DO_GZIP) "$(DESTDIR)$(mandir)/man1/$(package).1" if test -n "$(CATALOGS)"; then \ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ @@ -182,32 +181,21 @@ done; \ fi -rpmbuild: - echo macrofiles: `rpm --showrc \ - | grep ^macrofiles \ - | cut -d : -f 2- \ - | sed 's,^[^/]*/,/,'`:`pwd`/rpmmacros > rpmrc - echo %_topdir `pwd`/rpm > rpmmacros - rm -rf rpm - mkdir rpm - mkdir rpm/SPECS rpm/BUILD rpm/SOURCES rpm/RPMS rpm/SRPMS - -cat /usr/lib/rpm/rpmrc /etc/rpmrc $$HOME/.rpmrc \ - | grep -hsv ^macrofiles \ - >> rpmrc - rpm: test -e $(package)-$(version).tar.gz || $(MAKE) dist - test -e rpmrc || $(MAKE) rpmbuild - rpmbuild $(RPMFLAGS) --rcfile=rpmrc -tb $(package)-$(version).tar.gz + rpmbuild $(RPMFLAGS) --define="%_topdir `pwd`/rpm" -tb $(package)-$(version).tar.gz mv rpm/RPMS/*/$(package)-*.rpm . - rm -rf rpm rpmmacros rpmrc + rm -rf rpm srpm: test -e $(package)-$(version).tar.gz || $(MAKE) dist - test -e rpmrc || $(MAKE) rpmbuild - rpmbuild $(RPMFLAGS) --rcfile=rpmrc -ts $(package)-$(version).tar.gz + rpmbuild $(RPMFLAGS) --define="%_topdir `pwd`/rpm" -ts $(package)-$(version).tar.gz mv rpm/SRPMS/*$(package)-*.rpm . - rm -rf rpm rpmmacros rpmrc + rm -rf rpm release: dist rpm srpm zcat $(package)-$(version).tar.gz | bzip2 > $(package)-$(version).tar.bz2 + -grep -Fq '%_gpg_name' ~/.rpmmacros 2>/dev/null && rpm --addsign *.rpm + -gpg --list-secret-keys 2>&1 | grep -Fq 'uid' && gpg -ab *.tar.gz && rename .asc .txt *.tar.gz.asc + -gpg --list-secret-keys 2>&1 | grep -Fq 'uid' && gpg -ab *.tar.bz2 && rename .asc .txt *.tar.bz2.asc + chmod 644 $(package)-$(version)* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/autoconf/make/vars.mk new/pv-1.5.7/autoconf/make/vars.mk --- old/pv-1.5.3/autoconf/make/vars.mk 2013-07-16 11:54:37.000000000 +0200 +++ new/pv-1.5.7/autoconf/make/vars.mk 2014-08-27 00:00:38.000000000 +0200 @@ -30,7 +30,6 @@ @SET_MAKE@ SHELL = /bin/sh CC = @CC@ -DO_GZIP = @DO_GZIP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ UNINSTALL = rm -f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/configure new/pv-1.5.7/configure --- old/pv-1.5.3/configure 2014-05-05 00:17:40.000000000 +0200 +++ new/pv-1.5.7/configure 2014-08-27 00:45:47.000000000 +0200 @@ -649,7 +649,6 @@ EGREP GREP CPP -DO_GZIP SET_MAKE INSTALL_DATA INSTALL_SCRIPT @@ -2993,44 +2992,6 @@ SET_MAKE="MAKE=${MAKE-make}" fi -# Extract the first word of "gzip", so it can be a program name with args. -set dummy gzip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DO_GZIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$DO_GZIP"; then - ac_cv_prog_DO_GZIP="$DO_GZIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DO_GZIP="gzip -f9" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_DO_GZIP" && ac_cv_prog_DO_GZIP="touch" -fi -fi -DO_GZIP=$ac_cv_prog_DO_GZIP -if test -n "$DO_GZIP"; then - { $as_echo "$as_me:$LINENO: result: $DO_GZIP" >&5 -$as_echo "$DO_GZIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - ac_ext=c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/NEWS new/pv-1.5.7/doc/NEWS --- old/pv-1.5.3/doc/NEWS 2014-05-05 00:15:15.000000000 +0200 +++ new/pv-1.5.7/doc/NEWS 2014-08-27 00:40:11.000000000 +0200 @@ -1,3 +1,9 @@ +1.5.7 - 26 August 2014 + - show KiB instead of incorrect kiB (Debian bug #706175) + - (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn) + - work around "awk" bug in tests/016-numeric-timer in decimal "," locales + - fix "make rpm" and "make srpm", extend "make release" to sign releases + 1.5.3 - 4 May 2014 - remove SPLICE_F_NONBLOCK to fix problem with slow splice() (Jan Seda) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/TODO new/pv-1.5.7/doc/TODO --- old/pv-1.5.3/doc/TODO 2014-05-05 00:14:43.000000000 +0200 +++ new/pv-1.5.7/doc/TODO 2014-08-27 00:39:20.000000000 +0200 @@ -8,13 +8,14 @@ - option "--progress-from FILE", read last number and use it as bytes read: pv --progress-from <( while sleep 1; do du -sb somedir; done ) -s 123g (Jacek Wielemborek) + - (Debian #507682) adjustable averaging window for rate display - (#1293) check transfer buffer usage on large memory systems - - (#1284) fix install on OSes without man page .gz (Bob Friesenhahn) - (#1286) option for process title (Martin Sarsale) as "pv - name:FooProcess -xyz - transferred: 1.3GB - 500KB/s - running: 10:15:30s" - (#1290) look at effect of O_SYNC or fsync on performance - (#1281) option (-x?) to use xterm title line for status (Joachim Haga) - (#1287) if the first pv exits, should the second become IPC leader? + - add "-y" option suggested by Valentin LAB - add development support for http://clang.llvm.org/StaticAnalysis.html - stats for avg/min/max/stddev throughput (Venky.N.Iyer) - option to enable O_DIRECT (Romain Kang) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/VERSION new/pv-1.5.7/doc/VERSION --- old/pv-1.5.3/doc/VERSION 2014-05-05 00:15:39.000000000 +0200 +++ new/pv-1.5.7/doc/VERSION 2014-08-27 00:40:17.000000000 +0200 @@ -1 +1 @@ -1.5.3 +1.5.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/lsm new/pv-1.5.7/doc/lsm --- old/pv-1.5.3/doc/lsm 2014-05-05 00:18:22.000000000 +0200 +++ new/pv-1.5.7/doc/lsm 2014-08-27 00:53:42.000000000 +0200 @@ -1,7 +1,7 @@ Begin3 Title: pv -Version: 1.5.3 -Entered-date: 04MAY14 +Version: 1.5.7 +Entered-date: 26AUG14 Description: A tool for monitoring the progress of data through a pipeline. It can be inserted into any normal pipeline between two processes to give a visual indication of how diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/lsm.in new/pv-1.5.7/doc/lsm.in --- old/pv-1.5.3/doc/lsm.in 2014-05-05 00:16:00.000000000 +0200 +++ new/pv-1.5.7/doc/lsm.in 2014-08-27 00:42:28.000000000 +0200 @@ -1,7 +1,7 @@ Begin3 Title: @PACKAGE@ Version: @VERSION@ -Entered-date: 04MAY14 +Entered-date: 26AUG14 Description: A tool for monitoring the progress of data through a pipeline. It can be inserted into any normal pipeline between two processes to give a visual indication of how diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/pv.spec new/pv-1.5.7/doc/pv.spec --- old/pv-1.5.3/doc/pv.spec 2014-05-05 00:18:22.000000000 +0200 +++ new/pv-1.5.7/doc/pv.spec 2014-08-27 00:53:42.000000000 +0200 @@ -1,10 +1,10 @@ Summary: Monitor the progress of data through a pipe Name: pv -Version: 1.5.3 +Version: 1.5.7 Release: 1%{?dist} License: Artistic 2.0 Group: Development/Tools -Source: http://www.ivarch.com/programs/sources/pv-1.5.3.tar.gz +Source: http://www.ivarch.com/programs/sources/pv-1.5.7.tar.gz Url: http://www.ivarch.com/programs/pv.shtml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -46,6 +46,15 @@ %doc README doc/NEWS doc/TODO doc/COPYING %changelog +* Tue Aug 26 2014 Andrew Wood <[email protected]> 1.5.7-1 +- show KiB instead of incorrect kiB (Debian bug #706175) +- (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn) +- work around "awk" bug in tests/016-numeric-timer in decimal "," locales +- fix "make rpm" and "make srpm", extend "make release" to sign releases + +* Sun May 4 2014 Andrew Wood <[email protected]> 1.5.3-1 +- remove SPLICE_F_NONBLOCK to fix problem with slow splice() (Jan Seda) + * Mon Feb 10 2014 Andrew Wood <[email protected]> 1.5.2-1 - allow "--watchfd" to look at block devices - let "--watchfd PID:FD" work with "--size N" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/quickref.1.in new/pv-1.5.7/doc/quickref.1.in --- old/pv-1.5.3/doc/quickref.1.in 2014-05-05 00:15:57.000000000 +0200 +++ new/pv-1.5.7/doc/quickref.1.in 2014-08-27 00:42:50.000000000 +0200 @@ -1,4 +1,4 @@ -.TH @UCPACKAGE@ 1 "May 2014" Linux "User Manuals" +.TH @UCPACKAGE@ 1 "August 2014" Linux "User Manuals" .SH NAME @PACKAGE@ \- monitor the progress of data through a pipe .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/doc/spec.in new/pv-1.5.7/doc/spec.in --- old/pv-1.5.3/doc/spec.in 2014-02-10 23:57:05.000000000 +0100 +++ new/pv-1.5.7/doc/spec.in 2014-08-27 00:44:01.000000000 +0200 @@ -46,6 +46,15 @@ %doc README doc/NEWS doc/TODO doc/COPYING %changelog +* Tue Aug 26 2014 Andrew Wood <[email protected]> 1.5.7-1 +- show KiB instead of incorrect kiB (Debian bug #706175) +- (#1284) do not gzip man page, for non-Linux OSes (Bob Friesenhahn) +- work around "awk" bug in tests/016-numeric-timer in decimal "," locales +- fix "make rpm" and "make srpm", extend "make release" to sign releases + +* Sun May 4 2014 Andrew Wood <[email protected]> 1.5.3-1 +- remove SPLICE_F_NONBLOCK to fix problem with slow splice() (Jan Seda) + * Mon Feb 10 2014 Andrew Wood <[email protected]> 1.5.2-1 - allow "--watchfd" to look at block devices - let "--watchfd PID:FD" work with "--size N" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/src/nls/de.po new/pv-1.5.7/src/nls/de.po --- old/pv-1.5.3/src/nls/de.po 2014-05-05 00:18:24.000000000 +0200 +++ new/pv-1.5.7/src/nls/de.po 2014-08-27 00:59:02.000000000 +0200 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 23:16+0100\n" +"POT-Creation-Date: 2014-08-26 23:44+0100\n" "Content-Type: text/plain; charset=iso-8859-15\n" "Date: 1999-06-01 15:18:29+0100\n" "From: Andrew Wood <ivarch@ubik>\n" @@ -75,27 +75,31 @@ msgid "input file is output file" msgstr "Eingabe-Datei ist Ausgabe-Datei" -#: src/pv/display.c:95 +#: src/pv/display.c:100 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:488 src/pv/transfer.c:507 +#: src/pv/display.c:105 +msgid "yzafpnum KMGTPEZY" +msgstr "" + +#: src/pv/display.c:499 src/pv/transfer.c:507 msgid "buffer allocation failed" msgstr "Puffer konnte nicht allokiert werden" -#: src/pv/display.c:547 src/pv/transfer.c:285 +#: src/pv/display.c:558 src/pv/transfer.c:285 msgid "B" msgstr "B" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "/s" msgstr "" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "B/s" msgstr "" -#: src/pv/display.c:624 +#: src/pv/display.c:635 msgid "ETA" msgstr "ETA" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/src/nls/fr.po new/pv-1.5.7/src/nls/fr.po --- old/pv-1.5.3/src/nls/fr.po 2014-05-05 00:18:24.000000000 +0200 +++ new/pv-1.5.7/src/nls/fr.po 2014-08-27 00:59:02.000000000 +0200 @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 23:16+0100\n" +"POT-Creation-Date: 2014-08-26 23:44+0100\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Date: 1999-06-01 15:18:29+0100\n" "From: Andrew Wood <ivarch@ubik>\n" @@ -75,28 +75,32 @@ msgid "input file is output file" msgstr "fichiers d'entr� et de sortie sont les m�mes" -#: src/pv/display.c:95 +#: src/pv/display.c:100 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:488 src/pv/transfer.c:507 +#: src/pv/display.c:105 +msgid "yzafpnum KMGTPEZY" +msgstr "" + +#: src/pv/display.c:499 src/pv/transfer.c:507 msgid "buffer allocation failed" msgstr "l'allocation de m�moire tampon a �chou�" -#: src/pv/display.c:547 src/pv/transfer.c:285 +#: src/pv/display.c:558 src/pv/transfer.c:285 msgid "B" msgstr "O" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "/s" msgstr "/s" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 #, fuzzy msgid "B/s" msgstr "O/s" -#: src/pv/display.c:624 +#: src/pv/display.c:635 msgid "ETA" msgstr "ETA" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/src/nls/pl.po new/pv-1.5.7/src/nls/pl.po --- old/pv-1.5.3/src/nls/pl.po 2014-05-05 00:18:24.000000000 +0200 +++ new/pv-1.5.7/src/nls/pl.po 2014-08-27 00:59:02.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 23:16+0100\n" +"POT-Creation-Date: 2014-08-26 23:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -72,27 +72,31 @@ msgid "input file is output file" msgstr "plik wej�ciowy jest zarazem plikiem wyj�ciowym" -#: src/pv/display.c:95 +#: src/pv/display.c:100 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:488 src/pv/transfer.c:507 +#: src/pv/display.c:105 +msgid "yzafpnum KMGTPEZY" +msgstr "" + +#: src/pv/display.c:499 src/pv/transfer.c:507 msgid "buffer allocation failed" msgstr "nie uda�o si� zaalokowa� bufora" -#: src/pv/display.c:547 src/pv/transfer.c:285 +#: src/pv/display.c:558 src/pv/transfer.c:285 msgid "B" msgstr "B" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "/s" msgstr "/s" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "B/s" msgstr "B/s" -#: src/pv/display.c:624 +#: src/pv/display.c:635 msgid "ETA" msgstr "ETA" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/src/nls/pt.po new/pv-1.5.7/src/nls/pt.po --- old/pv-1.5.3/src/nls/pt.po 2014-05-05 00:18:24.000000000 +0200 +++ new/pv-1.5.7/src/nls/pt.po 2014-08-27 00:59:02.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 23:16+0100\n" +"POT-Creation-Date: 2014-08-26 23:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -70,27 +70,31 @@ msgid "input file is output file" msgstr "os arquivos de entrada e sa�da s�o o mesmo" -#: src/pv/display.c:95 +#: src/pv/display.c:100 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:488 src/pv/transfer.c:507 +#: src/pv/display.c:105 +msgid "yzafpnum KMGTPEZY" +msgstr "" + +#: src/pv/display.c:499 src/pv/transfer.c:507 msgid "buffer allocation failed" msgstr "erro alocando o buffer" -#: src/pv/display.c:547 src/pv/transfer.c:285 +#: src/pv/display.c:558 src/pv/transfer.c:285 msgid "B" msgstr "" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "/s" msgstr "" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "B/s" msgstr "B/s" -#: src/pv/display.c:624 +#: src/pv/display.c:635 msgid "ETA" msgstr "ETA" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/src/nls/pv.pot new/pv-1.5.7/src/nls/pv.pot --- old/pv-1.5.3/src/nls/pv.pot 2014-05-05 00:16:18.000000000 +0200 +++ new/pv-1.5.7/src/nls/pv.pot 2014-08-27 00:44:36.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-04 23:16+0100\n" +"POT-Creation-Date: 2014-08-26 23:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -69,27 +69,31 @@ msgid "input file is output file" msgstr "" -#: src/pv/display.c:95 +#: src/pv/display.c:100 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:488 src/pv/transfer.c:507 +#: src/pv/display.c:105 +msgid "yzafpnum KMGTPEZY" +msgstr "" + +#: src/pv/display.c:499 src/pv/transfer.c:507 msgid "buffer allocation failed" msgstr "" -#: src/pv/display.c:547 src/pv/transfer.c:285 +#: src/pv/display.c:558 src/pv/transfer.c:285 msgid "B" msgstr "" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "/s" msgstr "" -#: src/pv/display.c:583 src/pv/display.c:591 +#: src/pv/display.c:594 src/pv/display.c:602 msgid "B/s" msgstr "" -#: src/pv/display.c:624 +#: src/pv/display.c:635 msgid "ETA" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/src/pv/display.c new/pv-1.5.7/src/pv/display.c --- old/pv-1.5.3/src/pv/display.c 2014-05-05 00:16:15.000000000 +0200 +++ new/pv-1.5.7/src/pv/display.c 2014-08-27 00:44:24.000000000 +0200 @@ -73,35 +73,46 @@ /* * Given a long double value, it is divided or multiplied by the ratio until - * a value in the range 1.0 to 999.999... is found. The string "prefix" to + * a value in the range 1.0 to 999.999... is found. The string "prefix" to * is updated to the corresponding SI prefix. * * If "is_bytes" is 1, then the second byte of "prefix" is set to "i" to - * denote MiB etc (IEEE1541). Thus "prefix" should be at least 3 bytes long + * denote MiB etc (IEEE1541). Thus "prefix" should be at least 3 bytes long * (to include the terminating null). * * Submitted by Henry Gebhardt <[email protected]> and then - * modified. Further changed after input from Thomas Rachel. + * modified. Further changed after input from Thomas Rachel; changed still + * further after Debian bug #706175. */ static void pv__si_prefix(long double *value, char *prefix, const long double ratio, int is_bytes) { - static char *pfx = NULL; - static char const *pfx_middle = NULL; + static char *pfx_000 = NULL; /* kilo, mega, etc */ + static char *pfx_024 = NULL; /* kibi, mibi, etc */ + static char const *pfx_middle_000 = NULL; + static char const *pfx_middle_024 = NULL; + char *pfx; + char const *pfx_middle; char const *i; long double cutoff; - if (NULL == pfx) { - pfx = _("yzafpnum kMGTPEZY"); + if (NULL == pfx_000) { + pfx_000 = _("yzafpnum kMGTPEZY"); + pfx_middle_000 = strchr(pfx_000, ' '); } - if (NULL == pfx_middle) { - /* - * We can't assign this in the declaration above because - * that wouldn't be constant, so we do it here. - */ - pfx_middle = strchr(pfx, ' '); + if (NULL == pfx_024) { + pfx_024 = _("yzafpnum KMGTPEZY"); + pfx_middle_024 = strchr(pfx_024, ' '); } + + pfx = pfx_000; + pfx_middle = pfx_middle_000; + if (is_bytes) { + pfx = pfx_024; + pfx_middle = pfx_middle_024; + } + i = pfx_middle; prefix[0] = ' '; /* Make the prefix start blank. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pv-1.5.3/tests/016-numeric-timer new/pv-1.5.7/tests/016-numeric-timer --- old/pv-1.5.3/tests/016-numeric-timer 2012-11-06 00:44:23.000000000 +0100 +++ new/pv-1.5.7/tests/016-numeric-timer 2014-07-05 23:42:55.000000000 +0200 @@ -14,7 +14,7 @@ # test `wc -l < $TMP1` -gt 8 test `wc -l < $TMP1` -lt 13 -test `awk '{print int(10*$1)}' < "$TMP1" | sort -n | uniq | wc -l` -gt 7 +test `tr , . < "$TMP1" | awk '{print int(10*$1)}' | sort -n | uniq | wc -l` -gt 7 test `sed -n '$p' < $TMP1 | awk '{print $2}'` -eq 100 # EOF -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
