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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-06 17:01:56 +0000 (Sat, 06 Aug 2011)
New Revision: 671

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
Overhaul get-orig-source target. Fix file permissions while repacking.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-06 15:43:00 UTC (rev 670)
+++ fglrx-driver/trunk/debian/changelog	2011-08-06 17:01:56 UTC (rev 671)
@@ -9,6 +9,7 @@
     prebuilt modules is no longer permitted.
   * Check for fglrx configuration in /etx/xorg.conf.d/, too, and don't print
     messages about missing files.
+  * Overhaul get-orig-source target. Fix file permissions while repacking.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 04 Aug 2011 23:42:27 +0200
 

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-06 15:43:00 UTC (rev 670)
+++ fglrx-driver/trunk/debian/rules	2011-08-06 17:01:56 UTC (rev 671)
@@ -72,23 +72,28 @@
 	# 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)
-	[ -f $(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) .
 
 ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2: get-orig-source-checks $(INSTALLER)
-	mkdir $(packagename)-$(NEW_UPSTREAM_VERSION) \
-	    && cd $(packagename)-$(NEW_UPSTREAM_VERSION) \
+	mkdir $(packagename)-$(NEW_UPSTREAM_VERSION).orig
+	cd $(packagename)-$(NEW_UPSTREAM_VERSION).orig \
 	    && /bin/sh ../$(INSTALLER) --extract . \
-	    && rm -f README.distro *.sh \
-	    && rm -rf packages setup.data x4* \
-	    && rm -rf x6* \
-	    && rm -f arch/*/lib/modules/fglrx/fglrx.*.o
+	    && rm -f README.distro *.sh *.exp cimle-xdgsu installer_creation_policy \
+	    && rm -rf packages setup.data \
+	    && rm -rf x4* x6* \
+	    && rm -f arch/*/lib/modules/fglrx/fglrx.*.o \
+	    && chmod -R a-sx,u=rwX,go=rX . \
+	    && find . -type f \( -path '*/bin/*' -o -path '*/sbin/*' -o -name '*.sh' \) -exec chmod a+x {} +
 	# Create the tarball.
 	tar -cjf $(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 \
-	    $(packagename)-$(NEW_UPSTREAM_VERSION) && mv \
-	    $(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ../
+	    --owner=root --group=src \
+	    $(packagename)-$(NEW_UPSTREAM_VERSION).orig
+	mv $(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ../
 	# Cleanup.
-	rm -fr $(packagename)-$(NEW_UPSTREAM_VERSION) && rm $(INSTALLER)
+	rm -fr $(packagename)-$(NEW_UPSTREAM_VERSION).orig
+	rm -f $(INSTALLER)
 
 get-orig-source: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ;