[Pkg-fglrx-devel] r747 - fglrx-driver/branches/multiarch/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-26 07:31:02 +0000 (Fri, 26 Aug 2011)
New Revision: 747

Added:
   fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.maintscript
   fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.postinst
Removed:
   fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript
Modified:
   fglrx-driver/branches/multiarch/debian/control
   fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst
Log:
merge changes from trunk up to r746

Modified: fglrx-driver/branches/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control	2011-08-26 07:24:48 UTC (rev 746)
+++ fglrx-driver/branches/multiarch/debian/control	2011-08-26 07:31:02 UTC (rev 747)
@@ -221,6 +221,8 @@
 
 Package: fglrx-atieventsd
 Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2),
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},

Copied: fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.maintscript (from rev 746, fglrx-driver/trunk/debian/fglrx-atieventsd.maintscript)
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.maintscript	                        (rev 0)
+++ fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.maintscript	2011-08-26 07:31:02 UTC (rev 747)
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/fglrx-driver 1:11-8-2~

Copied: fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.postinst (from rev 746, fglrx-driver/trunk/debian/fglrx-atieventsd.postinst)
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.postinst	                        (rev 0)
+++ fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.postinst	2011-08-26 07:31:02 UTC (rev 747)
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+	if dpkg --compare-versions "$2" lt-nl 1:11-8-2 ; then
+		update-rc.d fglrx-driver remove || true
+	fi
+
+fi
+
+#DEBHELPER#

Deleted: fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript	2011-08-26 07:24:48 UTC (rev 746)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript	2011-08-26 07:31:02 UTC (rev 747)
@@ -1 +0,0 @@
-rm_conffile /etc/init.d/fglrx-driver 1:11-8-2~

Modified: fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst	2011-08-26 07:24:48 UTC (rev 746)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst	2011-08-26 07:31:02 UTC (rev 747)
@@ -3,10 +3,6 @@
 
 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