[pkg-nvidia-devel] r1305 - in /packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian: ./ module/debian/

anbe-guest at users.alioth.debian.org anbe-guest at users.alioth.debian.org
Mon Jul 5 20:30:59 UTC 2010


Author: anbe-guest
Date: Mon Jul  5 20:30:59 2010
New Revision: 1305

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1305
Log:
synchronize packaging with nvidia-graphics-drivers-legacy-173xx 173.14.25-3 (r1304)

Added:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.dirs
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.dirs
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.links.in
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.links.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.postrm
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.postrm
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx-ia32.preinst
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.preinst
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.dirs
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.dirs
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.postinst
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.postinst
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.postrm
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.postrm
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.preinst
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.preinst
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/module/debian/control.template.in
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/control.template.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx-ia32.preinst
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.preinst
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.dirs
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.dirs
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.lintian-overrides.in
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/rules
      - copied unchanged from r1304, packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
Modified:
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postinst
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postrm
    packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.preinst

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog?rev=1305&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/changelog Mon Jul  5 20:30:59 2010
@@ -34,6 +34,8 @@
     - add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32
     - nvidia-glx-legacy-96xx: install HTML variant of the README
     - update to Standards-Version: 3.9.0
+    - move diversions to /usr/lib{,32}/nvidia/diversions
+    - drop LEGACY part from virtual package name nvidia-kernel-NVIDIAVERSION
     - lots of small fixes and cleanup
   * adjust version numbers in maintainer scripts
   * update nvidia.ids

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control?rev=1305&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/control Mon Jul  5 20:30:59 2010
@@ -21,15 +21,15 @@
 Pre-Depends: dpkg (>= 1.15.7.2)
 Depends:
  libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
- nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+ nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
  ${shlibs:Depends}, ${misc:Depends}
 Suggests: nvidia-settings,
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
 Breaks: xserver-xorg-core (<< 2:1.6)
 Provides:
+ nvidia-glx,
  xserver-xorg-video-6,
- nvidia-glx,
 Conflicts:
  nvidia-glx,
  nvidia-glx-legacy,
@@ -44,7 +44,7 @@
  Please see the nvidia-kernel${nvidia:Legacy}-dkms or
  nvidia-kernel${nvidia:Legacy}-source packages
  for building the kernel module required by this package.
- This will provide nvidia-kernel${nvidia:Legacy}-${nvidia:Version}.
+ This will provide nvidia-kernel-${nvidia:Version}${nvidia:Perfkit}.
  .
  This legacy version is the last release that supports the following GPUs:
  GeForce PCX 4300, GeForce2 Go, GeForce2 Integrated GPU, GeForce2 MX 100/200,
@@ -74,7 +74,7 @@
 Pre-Depends: libc6-i386 (>= 2.9-18)
 Depends:
  libgl1-nvidia${nvidia:Legacy}-glx-ia32 (= ${binary:Version}),
- nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+ nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
  ${shlibs:Depends}, ${misc:Depends}
 Suggests: nvidia-settings,
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
@@ -131,7 +131,7 @@
 Depends:
  ${shlibs:Depends}, ${misc:Depends}
 Recommends:
- nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+ nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
 Suggests:
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
@@ -140,7 +140,11 @@
 Conflicts:
  libgl1-nvidia-glx,
  fglrx-glx,
- nvidia-glx${nvidia:Legacy} (<< 96.43.17),
+ nvidia-glx (<< 195.36.31),
+ nvidia-glx-legacy,
+ nvidia-glx-legacy-71xx,
+ nvidia-glx-legacy-96xx (<< 96.43.17),
+ nvidia-glx-legacy-173xx,
 Replaces: nvidia-glx${nvidia:Legacy} (<< 96.43.17)
 Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
  These binary libraries provide optimized hardware acceleration of
@@ -157,7 +161,7 @@
 Depends:
  ${shlibs:Depends}, ${misc:Depends}
 Recommends:
- nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+ nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
 Suggests:
  nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
  | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
@@ -166,7 +170,11 @@
 Conflicts:
  libgl1-nvidia-glx-ia32,
  fglrx-glx-ia32,
- nvidia-glx${nvidia:Legacy}-ia32 (<< 96.43.17),
+ nvidia-glx-ia32 (<< 195.36.31),
+ nvidia-glx-legacy-ia32,
+ nvidia-glx-legacy-71xx-ia32,
+ nvidia-glx-legacy-96xx-ia32 (<< 96.43.17),
+ nvidia-glx-legacy-173xx-ia32,
 Replaces: nvidia-glx${nvidia:Legacy}-ia32 (<< 96.43.17)
 Description: NVIDIA binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
  These binary 32-bit libraries provide optimized hardware acceleration of
@@ -188,7 +196,11 @@
  libgl1-nvidia-dev,
 Conflicts:
  libgl1-nvidia-dev,
- nvidia-glx${nvidia:Legacy}-dev (<< 96.43.17),
+ nvidia-glx-dev,
+ nvidia-glx-legacy-dev,
+ nvidia-glx-legacy-71xx-dev,
+ nvidia-glx-legacy-96xx-dev (<< 96.43.17),
+ nvidia-glx-legacy-173xx-dev,
 Replaces: nvidia-glx${nvidia:Legacy}-dev (<< 96.43.17)
 Description: NVIDIA OpenGL development files${nvidia:LegacyDesc}
  This package contains the development files for the NVIDIA OpenGL
@@ -207,11 +219,11 @@
 Architecture: i386 amd64
 Depends: ${misc:Depends}, dkms, nvidia-kernel-common (>= 20100522)
 Recommends: nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version})
