[pkg-nvidia-devel] r965 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control nvidia-glx.postinst nvidia-glx.postrm.in nvidia-glx.preinst

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Sun May 30 14:49:43 2010
New Revision: 965

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=965
Log:
  * nvidia-glx: add Pre-Depends: dpkg (>= 1.15.7.2)
  * nvidia-glx: switch to dpkg-maintscript-helper for removal of obsolete
    config file /etc/default/nvidia-glx

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=965&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun May 30 14:49:43 2010
@@ -15,6 +15,9 @@
   * debian/changelog: update packaging copyright, use gpl2+
   * debian/control: add Conflicts: ccache (<< 3.0~) (closes: #582748)
     (an alternate solution would be setting CCACHE_DISABLE=1)
+  * nvidia-glx: add Pre-Depends: dpkg (>= 1.15.7.2)
+  * nvidia-glx: switch to dpkg-maintscript-helper for removal of obsolete
+    config file /etc/default/nvidia-glx
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=965&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun May 30 14:49:43 2010
@@ -15,6 +15,7 @@
 
 Package: nvidia-glx
 Architecture: i386 amd64
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: nvidia-kernel-${nvidia:Version}, ${shlibs:Depends}, ${misc:Depends}
 Recommends: nvidia-vdpau-driver (>= ${nvidia:Version})
 Suggests: nvidia-settings,

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst?rev=965&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst Sun May 30 14:49:43 2010
@@ -18,36 +18,15 @@
 # the debian-policy package
 
 
-rm_conffile() {
-  mv_conffile "$1" "$1.dpkg-bak"
-}
-
-mv_conffile() {
-  local package='nvidia-glx'
-  local name="$1"
-  local newname="$2"
-
-  [ -e "$name" ] || return 0
-
-  local md5="$(md5sum $name | sed -e 's/ .*//')"
-  oldmd5="$(dpkg-query -W -f='${Conffiles}' $package | \
-    sed -n -e "\' $name ' { s/ obsolete$//; s/.* //; p }")"
-
-  if [ "$md5" = "$oldmd5" ]; then
-    rm -f "$name"
-  else
-    mv "$name" "$newname"
-  fi
-}
+# <target: squeeze>
+dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
+# </target: squeeze>
 
 
 case "$1" in
     configure)
 
 	# <target: squeeze>
-        if dpkg --compare-versions "$2" lt-nl 195.36.24-1 ; then
-            rm_conffile /etc/default/nvidia-glx
-        fi 
         if dpkg --compare-versions "$2" lt-nl 195.36.24-2 ; then
 	    if [ -f /etc/default/nvidia-glx.dpkg-new ]; then
 		rm -f /etc/default/nvidia-glx.dpkg-new

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in?rev=965&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Sun May 30 14:49:43 2010
@@ -17,6 +17,12 @@
 #          <overwriter-version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
+
+
+# <target: squeeze>
+dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
+# </target: squeeze>
+
 
 # Rationale:
 #

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst?rev=965&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst Sun May 30 14:49:43 2010
@@ -12,6 +12,11 @@
 #        * <old-preinst> `abort-upgrade' <new-version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
+
+
+# <target: squeeze>
+dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
+# </target: squeeze>
 
 
 case "$1" in