Merge nvclock 0.8b4+cvs20100914-1 (universe) from Debian testing

[Artur Rona]

Binary package hint: nvclock

nvclock (0.8b4+cvs20100914-1) unstable; urgency=low

  [ Andreas Beckmann ]
  * Repack source from nvclock CVS snapshot.
  * Update to upstream CVS as of 2010-09-14.
  * README.source: document CVS snapshot generation.
  * debian/rules: add a get-cvs-snapshot target to download and pack CVS
    snapshots.
  * link-with-all-libs.diff: reorder libraries to fix FTBFS with
    binutils-gold. (Closes: #555781, #609616)
  * qt4.diff: new patch to convert nvclock_qt from qt3 to qt4.
    (Closes: #604365)
  * Add lintian overrides for false positive misspelling 'ment' in hyphenated
    govern-ment in upstream license.

 -- Andreas Beckmann <email address hidden> Wed, 26 Jan 2011 00:06:10 +0100

nvclock (0.8b4-3) unstable; urgency=low

  [ Andreas Beckmann ]
  * Update Standards-Version to 3.9.1 (no changes needed).
  * Switch to debhelper compat level 8 (no changes needed).
  * Suggest nvidia-glx without alternatives. This is now a virtual package
    provided by nvidia-glx-legacy-* as well.
  * Add myself to Uploaders.

  [ Russ Allbery ]
  * Install desktop file and icon for nvclock-gtk, matching upstream.
  * Re-add builds for alpha, armel, hppa, ia64, powerpc, and sparc.
    NVIDIA hardware was more widespread than I thought.
  * Shorten the short description and fix capitalization in the long
    description. Add cross-references for the other packages to the long
    descriptions.

 -- Russ Allbery <email address hidden> Sat, 18 Sep 2010 14:12:59 -0700

nvclock (0.8b4-2) unstable; urgency=low

  [ Steve Langasek ]
  * lintian fixes: (closes: #520569)
    - 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.8.0

  [ Andreas Beckmann ]
  * Team change: switch Uploaders from Randall to Russ.
  * Switch to source format 3.0 (quilt).
  * Update to upstream CVS as of 2009-06-22. (Closes: #463890, #570325)
  * Rerun autogen.sh since we patch configure.in.
  * Add patch nvclock_hurd.debdiff from Barry deFreese to fix FTBFS on
    GNU/Hurd. (Closes: #533918)
  * Add patch link-with-all-libs.diff to fix FTBFS with binutils-gold.
    (Closes: #555781)
  * Update to debhelper compat level 7 and Standards-Version 3.8.4.
  * Ship upstream manpage nvclock.1 instead of the outdated Debian version.
  * Add patch manpage-fixes.diff to fix typos and hyphenation in that manpage.
  * Do not ship duplicate copies of the upstream changelog.
  * Ship the smartdimmer binary, new in 0.8b4.
  * Add manpage smartdimmer.1, generated with help2man.
  * Add a watch file.
  * Adjust suggestions to cover nvidia-glx-legacy-*, too.
  * Add lintian overrides for problems in the upstream source that could be
    solved by repacking only.
  * debian/rules: switch to dh and minimize.
  * Remove obsolete empty maintainer scripts.
  * Convert debian/copyright to DEP-5 format.
  * Add Vcs-* URLs.

  [ Russ Allbery ]
  * Only build on i386 and amd64, since this package is useless without
    NVIDIA hardware. (Closes: #551096)
  * Flesh out debian/copyright with some files released under different
    licenses and add more copyright holders.
  * Add a Homepage control field.

 -- Russ Allbery <email address hidden> Sat, 12 Jun 2010 21:06:17 -0700

[Artur Rona (ari-tczew)]

I prepared a merge from Debian SVN since I've been waiting about 3 weeks for upload it into unstable and there is no effect. I'm afraid package won't get into unstable before out FeatureFreeze.
Tarball has been downloaded from http://svn.debian.org/wsvn/pkg-nvidia/tarballs/nvclock_0.8b4%2Bcvs20100914.orig.tar.bz2

[Artur Rona (ari-tczew)]

Would like to be sponsored by Kees Cook!

[Kees Cook (kees)]

Merging against an un-uploaded version from Debian is really only recommended if there are important fixes that we cannot wait for. I would much rather work from an actually released version of a Debian package.

Speaking to the merge work itself, I would like to see each change (even those that were taken upstream) specifically called out in the changelog. Saying "all" does not really indicate which of the prior changes were reviewed by the package preparer. Also, any remaining delta between Debian and Ubuntu should be explained as either Ubuntu-specific (cannot be sent to Debian) or a link to the opened Debian bug for the delta. (i.e. smartdimmer changes)

[Artur Rona (ari-tczew)]

There is nothing interesting in current unstable revision to merge, so if we won't merge package from Debian SVN, I'll wait for upload from svn to unstable. Probably it will be in natty+1. I have prepared new debdiff, if you would like to review it based on SVN anyway, I can attach it.
Thanks!

[Artur Rona (ari-tczew)]

Kees, nvclock has been uploaded to unstable today. Still time for upload until FeatureFreeze.

[Kees Cook (kees)]

This looks good. I would like to see the Ubuntu deltas sent to Debian (nvidia-glx/current and the smartdimmer). You could use the "submittodebian" tool to help with that. Once you've got the bug #s, you can add them to the changelog for the next nvclock merger to find and check up on.

Thanks!

[Artur Rona (ari-tczew)]

I have talked with Debian maintainer about it and Debian does not have a benefit in separate smartdimmer, but Steve Langasek want to keep this change in Ubuntu. About nvidia-current: Debian does not have this binary package.
Both changes are Ubuntu-specific. Debdiff is ready to upload.

[Leo Iannacone (l3on)]

Hi,

I have taken a look at this package.

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 <email address hidden> Sun, 08 Jan 2012 21:24:42 +0100

[Micah Gersten (micahg)]

Leo, thank you for working on this. Would you please be able to provide a Debian -> Ubuntu diff for the new versions?

[Leo Iannacone (l3on)]

Thanks in advance for review.

[Leo Iannacone (l3on)]

Can you please update the bug number in the debian/chagelog? Thanks.

[Martin Pitt (pitti)]

Thanks! Sponsored with fixed bug number in changelog.

[Launchpad Janitor (janitor)]

This bug was fixed in the package nvclock - 0.8b4+cvs20100914-1ubuntu1

---------------
nvclock (0.8b4+cvs20100914-1ubuntu1) precise; urgency=low

  * Merge from debian unstable (LP: #718312). 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

nvclock (0.8b4+cvs20100914-1) unstable; urgency=low

  [ Andreas Beckmann ]
  * Repack source from nvclock CVS snapshot.
  * Update to upstream CVS as of 2010-09-14.
  * README.source: document CVS snapshot generation.
  * debian/rules: add a get-cvs-snapshot target to download and pack CVS
    snapshots.
  * link-with-all-libs.diff: reorder libraries to fix FTBFS with
    binutils-gold. (Closes: #555781, #609616)
  * qt4.diff: new patch to convert nvclock_qt from qt3 to qt4.
    (Closes: #604365)
  * Add lintian overrides for false positive misspelling 'ment' in hyphenated
    govern-ment in upstream license.

nvclock (0.8b4-3) unstable; urgency=low

  [ Andreas Beckmann ]
  * Update Standards-Version to 3.9.1 (no changes needed).
  * Switch to debhelper compat level 8 (no changes needed).
  * Suggest nvidia-glx without alternatives. This is now a virtual package
    provided by nvidia-glx-legacy-* as well.
  * Add myself to Uploaders.

  [ Russ Allbery ]
  * Install desktop file and icon for nvclock-gtk, matching upstream.
  * Re-add builds for alpha, armel, hppa, ia64, powerpc, and sparc.
    NVIDIA hardware was more widespread than I thought.
  * Shorten the short description and fix capitalization in the long
    description. Add cross-references for the other packages to the long
    descriptions.

nvclock (0.8b4-2) unstable; urgency=low

  [ Steve Langasek ]
  * lintian fixes: (closes: #520569)
    - 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.8.0

  [ Andreas Beckmann ]
  * Team change: switch Uploaders from Randall to Russ.
  * Switch to source format 3.0 (quilt).
  * Update to upstream CVS as of 2009-06-22. (Closes: #463890, #570325)
  * Rerun autogen.sh since we patch configure.in.
  * Add patch nvclock_hurd.debd...