reverted: --- nvidia-graphics-drivers-173-updates-173.14.30/0001-Make-sure-that-the-patch-for-linux-3.0-is-applied-to.patch +++ nvidia-graphics-drivers-173-updates-173.14.30.orig/0001-Make-sure-that-the-patch-for-linux-3.0-is-applied-to.patch @@ -1,33 +0,0 @@ -From 28ffc37b74c0d2c4020e243e8fcc1dd2cb0d2809 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Wed, 11 Jan 2012 15:29:34 +0100 -Subject: [PATCH 1/4] Make sure that the patch for linux 3.0 is applied to the - whole series - -Thanks to Daniel van Vugt ---- - debian/dkms.conf | 4 +--- - debian/dkms.conf.in | 4 +--- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in -index 7087ddd..64d1fc7 100644 ---- a/debian/dkms.conf.in -+++ b/debian/dkms.conf.in -@@ -1,7 +1,5 @@ - PACKAGE_NAME="#DRIVERNAME#" - PACKAGE_VERSION="#VERSION#" --#Prevent builds with kernels newer than the ones we ship --OBSOLETE_BY=3.1 - CLEAN="make clean" - BUILT_MODULE_NAME[0]="nvidia" - DEST_MODULE_NAME[0]="#MODULENAME#" -@@ -9,4 +7,4 @@ MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_XEN_PRESENCE=1 IGNOR - DEST_MODULE_LOCATION[0]="/kernel/drivers/char/drm" - AUTOINSTALL="yes" - PATCH[0]="fix-build-with-linux-3.0.patch" --PATCH_MATCH[0]="^3.0" -+PATCH_MATCH[0]="^3." --- -1.7.5.4 - reverted: --- nvidia-graphics-drivers-173-updates-173.14.30/0003-Refresh-files-from-templates.patch +++ nvidia-graphics-drivers-173-updates-173.14.30.orig/0003-Refresh-files-from-templates.patch @@ -1,25 +0,0 @@ -From 627d03e05772f4b64b0e87c07bcb8570ff73536d Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 12 Jan 2012 18:15:40 +0100 -Subject: [PATCH 3/4] Refresh files from templates - ---- - debian/nvidia-173.prerm | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/debian/nvidia-173.prerm b/debian/nvidia-173.prerm -index 4cbe33f..8aa7c5e 100644 ---- a/debian/nvidia-173.prerm -+++ b/debian/nvidia-173.prerm -@@ -23,7 +23,7 @@ case "$1" in - remove_dkms_module - - update-alternatives --remove x86_64-linux-gnu_gl_conf /usr/lib/nvidia-173/ld.so.conf -- update-alternatives --remove i386-linux-gnu_gl_conf /usr/lib/nvidia-173/ld.so.conf -+ update-alternatives --remove i386-linux-gnu_gl_conf /usr/lib/nvidia-173/alt_ld.so.conf - - # Trigger gmenu so as to update the gnome menu - dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true --- -1.7.5.4 - reverted: --- nvidia-graphics-drivers-173-updates-173.14.30/0002-Use-the-right-path-to-remove-the-other-arch-alternat.patch +++ nvidia-graphics-drivers-173-updates-173.14.30.orig/0002-Use-the-right-path-to-remove-the-other-arch-alternat.patch @@ -1,26 +0,0 @@ -From a25aa264df0b99d054ff2a4fcfa70262dd2768c2 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 12 Jan 2012 18:05:53 +0100 -Subject: [PATCH 2/4] Use the right path to remove the other arch alternative - in the prerm.in - ---- - debian/nvidia-173-updates.prerm.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/debian/nvidia-173-updates.prerm.in b/debian/nvidia-173-updates.prerm.in -index 534b1d3..1e6d52c 100644 ---- a/debian/nvidia-173-updates.prerm.in -+++ b/debian/nvidia-173-updates.prerm.in -@@ -23,7 +23,7 @@ case "$1" in - remove_dkms_module - - update-alternatives --remove #DEB_HOST_MULTIARCH#_gl_conf #LDSOCONF# -- update-alternatives --remove #OTHER_ARCH#_gl_conf #LDSOCONF# -+ update-alternatives --remove #OTHER_ARCH#_gl_conf #ALTLDSOCONF# - - # Trigger gmenu so as to update the gnome menu - dpkg-trigger --by-package=$PACKAGE_NAME gmenucache || true --- -1.7.5.4 - reverted: --- nvidia-graphics-drivers-173-updates-173.14.30/0004-Release-173.14.30-0ubuntu9.patch +++ nvidia-graphics-drivers-173-updates-173.14.30.orig/0004-Release-173.14.30-0ubuntu9.patch @@ -1,36 +0,0 @@ -From 3198d931645d36d6e676bbedfc11c1b1de8a0e4d Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 12 Jan 2012 18:13:24 +0100 -Subject: [PATCH 4/4] Release 173.14.30-0ubuntu9 - ---- - debian/changelog | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/debian/changelog b/debian/changelog -index ed3a07f..66227c4 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,8 +1,16 @@ --nvidia-graphics-drivers-173 (173.14.30-0ubuntu9) UNRELEASED; urgency=low -+nvidia-graphics-drivers-173 (173.14.30-0ubuntu9) precise; urgency=low - -- * -+ [ Daniel van Vugt ] -+ * debian/dkms.conf{.in}: -+ - Fix failure to install with kernel 3.2 (LP: #576648). -+ - Drop non-functional OBSOLETE_BY variable. -+ -+ [ Alberto Milone ] -+ * debian/nvidia-$flavour.prerm.in: -+ - Use the right path to remove the alternative for the -+ other architecture (LP: #915461). - -- -- Alberto Milone Thu, 12 Jan 2012 18:03:03 +0100 -+ -- Alberto Milone Thu, 12 Jan 2012 18:08:01 +0100 - - nvidia-graphics-drivers-173 (173.14.30-0ubuntu8) oneiric; urgency=low - --- -1.7.5.4 - diff -u nvidia-graphics-drivers-173-updates-173.14.30/debian/changelog nvidia-graphics-drivers-173-updates-173.14.30/debian/changelog --- nvidia-graphics-drivers-173-updates-173.14.30/debian/changelog +++ nvidia-graphics-drivers-173-updates-173.14.30/debian/changelog @@ -1,3 +1,9 @@ +nvidia-graphics-drivers-173-updates (173.14.30-0ubuntu7) precise; urgency=low + + * Remove leftover from git. + + -- Alberto Milone Thu, 12 Jan 2012 18:51:59 +0100 + nvidia-graphics-drivers-173-updates (173.14.30-0ubuntu6) precise; urgency=low [ Daniel van Vugt ]