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

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-07-08 02:18:12 +0000 (Sat, 08 Jul 2006)
New Revision: 2025

Modified:
   zaptel/trunk/debian/control
   zaptel/trunk/debian/copyright
   zaptel/trunk/debian/rules
   zaptel/trunk/debian/zaptel.install
Log:
* Don't depend on the non-free xpp-firmware (Doh!)
* rules: also build xpp utils
* rules: use CURDIR
* zaptel.install: xpp/utils installs man pages on its own

Modified: zaptel/trunk/debian/control
===================================================================
--- zaptel/trunk/debian/control	2006-07-08 01:56:10 UTC (rev 2024)
+++ zaptel/trunk/debian/control	2006-07-08 02:18:12 UTC (rev 2025)
@@ -11,7 +11,7 @@
 Architecture: any
 # Xorcom packages depend on xpp-firmware. Debian zaptel will probably 
 # just recommend it.
-Depends: ${shlibs:Depends}, procps, fxload, xpp-firmware
+Depends: ${shlibs:Depends}, procps, fxload
 Recommends: xpp-firmware
 Description: zapata telephony utilities
  Userspace utilities for configuring the Zapata telephony kernel driver, 

Modified: zaptel/trunk/debian/copyright
===================================================================
--- zaptel/trunk/debian/copyright	2006-07-08 01:56:10 UTC (rev 2024)
+++ zaptel/trunk/debian/copyright	2006-07-08 02:18:12 UTC (rev 2025)
@@ -45,8 +45,8 @@
 * Written by Oron Peled <oron at actcom.co.il>
 * Copyright (C) 2004-2006, Xorcom
 
-The following two files are not yet available for download. However they 
-are based on other Zaptel drives and distributed under the terms of the 
+The following file is not yet available for download. However it is 
+based on other Zaptel drives and distributed under the terms of the 
 GNU GPL:
 
 opvxa1200.c:

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2006-07-08 01:56:10 UTC (rev 2024)
+++ zaptel/trunk/debian/rules	2006-07-08 02:18:12 UTC (rev 2025)
@@ -80,6 +80,7 @@
 	dh_testdir
 	
 	$(MAKE) programs
+	$(MAKE) -C xpp/utils
 	touch $@
 
 build-indep-stamp:
@@ -109,17 +110,17 @@
 	
 	# Add here commands to install the package into debian/tmp
 	
-	$(MAKE) install-programs INSTALL_PREFIX=debian/tmp
-	$(MAKE) -C xpp/utils install DESTDIR=debian/tmp
-	/sbin/ldconfig -n debian/tmp/usr/lib
-	dh_install -a --sourcedir=debian/tmp sbin
+	$(MAKE) install-programs INSTALL_PREFIX=$(CURDIR)/debian/tmp
+	$(MAKE) -C xpp/utils install DESTDIR=$(CURDIR)/debian/tmp
+	/sbin/ldconfig -n $(CURDIR)/debian/tmp/usr/lib
+	dh_install -a --sourcedir=$(CURDIR)/debian/tmp 
 	
 	cp $(CURDIR)/debian/zaptel.permissions.rules \
 	  $(CURDIR)/debian/$(PREFIX)/etc/udev/rules.d/zaptel.perms
 	cp debian/$(PREFIX).lintian \
 	  $(CURDIR)/debian/$(PREFIX)/usr/share/lintian/overrides/$(PREFIX)
 
-TARPARDIR=debian/tmp
+TARPARDIR=$(CURDIR)/debian/tmp
 TARDIR=$(TARPARDIR)/modules/$(PREFIX)
 install-indep: build-indep-stamp
 	dh_testdir

Modified: zaptel/trunk/debian/zaptel.install
===================================================================
--- zaptel/trunk/debian/zaptel.install	2006-07-08 01:56:10 UTC (rev 2024)
+++ zaptel/trunk/debian/zaptel.install	2006-07-08 02:18:12 UTC (rev 2025)
@@ -1,4 +1,5 @@
 sbin/*
 usr/sbin/*
 usr/share/zaptel/*
+usr/share/man/man8/*
 etc/hotplug/usb/*