diff -Nru nvclock-0.8b4+cvs20100914/debian/changelog nvclock-0.8b4+cvs20100914/debian/changelog --- nvclock-0.8b4+cvs20100914/debian/changelog 2011-02-22 06:36:54.000000000 +0100 +++ nvclock-0.8b4+cvs20100914/debian/changelog 2012-01-09 00:46:34.000000000 +0100 @@ -1,3 +1,19 @@ +nvclock (0.8b4+cvs20100914-1ubuntu1) precise; urgency=low + + * Merge from debian unstable (LP: #913535). Remaining changes: + + Take over the smartdimmer binary package, shipping only the + smartdimmer tool. This change involves the following: + - edit: debian/control and debian/nvclock.install + - create: debian/smartdimmer.install and debian/smartdimmer.manpages + * debian/rules: passing QT_LIB_DIR to dh_auto_configure - Fix + FTBFS and add support for multiarch + * debian/control: Replace nvidia-glx with nvidia-current. + * Drop changes: + - Fix FTBFS with ld --as-needed, now in debian + - 01_fix_buffer_overflow dpatch, now in upstream + + -- Leo Iannacone Sun, 08 Jan 2012 21:24:42 +0100 + nvclock (0.8b4+cvs20100914-1) unstable; urgency=low [ Andreas Beckmann ] @@ -85,6 +101,61 @@ -- Russ Allbery Sat, 12 Jun 2010 21:06:17 -0700 +nvclock (0.8b4-1ubuntu6) natty; urgency=low + + * Fix another FTBFS with ld --as-needed. + + -- Matthias Klose Mon, 10 Jan 2011 23:32:17 +0100 + +nvclock (0.8b4-1ubuntu5) natty; urgency=low + + * Remove generated files from the diff. + + -- Matthias Klose Mon, 10 Jan 2011 23:16:19 +0100 + +nvclock (0.8b4-1ubuntu4) natty; urgency=low + + * Fix FTBFS with ld --no-add-needed. + + -- Matthias Klose Mon, 10 Jan 2011 22:46:20 +0100 + +nvclock (0.8b4-1ubuntu3) lucid; urgency=low + + * rebuild rest of main for armel armv7/thumb2 optimization; + UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 + + -- Alexander Sack Sun, 07 Mar 2010 00:59:11 +0100 + +nvclock (0.8b4-1ubuntu2) jaunty; urgency=low + + * Take over the smartdimmer binary package, shipping only the + smartdimmer tool. LP: #347813, #95444. + + -- Steve Langasek Thu, 26 Mar 2009 00:01:09 +0000 + +nvclock (0.8b4-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable, remaining changes: + - Add dpatch back to build-depends. + - Update 01_fix_buffer_overflow dpatch. + * lintian fixes: + - debian/copyright: add an actual copyright notice. + - debian/copyright: copy the GPLv2+ license text. + - remove empty debian/nvclock.postinst - minor, but makes dpkg less + efficient about package states + - debian/control: GTK -> GTK+ + - debian/control: add ${misc:Depends} to the deps of all packages + - debian/nvclock-{qt,gtk}.menu: quote the "needs" and "section" + strings, and use the menu section that the Debian menu policy + explicitly says this package should be using (System/Hardware) :-) + - debian/rules, debian/compat: set the debhelper compat level in the + authoritative place. + - debian/rules: don't ignore errors from 'make clean'. + - debian/control: Standards-Version to 3.7.3 (not to 3.8.0, we need + debian/README.source for that). + + -- Steve Langasek Fri, 20 Mar 2009 22:58:10 +0000 + nvclock (0.8b4-1) unstable; urgency=low * New upstream release. (Closes: #511979, #433375, #360097, #414236, @@ -92,6 +163,15 @@ -- Randall Donald Fri, 20 Feb 2009 12:02:17 -0800 +nvclock (0.8b3-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Add dpatch back to build-depends. + - Update Original Maintainer. + * Update 01_fix_buffer_overflow dpatch. + + -- Mario Limonciello Mon, 21 Jan 2008 19:58:33 -0600 + nvclock (0.8b3-1) unstable; urgency=low * New upstream release @@ -99,6 +179,14 @@ -- Randall Donald Sat, 05 Jan 2008 13:02:01 -0800 +nvclock (0.8b2-1ubuntu1) feisty; urgency=low + + * Hack in dpatch. + * Use patch from Andreas Simon to fix buffer overflow. (LP: #72117) + * Update Maintainer address. + + -- Steve Kowalik Tue, 13 Mar 2007 16:23:34 +1100 + nvclock (0.8b2-1) unstable; urgency=low * New upstream release, sorry for the delay (closes: #386633) diff -Nru nvclock-0.8b4+cvs20100914/debian/control nvclock-0.8b4+cvs20100914/debian/control --- nvclock-0.8b4+cvs20100914/debian/control 2011-02-22 06:32:33.000000000 +0100 +++ nvclock-0.8b4+cvs20100914/debian/control 2012-01-09 00:45:40.000000000 +0100 @@ -1,7 +1,8 @@ Source: nvclock Section: x11 Priority: extra -Maintainer: Debian NVIDIA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian NVIDIA Maintainers Uploaders: Russ Allbery , Andreas Beckmann , Build-Depends: @@ -23,7 +24,7 @@ Package: nvclock Architecture: alpha amd64 armel hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: nvidia-glx [amd64 i386] +Suggests: nvidia-common [amd64 i386] Description: Overclock an NVIDIA card This program allows you to overclock your NVIDIA-based video card. The official binary NVIDIA drivers are required for accesses other than by @@ -35,7 +36,7 @@ Package: nvclock-gtk Architecture: alpha amd64 armel hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: nvidia-glx [amd64 i386] +Suggests: nvidia-common [amd64 i386] Description: Overclock an NVIDIA card (GTK+ interface) This program allows you to overclock your NVIDIA-based video card. The official binary NVIDIA drivers are required for accesses other than by @@ -47,7 +48,7 @@ Package: nvclock-qt Architecture: alpha amd64 armel hppa i386 ia64 powerpc sparc Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: nvidia-glx [amd64 i386] +Suggests: nvidia-common [amd64 i386] Description: Overclock an NVIDIA card (Qt interface) This program allows you to overclock your NVIDIA-based video card. The official binary NVIDIA drivers are required for accesses other than by @@ -55,3 +56,11 @@ . This is the Qt version. See nvclock-gtk for a GTK+ version and nvclock for the console version. + +Package: smartdimmer +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Change LCD brightness on Geforce cards + Nvidia Geforce 6200Go, Geforce 8, Geforce 9, and other cards contain + hardware LCD brightness control. Smartdimmer allows this to be + controlled through software. diff -Nru nvclock-0.8b4+cvs20100914/debian/nvclock.install nvclock-0.8b4+cvs20100914/debian/nvclock.install --- nvclock-0.8b4+cvs20100914/debian/nvclock.install 2010-06-13 05:01:35.000000000 +0200 +++ nvclock-0.8b4+cvs20100914/debian/nvclock.install 2012-01-09 00:30:34.000000000 +0100 @@ -1,2 +1 @@ usr/bin/nvclock -usr/bin/smartdimmer diff -Nru nvclock-0.8b4+cvs20100914/debian/nvclock.manpages nvclock-0.8b4+cvs20100914/debian/nvclock.manpages --- nvclock-0.8b4+cvs20100914/debian/nvclock.manpages 2010-06-13 05:01:35.000000000 +0200 +++ nvclock-0.8b4+cvs20100914/debian/nvclock.manpages 2012-01-09 00:30:48.000000000 +0100 @@ -1,2 +1 @@ debian/tmp/usr/share/man/man1/nvclock.1 -debian/smartdimmer.1 diff -Nru nvclock-0.8b4+cvs20100914/debian/rules nvclock-0.8b4+cvs20100914/debian/rules --- nvclock-0.8b4+cvs20100914/debian/rules 2011-02-22 06:32:33.000000000 +0100 +++ nvclock-0.8b4+cvs20100914/debian/rules 2012-01-08 22:27:40.000000000 +0100 @@ -18,7 +18,7 @@ override_dh_auto_configure: sh autogen.sh - dh_auto_configure -- --enable-gtk --enable-qt + dh_auto_configure -- QT_LIB_DIR=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) --enable-gtk --enable-qt override_dh_install: dh_install --list-missing diff -Nru nvclock-0.8b4+cvs20100914/debian/smartdimmer.install nvclock-0.8b4+cvs20100914/debian/smartdimmer.install --- nvclock-0.8b4+cvs20100914/debian/smartdimmer.install 1970-01-01 01:00:00.000000000 +0100 +++ nvclock-0.8b4+cvs20100914/debian/smartdimmer.install 2012-01-09 00:25:55.000000000 +0100 @@ -0,0 +1 @@ +usr/bin/smartdimmer diff -Nru nvclock-0.8b4+cvs20100914/debian/smartdimmer.manpages nvclock-0.8b4+cvs20100914/debian/smartdimmer.manpages --- nvclock-0.8b4+cvs20100914/debian/smartdimmer.manpages 1970-01-01 01:00:00.000000000 +0100 +++ nvclock-0.8b4+cvs20100914/debian/smartdimmer.manpages 2012-01-09 00:32:49.000000000 +0100 @@ -0,0 +1 @@ +debian/smartdimmer.1