-Provides: nvidia-kernel${nvidia:Legacy}-${nvidia:Version}
-Conflicts:
+Provides:
  nvidia-kernel-dkms,
- nvidia-kernel-legacy-71xx-dkms,
- nvidia-kernel-legacy-173xx-dkms,
+ nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+Conflicts:
+ nvidia-kernel-dkms,
  binutils-gold (>> 2.20.51)
 Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc}
  This package builds the NVIDIA Xorg binary kernel module needed by

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in?rev=1305&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in Mon Jul  5 20:30:59 2010
@@ -7,7 +7,7 @@
 libgl1-nvidia#LEGACY#-glx: spelling-error-in-binary
 
 # The diversions are placed here.
-libgl1-nvidia#LEGACY#-glx: package-contains-empty-directory usr/lib/nvidia/
+libgl1-nvidia#LEGACY#-glx: package-contains-empty-directory usr/lib/nvidia/diversions/
 
 # Packages built against the NVIDIA libGL should declare dependencies on
 # the free version for Debian's purposes.  Therefore we use a special

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postinst?rev=1305&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postinst Mon Jul  5 20:30:59 2010
@@ -3,8 +3,8 @@
 
 
 # <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 96.43.17~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 96.43.17~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 96.43.17~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 96.43.17~ -- "$@"
 # </target: squeeze>
 
 
@@ -13,14 +13,14 @@
 
 	# <target: squeeze>
 	if dpkg --compare-versions "$2" lt-nl 96.43.17 ; then
-	    update-rc.d nvidia-glx remove || true
+	    update-rc.d $DPKG_MAINTSCRIPT_PACKAGE remove || true
 	fi
 	# </target: squeeze>
 
 	# <target: squeeze>
         if dpkg --compare-versions "$2" lt-nl 96.43.17 ; then
-	    if [ -f /etc/default/nvidia-glx.dpkg-new ]; then
-		rm -f /etc/default/nvidia-glx.dpkg-new
+	    if [ -f /etc/default/$DPKG_MAINTSCRIPT_PACKAGE.dpkg-new ]; then
+		rm -f /etc/default/$DPKG_MAINTSCRIPT_PACKAGE.dpkg-new
 	    fi
 	fi
 	# </target: squeeze>

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postrm?rev=1305&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.postrm Mon Jul  5 20:30:59 2010
@@ -5,8 +5,8 @@
 #DIVERT_QUIET="--quiet"
 
 # <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 96.43.17~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 96.43.17~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 96.43.17~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 96.43.17~ -- "$@"
 # </target: squeeze>
 
 
@@ -39,11 +39,10 @@
 	fi
 
 	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
-		/usr/lib/nvidia/libglx.so.xlibmesa \
+		/usr/lib/nvidia/diversions/libglx.so \
 		/usr/lib/xorg/modules/extensions/libglx.so
 
-	test ! -d /usr/lib/nvidia || \
-		rmdir /usr/lib/nvidia || true;
+	rmdir /usr/lib/nvidia/diversions /usr/lib/nvidia 2>/dev/null || true
 
 	# work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
 	rmdir /usr/lib/xorg/modules/extensions /usr/lib/xorg/modules /usr/lib/xorg 2>/dev/null || true

Modified: packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.preinst?rev=1305&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-96xx/trunk/debian/nvidia-glx.preinst Mon Jul  5 20:30:59 2010
@@ -4,9 +4,14 @@
 
 #DIVERT_QUIET="--quiet"
 
+exists()
+{
+	test -e "$1" || test -L "$1"
+}
+
 # <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 96.43.17~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 96.43.17~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 96.43.17~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 96.43.17~ -- "$@"
 # </target: squeeze>
 
 
@@ -14,12 +19,46 @@
     install|upgrade)
 
 	# the destination directory for the diversions
-	test -d /usr/lib/nvidia || \
-		mkdir -p /usr/lib/nvidia || true
+	test -d /usr/lib/nvidia/diversions || \
+		mkdir -p /usr/lib/nvidia/diversions || true
+
+	# <target: squeeze>
+	# update the diversion
+        if dpkg --compare-versions "$2" lt-nl 195.36.31
+	then
+		file_orig="/usr/lib/xorg/modules/extensions/libglx.so"
+		file_old_divert="/usr/lib/nvidia/libglx.so.xlibmesa"
+		file_new_divert="/usr/lib/nvidia/diversions/libglx.so"
+		old_diverter="`dpkg-divert --listpackage $file_orig`"
+
+		if [ -n "$old_diverter" ]
+		then
+			# avoid dpkg-divert --add --rename in upgrade scenarios,
+			# it might rename *our* existing file -- see dpkg bug #588077
+
+			dpkg-divert --remove --package $old_diverter --divert \
+				"$file_old_divert" \
+				"$file_orig"
+			if exists "$file_old_divert"
+			then
+				echo "Moving $file_old_divert to $file_new_divert"
+				mv "$file_old_divert" "$file_new_divert"
+			fi
+			dpkg-divert --add --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+				"$file_new_divert" \
+				"$file_orig"
+		fi
+		if exists "$file_old_divert"
+		then
+			echo "ERROR: $file_old_divert does still exist. Aborting."
+			exit 1
+		fi
+	fi
+	# </target: squeeze>
 
 	# make new diversions
 	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
-		/usr/lib/nvidia/libglx.so.xlibmesa \
+		/usr/lib/nvidia/diversions/libglx.so \
 		/usr/lib/xorg/modules/extensions/libglx.so
 
     ;;




More information about the Pkg-nvidia-devel mailing list