[Pkg-fglrx-devel] r1017 - fglrx-legacy-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-08-01 18:49:26 +0000 (Wed, 01 Aug 2012)
New Revision: 1017

Modified:
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/fglrx-driver.postrm
Log:
merge fglrx-driver/trunk up to r1016

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2012-08-01 18:46:24 UTC (rev 1016)
+++ fglrx-legacy-driver/trunk/debian/changelog	2012-08-01 18:49:26 UTC (rev 1017)
@@ -17,6 +17,13 @@
 
  -- Andreas Beckmann <debian at abeckmann.de>  Wed, 01 Aug 2012 13:54:51 +0200
 
+fglrx-driver (1:12-6+point-2) UNRELEASED; urgency=low
+
+  * fglrx-driver.postrm: Do not fail if the debconf templates are not
+    available (i.e. if the package is unconfigured).
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Wed, 01 Aug 2012 20:44:03 +0200
+
 fglrx-driver (1:12-6+point-1) unstable; urgency=low
 
   [ Debconf translations ]

Modified: fglrx-legacy-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-legacy-driver/trunk/debian/fglrx-driver.postrm	2012-08-01 18:46:24 UTC (rev 1016)
+++ fglrx-legacy-driver/trunk/debian/fglrx-driver.postrm	2012-08-01 18:49:26 UTC (rev 1017)
@@ -6,7 +6,7 @@
 warn_about_remaining_xorg_configuration()
 {
 	# allow to disable the check via preseeding
-	db_get fglrx-driver/check-xorg-conf-on-removal
+	db_get fglrx-driver/check-xorg-conf-on-removal || true
 	test "$RET" = "true" || return 0
 
 	XORG_CONF=$(grep -l '^[^#]*fglrx' /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf 2>/dev/null || true)