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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-07 00:53:21 +0000 (Sun, 07 Aug 2011)
New Revision: 683

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
compare debian/copyright with ATI_LICENSE.TXT during build to detect license changes

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-07 00:49:23 UTC (rev 682)
+++ fglrx-driver/trunk/debian/changelog	2011-08-07 00:53:21 UTC (rev 683)
@@ -8,6 +8,8 @@
   * Convert debian/copyright to DEP-5 format.
   * Update debian/copyright from ATI_LICENSE.TXT: ATI => AMD, distribution of
     prebuilt modules is no longer permitted.
+  * Automatically detect license by comparing debian/copyright with
+    ATI_LICENSE.TXT during build.
   * 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.

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-07 00:49:23 UTC (rev 682)
+++ fglrx-driver/trunk/debian/rules	2011-08-07 00:53:21 UTC (rev 683)
@@ -26,9 +26,21 @@
 
 override_dh_auto_clean:
 	test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
+	rm -f LICENSE.txt
 	rm -f $(generated)
 
-override_dh_auto_configure: $(generated)
+# Reformat the LICENSE to the format needed for debian/copyright.
+LICENSE.txt: ATI_LICENSE.TXT
+	sed -e 's/ *$$//; s/^$$/./; s/^/ /;' $< > $@
+
+# 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 '/^ .$$/d' LICENSE.txt > LICENSE.tmp
+	diff -w copyright.tmp LICENSE.tmp
+	rm -f copyright.tmp LICENSE.tmp
+
+override_dh_auto_configure: $(generated) compare-copyright-license
 	cd debian/man && ./autogen.sh --copy
 	cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man \
 	    --with-xserver=Xorg