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

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: 2007-06-09 00:45:29 +0000 (Sat, 09 Jun 2007)
New Revision: 3654

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/zaptel_perl.dpatch
   zaptel/trunk/debian/patches/ztdiag.dpatch
   zaptel/trunk/debian/rules
Log:
* Fixed and re-added zaptel_perl.
* And added zaptel_hardware (zaptel hardware lister), just for fun.


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-06-08 23:05:50 UTC (rev 3653)
+++ zaptel/trunk/debian/changelog	2007-06-09 00:45:29 UTC (rev 3654)
@@ -1,9 +1,14 @@
 zaptel (1:1.4.3~dfsg-2) UNRELEASED; urgency=low
 
+  [ Mark Purcell ]
   * NOT RELEASED YET
 
- -- Mark Purcell <msp at debian.org>  Sat, 09 Jun 2007 00:05:46 +0100
+  [ Tzafrir Cohen ]
+  * Fixed and re-added zaptel_perl. 
+  * And added zaptel_hardware (zaptel hardware lister), just for fun. 
 
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 09 Jun 2007 03:36:17 +0300
+
 zaptel (1:1.4.3~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-06-08 23:05:50 UTC (rev 3653)
+++ zaptel/trunk/debian/patches/00list	2007-06-09 00:45:29 UTC (rev 3654)
@@ -1,2 +1,2 @@
 ztdiag
-#zaptel_perl
+zaptel_perl

Modified: zaptel/trunk/debian/patches/zaptel_perl.dpatch
===================================================================
--- zaptel/trunk/debian/patches/zaptel_perl.dpatch	2007-06-08 23:05:50 UTC (rev 3653)
+++ zaptel/trunk/debian/patches/zaptel_perl.dpatch	2007-06-09 00:45:29 UTC (rev 3654)
@@ -4,37 +4,19 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Enable installing the Zaptel perl modules. They are still disabled in
 ## DP: upstream to reduce surprise. Also point to the right directory under
-## DP: which to install perl modules.
-## DP: Also includes some small fixes that will be included on next 
-## DP: release ofupstream.
+## DP: which to install perl modules (vendorlib vs. sitelib).
 
 @DPATCH@
-diff -urNad zaptel-1.2.15~dfsg~/xpp/utils/Makefile zaptel-1.2.15~dfsg/xpp/utils/Makefile
---- zaptel-1.2.15~dfsg~/xpp/utils/Makefile	2007-02-28 22:57:52.000000000 +0200
-+++ zaptel-1.2.15~dfsg/xpp/utils/Makefile	2007-03-10 01:03:26.000000000 +0200
-@@ -24,7 +24,7 @@
+diff -urNad zaptel-1.4.3~dfsg~/xpp/utils/Makefile zaptel-1.4.3~dfsg/xpp/utils/Makefile
+--- zaptel-1.4.3~dfsg~/xpp/utils/Makefile	2007-02-28 22:57:52.000000000 +0200
++++ zaptel-1.4.3~dfsg/xpp/utils/Makefile	2007-03-10 01:03:26.000000000 +0200
+@@ -24,8 +24,7 @@
+ MANDIR		= $(mandir)/man8
  HOTPLUG_USB_DIR	= /etc/hotplug/usb
  UDEV_RULES_DIR	= /etc/udev/rules.d
- # Perl disabled by default, until we see it is safe:
+-# Perl disabled by default, until we see it is safe:
 -#PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
-+#PERLLIBDIR	= $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
- 
- XPD_FIRMWARE	= $(wildcard ../firmwares/*.hex)
- XPD_INIT_DATA	= $(XPD_FIRMWARE) init_fxo_modes
-@@ -47,7 +47,7 @@
- %.8: %
- 	pod2man --section 8 $^ > $@ || $(RM) $@
- PERL_SCRIPTS	= zt_registration xpp_sync lszaptel
--PERL_MANS	= zt_registration.8 xpp_sync.8 lszaptel.8
-+PERL_MANS	= $(PERL_SCRIPTS:%=%.8)
- 
- TARGETS	= init_fxo_modes print_modes adj_clock
- PROG_INSTALL	= genzaptelconf adj_clock
-@@ -60,6 +60,7 @@
- ifneq	(,$(PERLLIBDIR))
- PROG_INSTALL	+= $(PERL_SCRIPTS)
- MAN_INSTALL	+= $(PERL_MANS)
-+TARGETS		+= $(PERL_MANS)
- endif
- 
- all: $(TARGETS)
++PERLLIBDIR	= $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
+ PERL_DIRS	:= Zaptel Zaptel/Hardware Zaptel/Xpp
+ PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
+ PERL_MODS	:= $(shell cd zconf; echo $(PERL_MODS_PAT))

Modified: zaptel/trunk/debian/patches/ztdiag.dpatch
===================================================================
--- zaptel/trunk/debian/patches/ztdiag.dpatch	2007-06-08 23:05:50 UTC (rev 3653)
+++ zaptel/trunk/debian/patches/ztdiag.dpatch	2007-06-09 00:45:29 UTC (rev 3654)
@@ -5,6 +5,8 @@
 ## DP: ZT_CHANDIAG (used in ztdiag) is disabled by default, as it allocates
 ## DP: a large struct on the stack. This patch allocates it in the heap,
 ## DP: and also enables it by default.
+## DP: Upstream bug: http://bugs.digium.com/view.php?id=9364 . Already 
+## DP: applied to zaptel trunk.
 
 @DPATCH@
 diff -urNad zaptel-1.4.1~dfsg~/zaptel-base.c zaptel-1.4.1~dfsg/zaptel-base.c

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2007-06-08 23:05:50 UTC (rev 3653)
+++ zaptel/trunk/debian/rules	2007-06-09 00:45:29 UTC (rev 3654)
@@ -122,6 +122,7 @@
 	$(MAKE) install-programs INSTALL_PREFIX=$(CURDIR)/debian/tmp
 	$(MAKE) install-libs INSTALL_PREFIX=$(CURDIR)/debian/tmp
 	$(MAKE) -C xpp/utils install DESTDIR=$(CURDIR)/debian/tmp
+	install xpp/utils/zaptel_hardware $(CURDIR)/debian/tmp/usr/sbin
 	/sbin/ldconfig -n $(CURDIR)/debian/tmp/usr/lib
 	install -D -m 644 tonezone.h $(CURDIR)/debian/tmp/usr/include/zaptel/tonezone.h