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

[Andreas Beckmann]

Author: anbe
Date: 2013-05-05 20:12:39 +0000 (Sun, 05 May 2013)
New Revision: 1224

Modified:
   fglrx-legacy-driver/trunk/debian/README.source
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/fglrx-driver.install.in
   fglrx-legacy-driver/trunk/debian/rules
   fglrx-legacy-driver/trunk/debian/rules.defs
Log:
merge changes from fglrx-driver (trunk @ r1223)

Modified: fglrx-legacy-driver/trunk/debian/README.source
===================================================================
--- fglrx-legacy-driver/trunk/debian/README.source	2013-05-05 20:05:44 UTC (rev 1223)
+++ fglrx-legacy-driver/trunk/debian/README.source	2013-05-05 20:12:39 UTC (rev 1224)
@@ -8,7 +8,13 @@
   This will wget version 11-1 of fglrx-driver from the upstream download
   resource, and repackage it under "../".
 
+* Sometimes the (beta) release does not contain a signature which will
+  result in displaying an unwanted watermark. The signature file needs to
+  be obtained by other means (...) and placed in "debian/import/signature".
+  Setting SIGNATURE_VERSION in debian/rules.def to the current upstream
+  version will use the imported signature file instead of the shipped one.
 
+
 Backporting to squeeze
 ======================
 

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2013-05-05 20:05:44 UTC (rev 1223)
+++ fglrx-legacy-driver/trunk/debian/changelog	2013-05-05 20:12:39 UTC (rev 1224)
@@ -8,6 +8,7 @@
     - Drop versioned Pre-Depends on dpkg. We only support installing on and
       upgrading from wheezy or newer.
     - Use canonical Vcs-* URLs.
+    - Simplify importing signature files.
   * Upload to unstable.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 05 May 2013 20:47:24 +0200
@@ -81,14 +82,23 @@
 
 
 
+fglrx-driver (1:13.4-3) UNRELEASED; urgency=low
+
+  * Drop maintainer script code targeting upgrades from before wheezy.
+  * Use again the shipped signature file.
+  * Simplify importing signature files: Save them as debian/import/signature
+    and in debian/rules.defs set SIGNATURE_VERSION = <upstream version>.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 05 May 2013 21:08:34 +0200
+
 fglrx-driver (1:13.4-2) unstable; urgency=low
 
   * Recommend opencl-icd again as preferred alternative.  (Reopens: #695884)
   * Bump glx-alternative-fglrx dependency.
   * Drop transitional packages.
   * Drop Conflicts/Breaks/Replaces that are satisfied in wheezy.
-  * Drop versioned Pre-Depends on dpkg. We only support upgrading from wheezy
-    and newer.
+  * Drop versioned Pre-Depends on dpkg. We only support installing on and
+    upgrading from wheezy or newer.
   * Use canonical Vcs-* URLs.
   * Update lintian overrides.
   * Upload to unstable.

Modified: fglrx-legacy-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-legacy-driver/trunk/debian/fglrx-driver.install.in	2013-05-05 20:05:44 UTC (rev 1223)
+++ fglrx-legacy-driver/trunk/debian/fglrx-driver.install.in	2013-05-05 20:12:39 UTC (rev 1224)
@@ -1,5 +1,4 @@
-common/etc/ati/signature					etc/ati/
-#debian/signature						etc/ati/
+_SIGDIR_/signature						etc/ati/
 common/etc/ati/control						etc/ati/
 common/etc/ati/atiogl.xml					etc/ati/
 common/etc/ati/amdpcsdb.default					etc/ati/

Modified: fglrx-legacy-driver/trunk/debian/rules
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules	2013-05-05 20:05:44 UTC (rev 1223)
+++ fglrx-legacy-driver/trunk/debian/rules	2013-05-05 20:12:39 UTC (rev 1224)
@@ -10,6 +10,7 @@
 
 include debian/rules.defs
 MULTIARCH		?=
+SIGNATURE_VERSION	?=
 variant			?=
 variant_desc_suffix	?=
 fglrx			?= fglrx$(variant)
@@ -28,6 +29,7 @@
 endif
 
 libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+sigdir		 = $(if $(filter $(upstream_version),$(SIGNATURE_VERSION)),debian/import,common/etc/ati)
 xorg_depends	 = $(foreach abi, $(XORG_ABI_LIST), xorg-video-abi-$(abi) |)
 
 CONTROL_PREFIXES = fglrx libfglrx libgl1-fglrx amd-opencl-icd
@@ -56,6 +58,7 @@
 	       -e 's%_XPIC_%$(xpic)%g' \
 	       -e 's%_LIB_%$(lib)%g' \
 	       -e 's%_LIBDIR_%$(libdir)%g' \
+	       -e 's%_SIGDIR_%$(sigdir)%g' \
 	       < $< > $@
 
 %:

Modified: fglrx-legacy-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-legacy-driver/trunk/debian/rules.defs	2013-05-05 20:05:44 UTC (rev 1223)
+++ fglrx-legacy-driver/trunk/debian/rules.defs	2013-05-05 20:12:39 UTC (rev 1224)
@@ -1,4 +1,5 @@
 MULTIARCH		 = yes
+SIGNATURE_VERSION	 =
 XORG_ABI_LIST		 = 12 11 10 8 6.0
 variant			 = -legacy
 variant_desc_suffix	 = $${Space}(legacy)