[Pkg-fglrx-devel] r739 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-25 07:24:04 +0000 (Thu, 25 Aug 2011)
New Revision: 739

Added:
   fglrx-driver/trunk/debian/fglrx-driver.maintscript
   fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/fglrx-driver.postinst
Log:
re-add some cleanup code needed for squeeze-backports, does not harm wheezy to have this, too

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-18 09:41:17 UTC (rev 738)
+++ fglrx-driver/trunk/debian/changelog	2011-08-25 07:24:04 UTC (rev 739)
@@ -7,6 +7,10 @@
     (Closes: #636055)
   * Override the experimental lintian tag shlib-calls-exit.
   * Cleanup maintainer scripts.
+  * Prepare support for squeeze-backports:
+    - Readd some maintainer script code to cleanup after the
+      /emul/ia32-linux/usr/lib => /usr/lib32 transition.
+    - Cleanup /etc/init.d/fglrx-driver.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 18 Aug 2011 09:46:11 +0200
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-08-18 09:41:17 UTC (rev 738)
+++ fglrx-driver/trunk/debian/control	2011-08-25 07:24:04 UTC (rev 739)
@@ -5,7 +5,7 @@
 Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
  Michael Gilbert <michael.s.gilbert at gmail.com>
 Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 8.1),
  bzip2,
  ia32-libs [amd64],
  libxrandr2,

Added: fglrx-driver/trunk/debian/fglrx-driver.maintscript
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.maintscript	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-driver.maintscript	2011-08-25 07:24:04 UTC (rev 739)
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/fglrx-driver 1:11-8-2~

Modified: fglrx-driver/trunk/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postinst	2011-08-18 09:41:17 UTC (rev 738)
+++ fglrx-driver/trunk/debian/fglrx-driver.postinst	2011-08-25 07:24:04 UTC (rev 739)
@@ -3,6 +3,10 @@
 
 if [ "$1" = "configure" ]; then
 
+	if dpkg --compare-versions "$2" lt-nl 1:11-8-2 ; then
+		update-rc.d -f fglrx-driver remove || true
+	fi
+
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ]; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi

Added: fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst	2011-08-25 07:24:04 UTC (rev 739)
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+	# <target: squeeze-backports>
+	# remove diversion created before the
+	# /emul/ia32-linux/usr/lib => /usr/lib32 transition
+	dpkg-divert --remove --rename --package fglrx-glx-ia32 --divert \
+		/emul/ia32-linux/usr/lib/fglrx/diversions/libGL.so.1 \
+		/emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+	dpkg-divert --remove --rename --package fglrx-glx-ia32 --divert \
+		/emul/ia32-linux/usr/lib/fglrx/diversions/libGL.so.1.2 \
+		/emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+
+	if [ -d /emul/ia32-linux/usr/lib/fglrx ]
+	then
+		rmdir /emul/ia32-linux/usr/lib/fglrx/diversions /emul/ia32-linux/usr/lib/fglrx || true;
+		rmdir /emul/ia32-linux/usr/lib /emul/ia32-linux/usr /emul/ia32-linux /emul 2>/dev/null || true
+	fi
+	# </target: squeeze-backports>
+
+fi
+
+#DEBHELPER#