[Pkg-fglrx-devel] r1195 - fglrx-driver/branches/experimental/debian

[Michael Gilbert]

Author: mgilbert
Date: 2013-04-28 22:37:56 +0000 (Sun, 28 Apr 2013)
New Revision: 1195

Modified:
   fglrx-driver/branches/experimental/debian/rules
   fglrx-driver/branches/experimental/debian/watch
Log:
Update upstream tarball paths.

Modified: fglrx-driver/branches/experimental/debian/rules
===================================================================
--- fglrx-driver/branches/experimental/debian/rules	2013-04-06 13:05:33 UTC (rev 1194)
+++ fglrx-driver/branches/experimental/debian/rules	2013-04-28 22:37:56 UTC (rev 1195)
@@ -191,7 +191,7 @@
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER_PREFIX	?= amd-driver-installer-catalyst
+INSTALLER_PREFIX	?= amd-catalyst
 INSTALLER_SUFFIX	?= linux-x86.x86_64
 INSTALLER		?= $(INSTALLER_PREFIX)-$(RUN_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).run
 INSTALLER_ZIP		?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).zip
@@ -216,6 +216,7 @@
 	[ -s $(CACHEDIR)/$(INSTALLER) ] || [ -s $(CACHEDIR)/$(INSTALLER_ZIP) ]
 	[ ! -s $(CACHEDIR)/$(INSTALLER) ] || cp -a $(CACHEDIR)/$(INSTALLER) .
 	[ -s $(INSTALLER) ] || unzip $(CACHEDIR)/$(INSTALLER_ZIP)
+	rm -f $(CACHEDIR)/$(INSTALLER_ZIP)
 
 ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
 	rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
@@ -238,7 +239,7 @@
 
 get-orig-source: get-orig-source-checks $(INSTALLER)
 	$(MAKE) -f debian/rules repack_upstream_archive
-	rm -f $(INSTALLER)
+	rm -f $(CACHEDIR)/$(INSTALLER)
 
 repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
 else

Modified: fglrx-driver/branches/experimental/debian/watch
===================================================================
--- fglrx-driver/branches/experimental/debian/watch	2013-04-06 13:05:33 UTC (rev 1194)
+++ fglrx-driver/branches/experimental/debian/watch	2013-04-28 22:37:56 UTC (rev 1195)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-beta/~beta/;s/-/./g" \
-http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(?:catalyst-)?(.*).linux-x86.x86_64.(?:run|zip)
+http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-catalyst-(.*).linux-x86.x86_64.(?:run|zip)