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

[Andreas Beckmann]

Author: anbe
Date: 2013-10-17 16:10:19 +0000 (Thu, 17 Oct 2013)
New Revision: 1280

Modified:
   fglrx-driver/trunk/debian/README.source
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
place generated tarball in the current directory

Modified: fglrx-driver/trunk/debian/README.source
===================================================================
--- fglrx-driver/trunk/debian/README.source	2013-10-13 20:56:36 UTC (rev 1279)
+++ fglrx-driver/trunk/debian/README.source	2013-10-17 16:10:19 UTC (rev 1280)
@@ -6,7 +6,7 @@
     DEB_BUILD_OPTIONS="VER=11-1" debian/rules get-orig-source
 
   This will wget version 11-1 of fglrx-driver from the upstream download
-  resource, and repackage it under "../".
+  resource, and repackage it in the current directory.
 
 * Sometimes the (beta) release does not contain a signature which will
   result in displaying an unwanted watermark. The signature file needs to

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-10-13 20:56:36 UTC (rev 1279)
+++ fglrx-driver/trunk/debian/changelog	2013-10-17 16:10:19 UTC (rev 1280)
@@ -12,6 +12,7 @@
   * d/rules{,.defs}: Add support for yet another upstream file naming scheme.
   * Don't explicitly request xz compression - dpkg 1.17 does this by default.
   * Drop empty Description paragraphs that worked around dpkg bug #680871.
+  * get-orig-source: Place tarball in current directory.  (Closes: #718220)
   * Update lintian overrides.
 
  -- Andreas Beckmann <anbe at debian.org>  Fri, 26 Jul 2013 01:04:26 +0200

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2013-10-13 20:56:36 UTC (rev 1279)
+++ fglrx-driver/trunk/debian/rules	2013-10-17 16:10:19 UTC (rev 1280)
@@ -218,7 +218,7 @@
 	[ ! -s $(CACHEDIR)/$(INSTALLER) ] || cp -a $(CACHEDIR)/$(INSTALLER) .
 	[ -s $(INSTALLER) ] || unzip $(CACHEDIR)/$(INSTALLER_ZIP)
 
-../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
+$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
 	rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
 	sh $(INSTALLER) --extract $(packagename)-$(REAL_UPSTREAM_VERSION).orig
 	@set -x ; \
@@ -233,7 +233,6 @@
 	tar -cJf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz \
 	    --owner=root --group=src \
 	    $(packagename)-$(REAL_UPSTREAM_VERSION).orig
-	mv $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz ../
 	# Cleanup.
 	rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
 
@@ -241,7 +240,7 @@
 	$(MAKE) -f debian/rules repack_upstream_archive
 	rm -f $(INSTALLER)
 
-repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
+repack_upstream_archive: $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
 else
 get-orig-source:
 	# This target needs DEB_BUILD_OPTIONS to contain the version specification