Your message dated Sat, 8 Dec 2012 16:03:40 +0100 with message-id <20121208150340.GO5634@radis.cristau.org> and subject line Re: Bug#692074: unblock: procps/1:3.3.5-1 has caused the Debian Bug report #692074, regarding unblock: procps/1:3.3.5-1 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 692074: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692074 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: procps/1:3.3.5-1
- From: Craig Small <csmall@debian.org>
- Date: Fri, 02 Nov 2012 08:57:28 +1100
- Message-id: <20121101215728.30763.56782.reportbug@elmo.enc.com.au>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package procps procps 3.3.5-1 is blocked because libproc1 is new. The problem is that the oldest libproc0 will not work with 3.3.5-1 because the API changed. This means current if you install procps 3.3.4 with libproc0 3.3.4 you have an unbootable system. Critical bug 691847 is against procps 3.3.4 but I'd like this cleared up. unblock procps/1:3.3.5-1 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores) Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dashdiff -Nru procps-3.3.4/configure procps-3.3.5/configure --- procps-3.3.4/configure 2012-10-29 22:04:42.000000000 +1100 +++ procps-3.3.5/configure 2012-10-30 22:24:28.000000000 +1100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for procps-ng 3.3.4. +# Generated by GNU Autoconf 2.69 for procps-ng 3.3.5. # # Report bugs to <procps@freelists.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='procps-ng' PACKAGE_TARNAME='procps-ng' -PACKAGE_VERSION='3.3.4' -PACKAGE_STRING='procps-ng 3.3.4' +PACKAGE_VERSION='3.3.5' +PACKAGE_STRING='procps-ng 3.3.5' PACKAGE_BUGREPORT='procps@freelists.org' PACKAGE_URL='http://gitorious.org/procps' @@ -1359,7 +1359,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures procps-ng 3.3.4 to adapt to many kinds of systems. +\`configure' configures procps-ng 3.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1429,7 +1429,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of procps-ng 3.3.4:";; + short | recursive ) echo "Configuration of procps-ng 3.3.5:";; esac cat <<\_ACEOF @@ -1559,7 +1559,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -procps-ng configure 3.3.4 +procps-ng configure 3.3.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2039,7 +2039,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by procps-ng $as_me 3.3.4, which was +It was created by procps-ng $as_me 3.3.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ # Define the identity of the package. PACKAGE='procps-ng' - VERSION='3.3.4' + VERSION='3.3.5' cat >>confdefs.h <<_ACEOF @@ -16644,7 +16644,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by procps-ng $as_me 3.3.4, which was +This file was extended by procps-ng $as_me 3.3.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16711,7 +16711,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -procps-ng config.status 3.3.4 +procps-ng config.status 3.3.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru procps-3.3.4/debian/changelog procps-3.3.5/debian/changelog --- procps-3.3.4/debian/changelog 2012-10-29 22:36:52.000000000 +1100 +++ procps-3.3.5/debian/changelog 2012-10-30 22:36:28.000000000 +1100 @@ -1,3 +1,12 @@ +procps (1:3.3.5-1) unstable; urgency=low + + * New upstream version + * bumped SONAME of packages Closes: #691847 + * Stop SIGFPE on vmstat at times Closes: #677903 + * Upstream took freebsd bug patch + + -- Craig Small <csmall@debian.org> Tue, 30 Oct 2012 22:26:52 +1100 + procps (1:3.3.4-1) unstable; urgency=low * New upstream version diff -Nru procps-3.3.4/debian/clean procps-3.3.5/debian/clean --- procps-3.3.4/debian/clean 1970-01-01 10:00:00.000000000 +1000 +++ procps-3.3.5/debian/clean 2012-10-30 22:43:23.000000000 +1100 @@ -0,0 +1 @@ +.version diff -Nru procps-3.3.4/debian/control procps-3.3.5/debian/control --- procps-3.3.4/debian/control 2012-05-20 16:47:39.000000000 +1000 +++ procps-3.3.5/debian/control 2012-10-30 22:27:47.000000000 +1100 @@ -25,7 +25,7 @@ It contains free, kill, pkill, pgrep, pmap, ps, pwdx, skill, slabtop, snice, sysctl, tload, top, uptime, vmstat, w, and watch. -Package: libprocps0 +Package: libprocps1 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -38,11 +38,11 @@ This package contains the shared libraries necessary to run programs compilied with libprocps. -Package: libprocps0-dev +Package: libprocps1-dev Architecture: any Section: libdevel Priority: optional -Depends: libprocps0 (=${binary:Version}), libc-dev, ${misc:Depends} +Depends: libprocps1 (=${binary:Version}), libc-dev, ${misc:Depends} Provides: libprocps-dev Conflicts: libproc-dev Replaces: libproc-dev diff -Nru procps-3.3.4/debian/libprocps0-dev.dirs procps-3.3.5/debian/libprocps0-dev.dirs --- procps-3.3.4/debian/libprocps0-dev.dirs 2012-05-20 16:08:37.000000000 +1000 +++ procps-3.3.5/debian/libprocps0-dev.dirs 1970-01-01 10:00:00.000000000 +1000 @@ -1,2 +0,0 @@ -usr/lib -usr/include/proc diff -Nru procps-3.3.4/debian/libprocps0-dev.install.in procps-3.3.5/debian/libprocps0-dev.install.in --- procps-3.3.4/debian/libprocps0-dev.install.in 2012-05-20 16:08:37.000000000 +1000 +++ procps-3.3.5/debian/libprocps0-dev.install.in 1970-01-01 10:00:00.000000000 +1000 @@ -1,4 +0,0 @@ -usr/include/proc/*.h -usr/lib/${DEB_HOST_MULTIARCH}/libprocps.a -usr/lib/${DEB_HOST_MULTIARCH}/libprocps.la -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/* diff -Nru procps-3.3.4/debian/libprocps0-dev.links.in procps-3.3.5/debian/libprocps0-dev.links.in --- procps-3.3.4/debian/libprocps0-dev.links.in 2012-05-20 16:08:37.000000000 +1000 +++ procps-3.3.5/debian/libprocps0-dev.links.in 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -lib/${DEB_HOST_MULTIARCH}/libprocps.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so diff -Nru procps-3.3.4/debian/libprocps0-dev.README procps-3.3.5/debian/libprocps0-dev.README --- procps-3.3.4/debian/libprocps0-dev.README 2012-05-20 16:08:37.000000000 +1000 +++ procps-3.3.5/debian/libprocps0-dev.README 1970-01-01 10:00:00.000000000 +1000 @@ -1,12 +0,0 @@ -README for libproc-dev -====================== - -This README is for people who want to use the libraries for their own -programs. If you just want to use procps tools you don't need to use this -and you can probably remove libproc-dev too. - -It is generally a bad idea to dynamically link to libproc. The API changes -a fair bit and I cannot guarantee that it will stay the same between minor -versions (though it will stay the same between Debian versions). I've now -re-included the libproc.a file so use that. - diff -Nru procps-3.3.4/debian/libprocps0.install.in procps-3.3.5/debian/libprocps0.install.in --- procps-3.3.4/debian/libprocps0.install.in 2012-05-20 16:08:37.000000000 +1000 +++ procps-3.3.5/debian/libprocps0.install.in 1970-01-01 10:00:00.000000000 +1000 @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so.* lib/${DEB_HOST_MULTIARCH}/ diff -Nru procps-3.3.4/debian/libprocps1-dev.dirs procps-3.3.5/debian/libprocps1-dev.dirs --- procps-3.3.4/debian/libprocps1-dev.dirs 1970-01-01 10:00:00.000000000 +1000 +++ procps-3.3.5/debian/libprocps1-dev.dirs 2012-05-20 16:08:37.000000000 +1000 @@ -0,0 +1,2 @@ +usr/lib +usr/include/proc diff -Nru procps-3.3.4/debian/libprocps1-dev.install.in procps-3.3.5/debian/libprocps1-dev.install.in --- procps-3.3.4/debian/libprocps1-dev.install.in 1970-01-01 10:00:00.000000000 +1000 +++ procps-3.3.5/debian/libprocps1-dev.install.in 2012-05-20 16:08:37.000000000 +1000 @@ -0,0 +1,4 @@ +usr/include/proc/*.h +usr/lib/${DEB_HOST_MULTIARCH}/libprocps.a +usr/lib/${DEB_HOST_MULTIARCH}/libprocps.la +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/* diff -Nru procps-3.3.4/debian/libprocps1-dev.links.in procps-3.3.5/debian/libprocps1-dev.links.in --- procps-3.3.4/debian/libprocps1-dev.links.in 1970-01-01 10:00:00.000000000 +1000 +++ procps-3.3.5/debian/libprocps1-dev.links.in 2012-10-30 22:31:38.000000000 +1100 @@ -0,0 +1 @@ +lib/${DEB_HOST_MULTIARCH}/libprocps.so.1 usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so diff -Nru procps-3.3.4/debian/libprocps1-dev.README procps-3.3.5/debian/libprocps1-dev.README --- procps-3.3.4/debian/libprocps1-dev.README 1970-01-01 10:00:00.000000000 +1000 +++ procps-3.3.5/debian/libprocps1-dev.README 2012-05-20 16:08:37.000000000 +1000 @@ -0,0 +1,12 @@ +README for libproc-dev +====================== + +This README is for people who want to use the libraries for their own +programs. If you just want to use procps tools you don't need to use this +and you can probably remove libproc-dev too. + +It is generally a bad idea to dynamically link to libproc. The API changes +a fair bit and I cannot guarantee that it will stay the same between minor +versions (though it will stay the same between Debian versions). I've now +re-included the libproc.a file so use that. + diff -Nru procps-3.3.4/debian/libprocps1.install.in procps-3.3.5/debian/libprocps1.install.in --- procps-3.3.4/debian/libprocps1.install.in 1970-01-01 10:00:00.000000000 +1000 +++ procps-3.3.5/debian/libprocps1.install.in 2012-05-20 16:08:37.000000000 +1000 @@ -0,0 +1 @@ +usr/lib/${DEB_HOST_MULTIARCH}/libprocps.so.* lib/${DEB_HOST_MULTIARCH}/ diff -Nru procps-3.3.4/debian/patches/bts674785-kfreebsd procps-3.3.5/debian/patches/bts674785-kfreebsd --- procps-3.3.4/debian/patches/bts674785-kfreebsd 2012-10-29 22:43:45.000000000 +1100 +++ procps-3.3.5/debian/patches/bts674785-kfreebsd 1970-01-01 10:00:00.000000000 +1000 @@ -1,19 +0,0 @@ -Description: fixed to get it building on kFreeBSD - Small tweaks to get procps working on kFreeBSD -Author: Petr Salinger <Petr.Salinger@seznam.cz> -Bug-Debian: http://bugs.debian.org/674785 - ---- a/testsuite/ps.test/test-schedbatch.c -+++ b/testsuite/ps.test/test-schedbatch.c -@@ -30,9 +30,11 @@ - nice = atoi(argv[1]); - } - sp.sched_priority = 0; -+#ifdef SCHED_BATCH - if (sched_setscheduler(0, SCHED_BATCH, &sp)) { - perror("sched_setscheduler(0,SCHED_BATCH,{.sched_priority=0}"); - } -+#endif /* SCHED_BATCH */ - if (setpriority(PRIO_PROCESS, 0, nice) || errno) { - (void)snprintf(msg, sizeof(msg), - "setpriority(PRIO_PROCESS, 0, %d)", nice); diff -Nru procps-3.3.4/debian/patches/series procps-3.3.5/debian/patches/series --- procps-3.3.4/debian/patches/series 2012-10-29 22:44:02.000000000 +1100 +++ procps-3.3.5/debian/patches/series 2012-10-30 22:34:01.000000000 +1100 @@ -1,2 +1 @@ -bts674785-kfreebsd uptime_test diff -Nru procps-3.3.4/debian/procps.bug-presubj procps-3.3.5/debian/procps.bug-presubj --- procps-3.3.4/debian/procps.bug-presubj 2012-05-20 16:08:37.000000000 +1000 +++ procps-3.3.5/debian/procps.bug-presubj 2012-10-30 22:32:02.000000000 +1100 @@ -1,5 +1,3 @@ If you are reporting on the kill program please make sure you are running /bin/kill and not the shell built-in kill program (which is usually the default one used). - -ps WILL print UIDs instead of usernames if they are longer than 8 characters. diff -Nru procps-3.3.4/debian/rules procps-3.3.5/debian/rules --- procps-3.3.4/debian/rules 2012-05-20 16:59:19.000000000 +1000 +++ procps-3.3.5/debian/rules 2012-10-30 22:33:44.000000000 +1100 @@ -20,8 +20,8 @@ %: dh $@ -autogen-files := debian/libprocps0.install debian/libprocps0-dev.install \ - debian/libprocps0-dev.links +autogen-files := debian/libprocps1.install debian/libprocps1-dev.install \ + debian/libprocps1-dev.links debian/%: debian/%.in sed -e 's/$${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/g' $< > $@ @@ -93,5 +93,5 @@ endif override_dh_makeshlibs: - dh_makeshlibs -V 'libprocps0 (>= 1:3.3.2-1)' + dh_makeshlibs -V 'libprocps1 (>= 1:3.3.5-1)' diff -Nru procps-3.3.4/po/procps-ng.pot procps-3.3.5/po/procps-ng.pot --- procps-3.3.4/po/procps-ng.pot 2012-10-28 09:09:13.000000000 +1100 +++ procps-3.3.5/po/procps-ng.pot 2012-10-30 22:24:14.000000000 +1100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: procps@freelists.org\n" -"POT-Creation-Date: 2012-10-28 09:09+1100\n" +"POT-Creation-Date: 2012-10-30 22:24+1100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -290,7 +290,7 @@ msgstr "" #: pmap.c:590 skill.c:436 skill.c:469 skill.c:549 tload.c:127 tload.c:132 -#: vmstat.c:801 vmstat.c:810 watch.c:627 +#: vmstat.c:803 vmstat.c:812 watch.c:627 msgid "failed to parse argument" msgstr "" @@ -1136,7 +1136,7 @@ msgid "illegal delay" msgstr "" -#: slabtop.c:318 tload.c:134 vmstat.c:803 +#: slabtop.c:318 tload.c:134 vmstat.c:805 msgid "delay must be positive integer" msgstr "" @@ -1301,7 +1301,7 @@ msgid "scale cannot be negative" msgstr "" -#: tload.c:136 vmstat.c:805 +#: tload.c:136 vmstat.c:807 msgid "too large delay value" msgstr "" @@ -2403,70 +2403,70 @@ #. Translation Hint: max 10 chars. The word is #. * expected to be centralized, use spaces at the end #. * to do that. -#: vmstat.c:358 +#: vmstat.c:360 msgid "reads " msgstr "" #. Translation Hint: max 10 chars -#: vmstat.c:360 +#: vmstat.c:362 msgid "read sectors" msgstr "" #. Translation Hint: max 10 chars. The word is #. * expected to be centralized, use spaces at the end #. * to do that. -#: vmstat.c:364 +#: vmstat.c:366 msgid "writes " msgstr "" #. Translation Hint: max 10 chars -#: vmstat.c:366 +#: vmstat.c:368 msgid "requested writes" msgstr "" -#: vmstat.c:380 +#: vmstat.c:382 msgid "your kernel does not support diskstat. (2.5.70 or above required)" msgstr "" #. Translation Hint: Translating folloging header & fields #. * that follow (marked with max x chars) might not work, #. * unless manual page is translated as well. -#: vmstat.c:437 +#: vmstat.c:439 #, c-format msgid "disk- ------------reads------------ ------------writes----------- -----IO------\n" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:441 vmstat.c:449 +#: vmstat.c:443 vmstat.c:451 msgid "total" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:443 vmstat.c:451 +#: vmstat.c:445 vmstat.c:453 msgid "merged" msgstr "" #. Translation Hint: max 7 chars -#: vmstat.c:445 vmstat.c:453 +#: vmstat.c:447 vmstat.c:455 msgid "sectors" msgstr "" #. Translation Hint: max 7 chars -#: vmstat.c:447 vmstat.c:455 +#: vmstat.c:449 vmstat.c:457 msgid "ms" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:457 +#: vmstat.c:459 msgid "cur" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:459 +#: vmstat.c:461 msgid "sec" msgstr "" -#: vmstat.c:521 +#: vmstat.c:523 msgid "your kernel does not support diskstat (2.5.70 or above required)" msgstr "" @@ -2474,230 +2474,230 @@ #. * follow (marked with max x chars) might not work, unless #. * manual page is translated as well. #. Translation Hint: max 24 chars -#: vmstat.c:531 +#: vmstat.c:533 msgid "Cache" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:533 +#: vmstat.c:535 msgid "Num" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:535 +#: vmstat.c:537 msgid "Total" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:537 +#: vmstat.c:539 msgid "Size" msgstr "" #. Translation Hint: max 6 chars -#: vmstat.c:539 +#: vmstat.c:541 msgid "Pages" msgstr "" -#: vmstat.c:551 +#: vmstat.c:553 msgid "your kernel does not support slabinfo or your permissions are insufficient" msgstr "" -#: vmstat.c:603 +#: vmstat.c:605 #, c-format msgid "%13d disks \n" msgstr "" -#: vmstat.c:604 +#: vmstat.c:606 #, c-format msgid "%13d partitions \n" msgstr "" -#: vmstat.c:620 +#: vmstat.c:622 #, c-format msgid "%13lu total reads\n" msgstr "" -#: vmstat.c:621 +#: vmstat.c:623 #, c-format msgid "%13lu merged reads\n" msgstr "" -#: vmstat.c:622 +#: vmstat.c:624 #, c-format msgid "%13lu read sectors\n" msgstr "" -#: vmstat.c:623 +#: vmstat.c:625 #, c-format msgid "%13lu milli reading\n" msgstr "" -#: vmstat.c:624 +#: vmstat.c:626 #, c-format msgid "%13lu writes\n" msgstr "" -#: vmstat.c:625 +#: vmstat.c:627 #, c-format msgid "%13lu merged writes\n" msgstr "" -#: vmstat.c:626 +#: vmstat.c:628 #, c-format msgid "%13lu written sectors\n" msgstr "" -#: vmstat.c:627 +#: vmstat.c:629 #, c-format msgid "%13lu milli writing\n" msgstr "" -#: vmstat.c:628 +#: vmstat.c:630 #, c-format msgid "%13lu inprogress IO\n" msgstr "" -#: vmstat.c:629 +#: vmstat.c:631 #, c-format msgid "%13lu milli spent IO\n" msgstr "" -#: vmstat.c:650 +#: vmstat.c:652 #, c-format msgid "%13lu %s total memory\n" msgstr "" -#: vmstat.c:651 +#: vmstat.c:653 #, c-format msgid "%13lu %s used memory\n" msgstr "" -#: vmstat.c:652 +#: vmstat.c:654 #, c-format msgid "%13lu %s active memory\n" msgstr "" -#: vmstat.c:653 +#: vmstat.c:655 #, c-format msgid "%13lu %s inactive memory\n" msgstr "" -#: vmstat.c:654 +#: vmstat.c:656 #, c-format msgid "%13lu %s free memory\n" msgstr "" -#: vmstat.c:655 +#: vmstat.c:657 #, c-format msgid "%13lu %s buffer memory\n" msgstr "" -#: vmstat.c:656 +#: vmstat.c:658 #, c-format msgid "%13lu %s swap cache\n" msgstr "" -#: vmstat.c:657 +#: vmstat.c:659 #, c-format msgid "%13lu %s total swap\n" msgstr "" -#: vmstat.c:658 +#: vmstat.c:660 #, c-format msgid "%13lu %s used swap\n" msgstr "" -#: vmstat.c:659 +#: vmstat.c:661 #, c-format msgid "%13lu %s free swap\n" msgstr "" -#: vmstat.c:660 +#: vmstat.c:662 #, c-format msgid "%13lld non-nice user cpu ticks\n" msgstr "" -#: vmstat.c:661 +#: vmstat.c:663 #, c-format msgid "%13lld nice user cpu ticks\n" msgstr "" -#: vmstat.c:662 +#: vmstat.c:664 #, c-format msgid "%13lld system cpu ticks\n" msgstr "" -#: vmstat.c:663 +#: vmstat.c:665 #, c-format msgid "%13lld idle cpu ticks\n" msgstr "" -#: vmstat.c:664 +#: vmstat.c:666 #, c-format msgid "%13lld IO-wait cpu ticks\n" msgstr "" -#: vmstat.c:665 +#: vmstat.c:667 #, c-format msgid "%13lld IRQ cpu ticks\n" msgstr "" -#: vmstat.c:666 +#: vmstat.c:668 #, c-format msgid "%13lld softirq cpu ticks\n" msgstr "" -#: vmstat.c:667 +#: vmstat.c:669 #, c-format msgid "%13lld stolen cpu ticks\n" msgstr "" -#: vmstat.c:668 +#: vmstat.c:670 #, c-format msgid "%13lu pages paged in\n" msgstr "" -#: vmstat.c:669 +#: vmstat.c:671 #, c-format msgid "%13lu pages paged out\n" msgstr "" -#: vmstat.c:670 +#: vmstat.c:672 #, c-format msgid "%13lu pages swapped in\n" msgstr "" -#: vmstat.c:671 +#: vmstat.c:673 #, c-format msgid "%13lu pages swapped out\n" msgstr "" -#: vmstat.c:672 +#: vmstat.c:674 #, c-format msgid "%13u interrupts\n" msgstr "" -#: vmstat.c:673 +#: vmstat.c:675 #, c-format msgid "%13u CPU context switches\n" msgstr "" -#: vmstat.c:674 +#: vmstat.c:676 #, c-format msgid "%13u boot time\n" msgstr "" -#: vmstat.c:675 vmstat.c:690 +#: vmstat.c:677 vmstat.c:692 #, c-format msgid "%13u forks\n" msgstr "" #. Translation Hint: do not change argument characters -#: vmstat.c:788 +#: vmstat.c:790 msgid "-S requires k, K, m or M (default is KiB)" msgstr "" -#: vmstat.c:833 +#: vmstat.c:835 #, c-format msgid "partition was not found\n" msgstr "" diff -Nru procps-3.3.4/proc/Makefile.am procps-3.3.5/proc/Makefile.am --- procps-3.3.4/proc/Makefile.am 2012-08-29 17:41:02.000000000 +1000 +++ procps-3.3.5/proc/Makefile.am 2012-10-30 22:22:04.000000000 +1100 @@ -6,8 +6,8 @@ # # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -LIBprocps_CURRENT=0 -LIBprocps_REVISION=1 +LIBprocps_CURRENT=1 +LIBprocps_REVISION=0 LIBprocps_AGE=0 lib_LTLIBRARIES = libprocps.la diff -Nru procps-3.3.4/proc/Makefile.in procps-3.3.5/proc/Makefile.in --- procps-3.3.4/proc/Makefile.in 2012-10-29 22:04:43.000000000 +1100 +++ procps-3.3.5/proc/Makefile.in 2012-10-30 22:24:29.000000000 +1100 @@ -279,8 +279,8 @@ # # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -LIBprocps_CURRENT = 0 -LIBprocps_REVISION = 1 +LIBprocps_CURRENT = 1 +LIBprocps_REVISION = 0 LIBprocps_AGE = 0 lib_LTLIBRARIES = libprocps.la libprocps_ladir = $(ladir) diff -Nru procps-3.3.4/.tarball-version procps-3.3.5/.tarball-version --- procps-3.3.4/.tarball-version 2012-10-29 22:05:48.000000000 +1100 +++ procps-3.3.5/.tarball-version 2012-10-30 22:24:57.000000000 +1100 @@ -1 +1 @@ -3.3.4 +3.3.5 diff -Nru procps-3.3.4/testsuite/ps.test/test-schedbatch.c procps-3.3.5/testsuite/ps.test/test-schedbatch.c --- procps-3.3.4/testsuite/ps.test/test-schedbatch.c 2012-06-11 22:06:46.000000000 +1000 +++ procps-3.3.5/testsuite/ps.test/test-schedbatch.c 2012-10-30 21:35:41.000000000 +1100 @@ -30,9 +30,11 @@ nice = atoi(argv[1]); } sp.sched_priority = 0; +#ifdef SCHED_BATCH if (sched_setscheduler(0, SCHED_BATCH, &sp)) { perror("sched_setscheduler(0,SCHED_BATCH,{.sched_priority=0}"); } +#endif /* SCHED_BATCH */ if (setpriority(PRIO_PROCESS, 0, nice) || errno) { (void)snprintf(msg, sizeof(msg), "setpriority(PRIO_PROCESS, 0, %d)", nice); diff -Nru procps-3.3.4/vmstat.c procps-3.3.5/vmstat.c --- procps-3.3.4/vmstat.c 2012-08-29 16:45:33.000000000 +1000 +++ procps-3.3.5/vmstat.c 2012-10-30 21:48:17.000000000 +1100 @@ -258,6 +258,7 @@ diow = *cpu_iow; dstl = *cpu_zzz; Div = duse + dsys + didl + diow + dstl; + if (!Div) Div = 1, didl = 1; divo2 = Div / 2UL; printf(format, running, blocked, @@ -312,6 +313,7 @@ } Div = duse + dsys + didl + diow + dstl; + if (!Div) Div = 1, didl = 1; divo2 = Div / 2UL; printf(format, running,
--- End Message ---
--- Begin Message ---
- To: Craig Small <csmall@debian.org>, 692074-done@bugs.debian.org
- Subject: Re: Bug#692074: unblock: procps/1:3.3.5-1
- From: Julien Cristau <jcristau@debian.org>
- Date: Sat, 8 Dec 2012 16:03:40 +0100
- Message-id: <20121208150340.GO5634@radis.cristau.org>
- In-reply-to: <20121101215728.30763.56782.reportbug@elmo.enc.com.au>
- References: <20121101215728.30763.56782.reportbug@elmo.enc.com.au>
On Fri, Nov 2, 2012 at 08:57:28 +1100, Craig Small wrote: > Package: release.debian.org > Severity: normal > User: release.debian.org@packages.debian.org > Usertags: unblock > > Please unblock package procps > > procps 3.3.5-1 is blocked because libproc1 is new. The problem is that > the oldest libproc0 will not work with 3.3.5-1 because the API changed. > This means current if you install procps 3.3.4 with libproc0 3.3.4 you > have an unbootable system. Critical bug 691847 is against procps 3.3.4 > but I'd like this cleared up. > AIUI this is resolved and 3.3.5 will be for jessie. Cheers, JulienAttachment: signature.asc
Description: Digital signature
--- End Message ---