[Pkg-voip-commits] r4538 - in /zaptel/trunk/debian: changelog rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu Sep 20 23:01:00 2007
New Revision: 4538

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4538
Log:
Sync rules file from my local package:
* Include oslec control panel.
* No need to remove Astribank firmware, which is not included anyway.
* No need to make xpp/utils: done by upstream in 1.4 .

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/rules

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=4538&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu Sep 20 23:01:00 2007
@@ -16,8 +16,9 @@
     in 1.4.6).
   * Don't build oslec if it is not the Zaptel echo canceller.
   * Adjust line numbers in Lintian ignore file.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 16 Sep 2007 07:14:52 +0200
+  * Include oslec-ctrl-panel.sh as an example (Closes: #443363). 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 21 Sep 2007 00:02:56 +0200
 
 zaptel (1:1.4.5.1~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=4538&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Thu Sep 20 23:01:00 2007
@@ -146,9 +146,6 @@
 	
 	$(MAKE) install-programs DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) install-libs DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C xpp/utils install DESTDIR=$(CURDIR)/debian/tmp
-	# remove Astribank firmwares from main package:
-	rm -f $(CURDIR)/debian/tmp/usr/share/zaptel/*.hex
 	/sbin/ldconfig -n $(CURDIR)/debian/tmp/usr/lib
 	install -D -m 644 tonezone.h $(CURDIR)/debian/tmp/usr/include/zaptel/tonezone.h
 
@@ -168,7 +165,7 @@
 	# driver source code
 	mkdir -p $(TARDIR)/debian/generated
 	cp Makefile Makefile.kernel26 configure install-sh makeopts.in .version *.c *.h *.rbt $(TARDIR)/
-	for dir in build_tools firmware include vzaphfc oslec oct612x wct4xxp wctc4xxp wctdm24xxp xpp; do \
+	for dir in build_tools firmware include vzaphfc oct612x oslec wct4xxp wctc4xxp wctdm24xxp xpp; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
 	cp -a $(GENERATED_SOURCES) $(TARDIR)/debian/generated/
@@ -191,13 +188,6 @@
 else
 	mkdir -p $(MOD_EXAMPLES_DIR)/bristuff_stub
 endif
-	
-	#rm -rf modules
-
-	# TODO: this rmdir should not be required! (Tzafrir)
-	#rmdir debian/zaptel-source/usr/share/modass/overrides/zaptel
-	#dh_install -i debian/$(PREFIX)-source.modass \
-	#  usr/share/modass/overrides/$(PREFIX)
 	
 # Build architecture-independent files here.
 binary-indep: build install-indep
@@ -226,7 +216,9 @@
 	
 	# should be removed, eventually. Still left for compatibility
 	dh_installinit --update-rcd-params="defaults 15 30"
-	dh_installexamples -a zaptel.conf.sample 
+	dh_installexamples -a zaptel.conf.sample \
+	  oslec/oslec-ctrl-panel.sh
+
 	
 	#dh_installmodules -a
 	dh_installchangelogs -a ChangeLog