Package: nvidia-graphics-drivers-legacy-173xx
Followup-For: Bug #688754
Currently the package libgl1-nvidia-legacy-173xx-glx has a "Breaks"
relationship with nvidia-settings. If all the patches in this bug report
are applied this is no longer needed as the settings can be co-installed
and managed by the alternative. Attached to this mail is an updated
patch for nvidia-graphics-drivers-legacy-173xx which also removes that
"Breaks".
Gaudenz
-- System Information:
Debian Release: 7.0
APT prefers testing
APT policy: (800, 'testing'), (700, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.8-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_CH.UTF-8, LC_CTYPE=de_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From 4aac9cc4e2fcf2c095a7d23813b04dfc65fc1da1 Mon Sep 17 00:00:00 2001
From: Gaudenz Steinlin <gaud...@debian.org>
Date: Tue, 25 Sep 2012 12:32:36 +0200
Subject: [PATCH] Add alternatives for nvidia-settings
---
debian/control | 1 -
debian/nvidia-alternative.postinst.in | 5 +++++
debian/nvidia-alternative.triggers.in | 5 +++++
debian/rules | 1 +
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 585b867..828a7b1 100644
--- a/debian/control
+++ b/debian/control
@@ -150,7 +150,6 @@ Breaks:
# libgl1-nvidia-legacy-173xx-glx (<< 173.14.30-2),
fglrx-glx (<< 1:11-6-~),
ia32-libs (<< 1:0) [i386],
- nvidia-settings (>= 302),
Replaces:
nvidia-glx${nvidia:Legacy} (<< 173.14.27),
libgl1-nvidia${nvidia:Legacy}-dev,
diff --git a/debian/nvidia-alternative.postinst.in b/debian/nvidia-alternative.postinst.in
index 17ba10b..931d516 100644
--- a/debian/nvidia-alternative.postinst.in
+++ b/debian/nvidia-alternative.postinst.in
@@ -52,6 +52,11 @@ if [ "$1" = "triggered" ]; then
$(add_slave /usr/lib/nvidia/libglx.so libglx.so /usr/lib/#PRIVATE#/libglx.so)
$(add_slave /usr/lib/nvidia/nvidia_drv.so nvidia_drv.so /usr/lib/#PRIVATE#/nvidia_drv.so)
$(add_slave /usr/lib/nvidia/nvidia-bug-report.sh nvidia-bug-report.sh /usr/lib/#PRIVATE#/nvidia-bug-report.sh)
+ $(add_slave /usr/bin/nvidia-settings nvidia-settings /usr/bin/nvidia-settings#LEGACY_OR_CURRENT#)
+ $(add_slave /usr/bin/nv-control-dpy nv-control-dpy /usr/bin/nv-control-dpy#LEGACY_OR_CURRENT#)
+ $(add_slave /usr/share/applications/nvidia-settings.desktop nvidia-settings.desktop /usr/share/applications/nvidia-settings.desktop#LEGACY_OR_CURRENT#)
+ $(add_slave /usr/share/pixmaps/nvidia-settings.png nvidia-settings.png /usr/share/pixmaps/nvidia-settings.png#LEGACY_OR_CURRENT#)
+ $(add_slave /usr/share/man/man1/nvidia-settings.1.gz nvidia-settings.1.gz /usr/share/man/man1/nvidia-settings#LEGACY_OR_CURRENT#.1.gz)
"
if echo "$slaves" | grep -q "slave" ; then
update-alternatives --install /usr/lib/nvidia/nvidia nvidia /usr/lib/#PRIVATE# #MAJOR# $slaves
diff --git a/debian/nvidia-alternative.triggers.in b/debian/nvidia-alternative.triggers.in
index 57cd16d..eb6d528 100644
--- a/debian/nvidia-alternative.triggers.in
+++ b/debian/nvidia-alternative.triggers.in
@@ -3,3 +3,8 @@ interest register-nvidia-alternative#LEGACY#
interest /usr/lib/#PRIVATE#
interest /usr/lib/i386-linux-gnu/#PRIVATE#
interest /usr/lib/x86_64-linux-gnu/#PRIVATE#
+interest /usr/bin/nvidia-settings#LEGACY_OR_CURRENT#
+interest /usr/bin/nv-control-dpy#LEGACY_OR_CURRENT#
+interest /usr/share/applications/nvidia-settings.desktop#LEGACY_OR_CURRENT#
+interest /usr/share/pixmaps/nvidia-settings.png#LEGACY_OR_CURRENT#
+interest /usr/share/man/man1/nvidia-settings#LEGACY_OR_CURRENT#.1.gz
diff --git a/debian/rules b/debian/rules
index 72c196e..a18b64a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -285,6 +285,7 @@ override_dh_builddeb:
-e 's{#VERSION#}{$(version)}g;' \
-e 's{#MAJOR#}{$(firstword $(subst ., ,$(version)))}g;' \
-e 's{#LEGACY#}{$(legacy)}g;' \
+ -e 's{#LEGACY_OR_CURRENT#}{$(if $(legacy),$(legacy),-current)}g;' \
-e 's{#WATCH_PATTERN#}{$(subst \,\\,$(watch_pattern))}g;' \
-e 's{#LIBDIR#}{$(libdir)}g;' \
-e 's{#PRIVATE#}{$(nvidia_private)}g;' \
--
1.7.10.4
