** Summary changed: - Merge conky 1.8.1-1 (universe) from Debian unstable (main) + Sync conky 1.8.1-2 (universe) from Debian unstable (main)
** Description changed: - Please merge conky 1.8.1-1 (universe) from Debian unstable (main) + Please sync conky 1.8.1-2 (universe) from Debian unstable (main) + + Explanation of the Ubuntu delta and why it can be dropped: + + The patches in Ubuntu's version of Conky have all been applied upstream + in 1.8.1, and can thus be dropped. Note that 1.8.1 is primarily a bug- + fix release, so it should be safe to sync from Debian. Changelog entries since current oneiric version 1.8.0-1ubuntu1: + + conky (1.8.1-2) unstable; urgency=low + + * Add build dependency on libxnvctrl-dev | nvidia-settings to keep Conky + in sync with Ubuntu. + * Add debian/patches/fix-curl-ftbfs.patch to fix FTBFS with curl 7.21.7. + (Closes: #636367) + * Add debian/patches/fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd. + + -- Vincent Cheng <vincentc1...@gmail.com> Fri, 05 Aug 2011 14:58:00 + -0700 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. -- Vincent Cheng <vincentc1...@gmail.com> 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). -- Luca Falavigna <dktrkr...@debian.org> Sun, 03 Apr 2011 15:17:39 +0200 ** Patch removed: "conky-1.8.1.diff" https://bugs.launchpad.net/ubuntu/+source/conky/+bug/778027/+attachment/2257662/+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: Sync conky 1.8.1-2 (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 ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
