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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-08-04 06:01:25 +0000 (Thu, 04 Aug 2011)
New Revision: 648

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
single colons

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-04 06:01:17 UTC (rev 647)
+++ fglrx-driver/trunk/debian/changelog	2011-08-04 06:01:25 UTC (rev 648)
@@ -8,6 +8,7 @@
 
   [ Michael Gilbert ]
   * Handle generated files more robustly.
+  * Use single colons in rules file and terminat get-orig-source rule.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Thu, 04 Aug 2011 00:38:47 -0400
 

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-04 06:01:17 UTC (rev 647)
+++ fglrx-driver/trunk/debian/rules	2011-08-04 06:01:25 UTC (rev 648)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-packagename=fglrx-driver
+packagename=$(shell dpkg-parsechangelog | sed -nr '/^Source:/s/Source: (.*)/\1/p')
 upstream_version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
@@ -54,13 +54,13 @@
 	echo "xviddriver:Depends=$(xviddriver)" >> debian/fglrx-driver.substvars
 	dh_installdeb
 
-get-orig-source-checks::
+get-orig-source-checks:
 	# This target needs DEB_BUILD_OPTIONS to contain the version specification
 	# in the following form: VER=some.version.number
 	test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true
 	test ! -e debian/rules && echo "Run this command from the root of the package" && exit 1 || true
 
-$(INSTALLER)::
+$(INSTALLER):
 	# Make sure the .run package is in the proper place,
 	# but first try to look in the "cache".
 	# For some reason wget refuses to clobber and restarts everytime.
@@ -68,7 +68,7 @@
 	[ -f $(CACHEDIR)/$(INSTALLER) ] || wget $(URL_PATH)/$(INSTALLER) -c -O $(CACHEDIR)/$(INSTALLER)
 	cp $(CACHEDIR)/$(INSTALLER) .
 
-../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2:: get-orig-source-checks $(INSTALLER)
+../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2: get-orig-source-checks $(INSTALLER)
 	mkdir $(packagename)-$(NEW_UPSTREAM_VERSION) \
 	    && cd $(packagename)-$(NEW_UPSTREAM_VERSION) \
 	    && /bin/sh ../$(INSTALLER) --extract . \
@@ -83,7 +83,7 @@
 	# Cleanup.
 	rm -fr $(packagename)-$(NEW_UPSTREAM_VERSION) && rm $(INSTALLER)
 
-get-orig-source:: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2
+get-orig-source: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ;
 
 %:
-	test "${@}" = "get-orig-source" || dh ${@}
+	dh ${@}