I'm currently having some FTBFS problems with Conky and Debian kfreebsd, which aren't likely to be fixed before feature freeze, so I'd like to request a merge instead. Conky 1.8.1 is for the most part a bugfix release, and it fixes multiple bugs in Debian's BTS and on Launchpad, so it should be safe to merge; I've also tried building it in oneiric in my sandbox PPA and can confirm that it builds without a problem (see https://launchpad.net/~vincent-c/+archive/vincents-sandbox).
** Summary changed: - Sync conky 1.8.1-1 (universe) from Debian unstable (main) + Merge conky 1.8.1-1 (universe) from Debian unstable (main) ** Description changed: - Please sync conky 1.8.1-1 (universe) from Debian unstable (main) - - Explanation of the Ubuntu delta and why it can be dropped: - Conky 1.8.1 is a bugfix release which contains all of the cherry-picked upstream patches currently in Ubuntu's Conky packaging. + Please merge conky 1.8.1-1 (universe) from Debian unstable (main) Changelog entries since current oneiric version 1.8.0-1ubuntu1: conky (1.8.1-1) unstable; urgency=low - * Adopt package. (Closes: #632655) - * Acknowledge NMU patch for #612033, which fixes a known vulnerability in - Conky. Thanks to Luca Falavigna! (LP: #607309) - * New upstream release. (Closes: #604921) - - Fix bug in $if_existing. (Closes: #612904) - - Fix various memory leaks. (Closes: #628527) - - Fix battery_bar not parsing arguments correctly. (LP: #569195) - * Fix ncurses being enabled for all binary packages (upstream default). - * Rename "70b6f35a.patch" to "fix-race-condition.patch", and add a full - DEP-3 formatted header. - * Add debian/patches/fix-acpitemp.patch to let $acpitemp use /sys instead - of /proc. (Closes: #609745, #628519; LP: #810667) - * Change section of source package from "contrib/utils" to "utils". - (Closes: #579102) - - Change section of binary package conky-all to "contrib/utils". - - Remove build-dependency on nvidia-settings; add build-dependency on - libxnvctrl-dev instead to conky-all, due to the move of the - NVCtrl/NVCtrl.h header file to libxnvctrl-dev. - - Update debian/NEWS and debian/README.source to reflect the changes to - Conky packaging in Debian. - * Change dependency of transitional conky package to - "conky-all | conky-std". - * debian/copyright: Remove reference to deprecated BSD license file - (/usr/share/common-licenses/BSD). - * Change Vcs-* entries in debian/control to point to collab-maint. - * Update Standards version from 3.8.4 to 3.9.2, no changes required. - * Update debhelper compatiblity level from 5 to 8. + * Adopt package. (Closes: #632655) + * Acknowledge NMU patch for #612033, which fixes a known vulnerability in + Conky. Thanks to Luca Falavigna! (LP: #607309) + * New upstream release. (Closes: #604921) + - Fix bug in $if_existing. (Closes: #612904) + - Fix various memory leaks. (Closes: #628527) + - Fix battery_bar not parsing arguments correctly. (LP: #569195) + * Fix ncurses being enabled for all binary packages (upstream default). + * Rename "70b6f35a.patch" to "fix-race-condition.patch", and add a full + DEP-3 formatted header. + * Add debian/patches/fix-acpitemp.patch to let $acpitemp use /sys instead + of /proc. (Closes: #609745, #628519; LP: #810667) + * Change section of source package from "contrib/utils" to "utils". + (Closes: #579102) + - Change section of binary package conky-all to "contrib/utils". + - Remove build-dependency on nvidia-settings; add build-dependency on + libxnvctrl-dev instead to conky-all, due to the move of the + NVCtrl/NVCtrl.h header file to libxnvctrl-dev. + - Update debian/NEWS and debian/README.source to reflect the changes to + Conky packaging in Debian. + * Change dependency of transitional conky package to + "conky-all | conky-std". + * debian/copyright: Remove reference to deprecated BSD license file + (/usr/share/common-licenses/BSD). + * Change Vcs-* entries in debian/control to point to collab-maint. + * Update Standards version from 3.8.4 to 3.9.2, no changes required. + * Update debhelper compatiblity level from 5 to 8. - -- Vincent Cheng <[email protected]> Fri, 15 Jul 2011 10:41:54 + -- Vincent Cheng <[email protected]> Fri, 15 Jul 2011 10:41:54 -0700 conky (1.8.0-1.1) unstable; urgency=medium - * Non-maintainer upload. - * debian/patches/70b6f35a.patch: - - Cherrypick a patch from upstream to avoid rewriting an arbitrary - user file (Closes: #612033). + * Non-maintainer upload. + * debian/patches/70b6f35a.patch: + - Cherrypick a patch from upstream to avoid rewriting an arbitrary + user file (Closes: #612033). - -- Luca Falavigna <[email protected]> Sun, 03 Apr 2011 15:17:39 + -- Luca Falavigna <[email protected]> Sun, 03 Apr 2011 15:17:39 +0200 ** Patch added: "conky-1.8.1.diff" https://bugs.launchpad.net/ubuntu/+source/conky/+bug/778027/+attachment/2257658/+files/conky-1.8.1.diff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/778027 Title: Merge conky 1.8.1-1 (universe) from Debian unstable (main) To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/conky/+bug/778027/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
