[Pkg-voip-commits] r2390 - in zaptel/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2006-09-15 18:09:22 +0000 (Fri, 15 Sep 2006)
New Revision: 2390

Removed:
   zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/copyright
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/rules
Log:
* firmware removed from wct4xxp/OCT6114-128D.ima
* TODO: applying patch Makefile_uname to ./ ... failed.

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-09-15 16:08:15 UTC (rev 2389)
+++ zaptel/trunk/debian/changelog	2006-09-15 18:09:22 UTC (rev 2390)
@@ -2,9 +2,10 @@
 
   * NOT RELEASED YET
   * New Upstream Release
-  * TODO: fixup applying patch dfsg_firmwarefree to ./ ... failed.
+  * firmware removed from wct4xxp/OCT6114-128D.ima
+  * TODO: applying patch Makefile_uname to ./ ... failed.
 
- -- Mark Purcell <msp at debian.org>  Tue, 12 Sep 2006 22:23:31 +0100
+ -- Mark Purcell <msp at debian.org>  Fri, 15 Sep 2006 19:07:53 +0100
 
 zaptel (1:1.2.8.dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/copyright
===================================================================
--- zaptel/trunk/debian/copyright	2006-09-15 16:08:15 UTC (rev 2389)
+++ zaptel/trunk/debian/copyright	2006-09-15 18:09:22 UTC (rev 2390)
@@ -6,8 +6,7 @@
 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
+    /wct4xxp/OCT6114-128D.ima
 
 xpp/LICENSE.firmware permits redistribution but does not mention
 modification, which is a requirement of Debian Policy 2.1 ("Derived works").

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-09-15 16:08:15 UTC (rev 2389)
+++ zaptel/trunk/debian/patches/00list	2006-09-15 18:09:22 UTC (rev 2390)
@@ -1,4 +1,4 @@
-dfsg_firmwarefree.dpatch
+#dfsg_firmwarefree.dpatch
 #Makefile_deps_kern
 Makefile_deps_utils
 Makefile_uname

Deleted: zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch
===================================================================
--- zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch	2006-09-15 16:08:15 UTC (rev 2389)
+++ zaptel/trunk/debian/patches/dfsg_firmwarefree.dpatch	2006-09-15 18:09:22 UTC (rev 2390)
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dfsg_firmwarefree.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove wct4xxp module due to lack of firmware to compile the *.h
-
- at DPATCH@
-diff -urNad zaptel-1.2.7.dfsg~/Makefile zaptel-1.2.7.dfsg/Makefile
---- zaptel-1.2.7.dfsg~/Makefile	2006-07-07 18:03:59.000000000 +0000
-+++ zaptel-1.2.7.dfsg/Makefile	2006-08-03 11:43:21.000000000 +0000
-@@ -98,8 +98,8 @@
- LIBTONEZONE_SO_MINOR_VER:=0
- 
- MODULES:=zaptel tor2 torisa wcusb wcfxo wctdm wctdm24xxp \
--	 ztdynamic ztd-eth wct1xxp wct4xxp wcte11xp pciradio \
--         ztd-loc # ztdummy
-+	 ztdynamic ztd-eth wct1xxp wcte11xp pciradio \
-+         ztd-loc # wct4xxp ztdummy
- #MODULES+=wcfxsusb
- # build ztdummy by default for 2.6 kernels
- ifeq ($(BUILDVER),linux26)
-@@ -131,9 +131,9 @@
- 
- all: $(BUILDVER) $(LIBTONEZONE_SO)
- 
--linux24: prereq vpm450m_fw.h $(MODULESO) $(BINS)
-+linux24: prereq $(MODULESO) $(BINS)
- 
--linux26: prereq vpm450m_fw.h $(BINS)
-+linux26: prereq $(BINS)
- 	@echo $(KSRC)
- 	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
- 	$(KMAKE) modules

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2006-09-15 16:08:15 UTC (rev 2389)
+++ zaptel/trunk/debian/rules	2006-09-15 18:09:22 UTC (rev 2390)
@@ -216,6 +216,7 @@
 	@@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)/wct4xxp/OCT6114-128D.ima
 	@@rm -rf ../tarballs/zaptel-$(UPVERSION).tmp/zaptel-$(UPVERSION)/xpp/utils/*.hex
 	@@cd ../tarballs/zaptel-$(UPVERSION).tmp ; \
 	tar cfz ../$(FILENAME) *