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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-08-07 06:05:23 +0000 (Sun, 07 Aug 2011)
New Revision: 687

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
clean up some long lines in debian/rules

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-07 01:26:15 UTC (rev 686)
+++ fglrx-driver/trunk/debian/changelog	2011-08-07 06:05:23 UTC (rev 687)
@@ -1,4 +1,4 @@
-fglrx-driver (1:11-7-4) UNRELEASED; urgency=low
+fglrx-driver (1:11-7-4) unstable; urgency=low
 
   [ Andreas Beckmann ]
   * Re-add B-D: libxinerama1.
@@ -16,17 +16,20 @@
   * Simplify lintian overrides.
   * Stop shipping libfglrx_dm.a, there is a shared library available.
   * Put libglx.so back into the fglrx-driver package.
-  * Do not install duplicate copies of the Xorg modules.  (Closes: #636450)
+  * Do not install duplicate copies of the Xorg modules (Closes: #636450).
   * Keep upstream's names of fglrx-libGL.so.1.2 and fglrx-libglx.so, add or
     adjust symlinks instead.
   * Simplify and reorder debian/rules. Use DEB_HOST_* instead of DEB_BUILD_*.
   * Update README.Debian, drop outdated info, mention alternatives.
   * The diversion/alternatives transition to glx-diversions and
     glx-alternative-glx should now be finished and this package should work
-    again properly with multiarch Xorg packages.  (Closes: #627020)
+    again properly with multiarch Xorg packages (Closes: #627020).
 
- -- Andreas Beckmann <debian at abeckmann.de>  Thu, 04 Aug 2011 23:42:27 +0200
+  [ Michael Gilbert ]
+  * Clean up some long lines in debian/rules.
 
+ -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 07 Aug 2011 01:05:57 -0400
+
 fglrx-driver (1:11-7-3) unstable; urgency=low
 
   [ Andreas Beckmann ]

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-07 01:26:15 UTC (rev 686)
+++ fglrx-driver/trunk/debian/rules	2011-08-07 06:05:23 UTC (rev 687)
@@ -19,7 +19,8 @@
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
 
 %: %.in
-	sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+	sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g \
+	    -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
 
 %:
 	dh $@
@@ -35,7 +36,8 @@
 
 # Compare the license in debian/copyright with the LICENSE shipped in the archive.
 compare-copyright-license: LICENSE.txt
-	sed -e '1,/^License: other-AMD-FGLRX$$/d; /^$$/,$$d; /^ .$$/d' debian/copyright > copyright.tmp
+	sed -e '1,/^License: other-AMD-FGLRX$$/d; /^$$/,$$d; /^ .$$/d' debian/copyright \
+	    > copyright.tmp
 	sed -e '/^ .$$/d' LICENSE.txt > LICENSE.tmp
 	diff -w copyright.tmp LICENSE.tmp
 	rm -f copyright.tmp LICENSE.tmp
@@ -63,9 +65,11 @@
 override_dh_makeshlibs:
 	dh_makeshlibs
 	test ! -d debian/fglrx-glx || \
-	    sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/fglrx-glx/DEBIAN/shlibs
+	    sed -i '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' \
+	    debian/fglrx-glx/DEBIAN/shlibs
 	test ! -d debian/fglrx-glx-ia32 || \
-	    sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/fglrx-glx-ia32/DEBIAN/shlibs
+	    sed -i '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' \
+	    debian/fglrx-glx-ia32/DEBIAN/shlibs
 
 ############################################################################
 
@@ -87,7 +91,8 @@
 	# but first try to look in the "cache".
 	# For some reason wget refuses to clobber and restarts everytime.
 	# wget $(URL_PATH)/$(INSTALLER) -c -O $(CACHEDIR)/$(INSTALLER)
-	[ -s $(CACHEDIR)/$(INSTALLER) ] || wget $(URL_PATH)/$(INSTALLER) -c -O $(CACHEDIR)/$(INSTALLER)
+	[ -s $(CACHEDIR)/$(INSTALLER) ] || \
+	    wget $(URL_PATH)/$(INSTALLER) -c -O $(CACHEDIR)/$(INSTALLER)
 	[ -s $(CACHEDIR)/$(INSTALLER) ]
 	cp $(CACHEDIR)/$(INSTALLER) .