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

[msp at alioth.debian.org]

Author: msp
Date: 2007-08-18 11:55:42 +0000 (Sat, 18 Aug 2007)
New Revision: 4041

Added:
   zaptel/trunk/debian/patches/inlcude.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/rules
Log:
* Add debian/patches/inlcude.dpatch - upstream typo
* debian/rules: upstream change INSTALL_PREFIX->DESTDIR

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-08-18 11:39:07 UTC (rev 4040)
+++ zaptel/trunk/debian/changelog	2007-08-18 11:55:42 UTC (rev 4041)
@@ -24,8 +24,10 @@
   [ Mark Purcell ]
   * Remove echocan_env.dpatch - merged upstream
   * Remove zaptel_perl.dpatch - merged upstream
+  * Add debian/patches/inlcude.dpatch - upstream typo
+  * debian/rules: upstream change INSTALL_PREFIX->DESTDIR
 
- -- Mark Purcell <msp at debian.org>  Sat, 18 Aug 2007 12:38:14 +0100
+ -- Mark Purcell <msp at debian.org>  Sat, 18 Aug 2007 12:55:25 +0100
 
 zaptel (1:1.4.4~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-08-18 11:39:07 UTC (rev 4040)
+++ zaptel/trunk/debian/patches/00list	2007-08-18 11:55:42 UTC (rev 4041)
@@ -2,3 +2,4 @@
 oslec_zaptel
 bristuff
 zaphfc-florz
+inlcude

Added: zaptel/trunk/debian/patches/inlcude.dpatch
===================================================================
--- zaptel/trunk/debian/patches/inlcude.dpatch	                        (rev 0)
+++ zaptel/trunk/debian/patches/inlcude.dpatch	2007-08-18 11:55:42 UTC (rev 4041)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## inlcude.dpatch by  <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad zaptel-1.4.5~dfsg~/Makefile zaptel-1.4.5~dfsg/Makefile
+--- zaptel-1.4.5~dfsg~/Makefile	2007-08-17 13:50:36.000000000 +0100
++++ zaptel-1.4.5~dfsg/Makefile	2007-08-18 12:54:01.000000000 +0100
+@@ -446,7 +446,7 @@
+ 	@echo "###"
+ 	@echo "###################################################"
+ 
+-install-programs: install-utils install-libs install-inlcude
++install-programs: install-utils install-libs install-include
+ 
+ install-utils: utils install-xpp
+ 	install -d $(DESTDIR)$(BIN_DIR)


Property changes on: zaptel/trunk/debian/patches/inlcude.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2007-08-18 11:39:07 UTC (rev 4040)
+++ zaptel/trunk/debian/rules	2007-08-18 11:55:42 UTC (rev 4041)
@@ -123,8 +123,8 @@
 	
 	# Add here commands to install the package into debian/tmp
 	
-	$(MAKE) install-programs INSTALL_PREFIX=$(CURDIR)/debian/tmp
-	$(MAKE) install-libs INSTALL_PREFIX=$(CURDIR)/debian/tmp
+	$(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