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

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2007-03-24 05:40:14 +0000 (Sat, 24 Mar 2007)
New Revision: 3297

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/control
   zaptel/trunk/debian/rules
Log:
* Should fix modules building: restore generated files that were
  removed by a clean (Closes: #415280).


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-03-23 08:54:36 UTC (rev 3296)
+++ zaptel/trunk/debian/changelog	2007-03-24 05:40:14 UTC (rev 3297)
@@ -1,9 +1,14 @@
 zaptel (1:1.2.16~dfsg-1) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * (NOT RELEASED YET) New upstream release
 
- -- Mark Purcell <msp at debian.org>  Tue, 20 Mar 2007 21:18:54 +0000
+  [ Tzafrir Cohen ]
+  * Should fix modules building: restore generated files that were 
+    removed by a clean (Closes: #415280).
 
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 24 Mar 2007 07:52:44 +0200
+
 zaptel (1:1.2.15~dfsg-2) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: zaptel/trunk/debian/control
===================================================================
--- zaptel/trunk/debian/control	2007-03-23 08:54:36 UTC (rev 3296)
+++ zaptel/trunk/debian/control	2007-03-24 05:40:14 UTC (rev 3297)
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincón <santiago at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Build-Depends: debhelper (>= 5.0.37), libnewt-dev, dpatch (>= 2.0.9), bzip2, libusb-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2007-03-23 08:54:36 UTC (rev 3296)
+++ zaptel/trunk/debian/rules	2007-03-24 05:40:14 UTC (rev 3297)
@@ -36,12 +36,18 @@
 FILENAME := zaptel_$(UPVERSION)~dfsg.orig.tar.gz
 URL := http://ftp2.digium.com/pub/zaptel/releases/zaptel-$(UPVERSION).tar.gz
 
+# If the makefile was properly-writen, there was a good separation 
+# between kernel and userspace. As things stand now I'd like to work
+# around problems with bilding stuff with HOSTCC by simply providing 
+# the generated headers as part of the source:
 GENERATED_SOURCES := version.h radfw.h tor2fw.h tones.h 
 
 MOD_EXAMPLES_DIR:=modexamples
 BRISTUFF_MODULES:=cwain qozap zaphfc ztgsm
 ifeq (1,$(USE_BRISTUFF))
   BRISTUFF_EXAMPLES:=$(MOD_EXAMPLES_DIR)/*
+  # bristuff modules that are copied from a subdirectory to the current 
+  # directory.
   GENERATED_SOURCES+=$(BRISTUFF_MODULES:%=%.c) $(BRISTUFF_MODULES:%=%.h)
 endif
 
@@ -53,6 +59,7 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
+	cp -a $(CURDIR)/debian/generated/* .
 	make modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS)
 	make install-modules KERNELRELEASE=$(KVERS) INSTALL_PREFIX=$(CURDIR)/debian/$(PKGNAME)
 ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
@@ -135,11 +142,12 @@
 	dh_installdirs -i
 	
 	# driver source code
-	mkdir -p $(TARDIR)/debian
+	mkdir -p $(TARDIR)/debian/generated
 	cp Makefile Makefile.kernel26 .version *.c *.h *.rbt $(TARDIR)/
 	for dir in build_tools include vzaphfc oct612x wct4xxp wctc4xxp xpp; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
+	cp -a $(GENERATED_SOURCES) $(TARDIR)/debian/generated/
 	dh_install -i zaptel.h torisa.h usr/include/linux/
 	
 	# Packaging infrastructure