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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-07-09 13:25:59 +0000 (Mon, 09 Jul 2012)
New Revision: 973

Modified:
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/libxvbaw-dev.lintian-overrides
   fglrx-driver/trunk/debian/rules
   fglrx-driver/trunk/debian/rules.defs
Log:
reindent and fix a few substitutions

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-07-09 09:00:44 UTC (rev 972)
+++ fglrx-driver/trunk/debian/control	2012-07-09 13:25:59 UTC (rev 973)
@@ -43,7 +43,7 @@
  xserver-xorg-core,
  glx-alternative-fglrx (>= 0.2),
 Recommends:
- ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
+ ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
  libgl1-${fglrx}-glx (= ${binary:Version}),
  libgl1-${fglrx}-glx-i386 [amd64],
  ${fglrx}-glx-ia32 [amd64],

Modified: fglrx-driver/trunk/debian/libxvbaw-dev.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/libxvbaw-dev.lintian-overrides	2012-07-09 09:00:44 UTC (rev 972)
+++ fglrx-driver/trunk/debian/libxvbaw-dev.lintian-overrides	2012-07-09 13:25:59 UTC (rev 973)
@@ -1 +1 @@
-libxvbaw-dev: no-upstream-changelog
+no-upstream-changelog

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-07-09 09:00:44 UTC (rev 972)
+++ fglrx-driver/trunk/debian/rules	2012-07-09 13:25:59 UTC (rev 973)
@@ -9,7 +9,7 @@
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 include debian/rules.defs
-MULTIARCH	?=
+MULTIARCH		?=
 legacy		?=
 legacy_description	?=
 
@@ -32,9 +32,9 @@
 ALL_CONTROL	:= $(wildcard $(patsubst %,debian/%*,$(CONTROL_PREFIXES)))
 LEGACY_CONTROL	:= $(wildcard $(patsubst %,debian/%$(legacy)*,$(CONTROL_PREFIXES)))
 RENAME_CONTROL	 = $(filter-out $(LEGACY_CONTROL),$(ALL_CONTROL))
-RENAMED_CONTROL	 = $(patsubst debian/fglrx%,debian/fglrx$(legacy)%,\
-			$(patsubst debian/libfglrx%,debian/libfglrx$(legacy)%,\
-			$(patsubst debian/libgl1-fglrx%,debian/libgl1-fglrx$(legacy)%,\
+RENAMED_CONTROL	 = $(patsubst debian/fglrx%,debian/$(fglrx)%,\
+			$(patsubst debian/libfglrx%,debian/lib$(fglrx)%,\
+			$(patsubst debian/libgl1-fglrx%,debian/libgl1-$(fglrx)%,\
 			$(patsubst debian/amd-opencl-icd%,debian/amd-opencl-icd$(legacy)%,\
 				$(RENAME_CONTROL)))))
 export DH_ALWAYS_EXCLUDE=.in

Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2012-07-09 09:00:44 UTC (rev 972)
+++ fglrx-driver/trunk/debian/rules.defs	2012-07-09 13:25:59 UTC (rev 973)
@@ -1 +1 @@
-MULTIARCH	 = yes
+MULTIARCH		 = yes