[Pkg-voip-commits] r2162 - zaptel/trunk/debian

[Mark Purcell]

Author: msp
Date: 2006-08-01 17:14:12 +0000 (Tue, 01 Aug 2006)
New Revision: 2162

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/copyright
   zaptel/trunk/debian/rules
Log:
* Urgency high as this is blocking a security fix for asterisk
* Remove non-modifiable firmware to make DFSG compliant. Does
  anyone need this firmware? (Closes: #379458)

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-08-01 07:16:06 UTC (rev 2161)
+++ zaptel/trunk/debian/changelog	2006-08-01 17:14:12 UTC (rev 2162)
@@ -1,8 +1,10 @@
-zaptel (1:1.2.7-3) UNRELEASED; urgency=low
+zaptel (1:1.2.7.dfsg-1) unstable; urgency=high
 
-  * NOT RELEASED YET
+  * Urgency high as this is blocking a security fix for asterisk
+  * Remove non-modifiable firmware to make DFSG compliant. Does
+    anyone need this firmware? (Closes: #379458)
 
- -- Mark Purcell <msp at debian.org>  Tue,  1 Aug 2006 06:38:46 +0100
+ -- Mark Purcell <msp at debian.org>  Tue,  1 Aug 2006 15:27:09 +0100
 
 zaptel (1:1.2.7-2) unstable; urgency=low
 

Modified: zaptel/trunk/debian/copyright
===================================================================
--- zaptel/trunk/debian/copyright	2006-08-01 07:16:06 UTC (rev 2161)
+++ zaptel/trunk/debian/copyright	2006-08-01 17:14:12 UTC (rev 2162)
@@ -1,8 +1,18 @@
 This package was debianized by Matt Zimmerman <mdz at debian.org> on
 Mon, 17 Jun 2002 10:31:21 -0400.
 
-It was downloaded from http://www.asteriskpbx.org/
+It was downloaded from http://www.asterisk.org/
 
+Upstream source has been modified to comply with the Debian Free 
+Software Guildlines (DFSG), by the removal of the firmware files:
+
+    OCT6114-128D.ima
+    xpp/utils/*.hex
+
+xpp/LICENSE.firmware permits redistribution but does not mention
+modification, which is a requirement of Debian Policy 2.1 ("Derived works").
+
+
 Upstream Authors: Jim Dixon / Zapate Telephony, Linux Support Services, Inc.
 
 Copyright (from zaptel.c):

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2006-08-01 07:16:06 UTC (rev 2161)
+++ zaptel/trunk/debian/rules	2006-08-01 17:14:12 UTC (rev 2162)
@@ -130,8 +130,7 @@
 	
 	# driver source code
 	mkdir -p $(TARDIR)/debian
-	#cp -r debian/makefiles/* $(TARDIR)/
-	cp Makefile .version *.c *.h *.rbt *.ima $(TARDIR)/
+	cp Makefile .version *.c *.h *.rbt $(TARDIR)/
 	for dir in build_tools include cwain qozap vzaphfc xpp zaphfc ztgsm; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
@@ -217,6 +216,16 @@
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@echo Downloading $(FILENAME) from $(URL) ...
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+	@@echo Repacking as DFSG-free...
+	@@mkdir -p ../tarballs/zaptel-$(UPVERSION).tmp/
+	@@cd ../tarballs/zaptel-$(UPVERSION).tmp ; \
+	tar xfz ../$(UPFILENAME)
+	@@rm -rf ../tarballs/zaptel-$(UPVERSION).tmp/zaptel-$(UPVERSION)/OCT6114-128D.ima
+	@@rm -rf ../tarballs/zaptel-$(UPVERSION).tmp/zaptel-$(UPVERSION)/xpp/utils/*.hex
+	@@cd ../tarballs/zaptel-$(UPVERSION).tmp ; \
+	tar cfz ../$(FILENAME) *
+	@@echo Cleaning up...
+	@@$(RM) -rf ../tarballs/zaptel-$(UPVERSION).tmp/
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure patch unpatch