[Glibc-bsd-commits] r5994 - trunk/kfreebsd-11/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-10 17:43:40 +0000 (Sun, 10 Apr 2016)
New Revision: 5994

Modified:
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Replace ar9300_devid.h with a DFSG-free re-implementation


Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2016-04-10 17:40:09 UTC (rev 5993)
+++ trunk/kfreebsd-11/debian/changelog	2016-04-10 17:43:40 UTC (rev 5994)
@@ -27,6 +27,7 @@
   * Change Build-Depends from clang-3.6 to clang-3.7, to match upstream
   * Bump Build-Depends: freebsd-buildutils and freebsd-mk to (>= 10.3~)
   * Automatically enable debug options if ~debug appears in the Version
+  * Replace ar9300_devid.h with a DFSG-free re-implementation
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 06 Feb 2016 16:17:19 +0000
 

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2016-04-10 17:40:09 UTC (rev 5993)
+++ trunk/kfreebsd-11/debian/rules	2016-04-10 17:43:40 UTC (rev 5994)
@@ -106,6 +106,9 @@
 		| sed -ne 's/.*\sCLANG_VERSION\s\+//p' \
 		> $(ORIG_DIR)/CLANG_VERSION
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
+	# Replace file with a DFSG-free re-implementation
+	cp -af debian/local/ar9300_devid.h $(ORIG_DIR)/sys/contrib/dev/ath/ath_hal/ar9300/
+	cp -af debian/local/ar9300_devid.h $(ORIG_DIR)/sys/dev/ath/ath_hal/ar9003/
 	# Clamp timestamps to be no newer than last changelog entry, see
 	# https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball
 	find $(ORIG_DIR) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 \