Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package nvidia-settings-legacy-173xx

nvidia-settings-legacy-173xx was created at a time when the 96xx legacy
driver was not functional due to missing Xorg support. This has changed
luckily, so the 96xx legacy driver is now available in wheezy.
nvidia-settings-legacy-173xx also supports the 96xx legacy driver (and
nvidia-settings does not), but it needs the Recommends to be updated
to avoid pulling in some 173xx legacy driver packages (and as a result
setting the nvidia alternative to the newer (but wrong in that case)
173xx driver.
Adjust the description accordingly and mention 96xx support, too.

Andreas

unblock nvidia-settings-legacy-173xx/173.14.35-2
diffstat for nvidia-settings-legacy-173xx-173.14.35 nvidia-settings-legacy-173xx-173.14.35

 changelog                         |   10 ++++++++++
 control                           |    8 ++++----
 copyright                         |    2 +-
 nvidia-settings-legacy-173xx.menu |    2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff -Nru nvidia-settings-legacy-173xx-173.14.35/debian/changelog nvidia-settings-legacy-173xx-173.14.35/debian/changelog
--- nvidia-settings-legacy-173xx-173.14.35/debian/changelog	2012-08-11 01:33:54.000000000 +0200
+++ nvidia-settings-legacy-173xx-173.14.35/debian/changelog	2013-03-10 16:53:26.000000000 +0100
@@ -1,3 +1,13 @@
+nvidia-settings-legacy-173xx (173.14.35-2) unstable; urgency=low
+
+  * Add libgl1-nvidia-legacy-96xx-glx as alternative recommendation to avoid
+    pulling in 173xx packages on 96xx installations.  (Closes: #702651)
+  * Update menu title (Closes: #688748) and package description to mention
+    96xx legacy support.
+  * Update my email address and drop DMUA.
+
+ -- Andreas Beckmann <a...@debian.org>  Sun, 10 Mar 2013 16:53:26 +0100
+
 nvidia-settings-legacy-173xx (173.14.35-1) unstable; urgency=low
 
   * Initial release of nvidia-settings for use with the legacy 173xx driver.
diff -Nru nvidia-settings-legacy-173xx-173.14.35/debian/control nvidia-settings-legacy-173xx-173.14.35/debian/control
--- nvidia-settings-legacy-173xx-173.14.35/debian/control	2012-08-11 01:33:54.000000000 +0200
+++ nvidia-settings-legacy-173xx-173.14.35/debian/control	2013-03-10 16:47:53.000000000 +0100
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-de...@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <f...@debian.org>,
- Andreas Beckmann <deb...@abeckmann.de>,
+ Andreas Beckmann <a...@debian.org>,
  Russ Allbery <r...@debian.org>
-DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 9),
  m4,
@@ -26,7 +25,7 @@
 Architecture: i386 amd64
 Pre-Depends: nvidia-installer-cleanup
 Depends: pkg-config, ${shlibs:Depends}, ${misc:Depends}
-Recommends: libgl1-nvidia-legacy-173xx-glx
+Recommends: libgl1-nvidia-legacy-173xx-glx | libgl1-nvidia-legacy-96xx-glx
 Provides: nvidia-settings
 Conflicts: nvidia-settings,
  xserver-xorg-video-nvidia,
@@ -40,4 +39,5 @@
  Values such as brightness and gamma, XVideo attributes, temperature,
  and OpenGL settings can be queried and configured via nvidia-settings.
  .
- This version of nvidia-settings is only for use with the 173xx legacy driver.
+ This version of nvidia-settings is only for use with the 173xx and 96xx
+ legacy drivers.
diff -Nru nvidia-settings-legacy-173xx-173.14.35/debian/copyright nvidia-settings-legacy-173xx-173.14.35/debian/copyright
--- nvidia-settings-legacy-173xx-173.14.35/debian/copyright	2012-08-11 01:33:54.000000000 +0200
+++ nvidia-settings-legacy-173xx-173.14.35/debian/copyright	2013-03-10 16:21:45.000000000 +0100
@@ -86,7 +86,7 @@
 Files: debian/*
 Copyright: © 2004-2010 Randall Donald <rdon...@debian.org>
            © 2009-2010 Fathi Boudra <f...@debian.org>
-           © 2011-2012 Andreas Beckmann <deb...@abeckmann.de>
+           © 2011-2013 Andreas Beckmann <a...@debian.org>
 License: GPL-2
 
 License: GPL-2
diff -Nru nvidia-settings-legacy-173xx-173.14.35/debian/nvidia-settings-legacy-173xx.menu nvidia-settings-legacy-173xx-173.14.35/debian/nvidia-settings-legacy-173xx.menu
--- nvidia-settings-legacy-173xx-173.14.35/debian/nvidia-settings-legacy-173xx.menu	2012-08-11 01:33:54.000000000 +0200
+++ nvidia-settings-legacy-173xx-173.14.35/debian/nvidia-settings-legacy-173xx.menu	2013-03-10 16:45:35.000000000 +0100
@@ -1,5 +1,5 @@
 ?package(nvidia-settings-legacy-173xx): \
   needs="X11" \
   section="Applications/System/Hardware" \
-  title="nvidia-settings" \
+  title="NVIDIA Settings (legacy 173xx/96xx)" \
   command="/usr/bin/nvidia-settings"

Reply via email to