[Pkg-voip-commits] r3686 - in asterisk-spandsp-plugins/trunk/debian: . patches

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sat Jun 23 20:04:49 UTC 2007 

Author: tzafrir-guest
Date: 2007-06-23 20:04:48 +0000 (Sat, 23 Jun 2007)
New Revision: 3686

Added:
   asterisk-spandsp-plugins/trunk/debian/patches/asterisk_h.dpatch
   asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch
Modified:
   asterisk-spandsp-plugins/trunk/debian/changelog
   asterisk-spandsp-plugins/trunk/debian/control
   asterisk-spandsp-plugins/trunk/debian/patches/00list
   asterisk-spandsp-plugins/trunk/debian/rules
Log:
ap_rxfax and app_txfax now build:
 * New versions of app_rxfax.c and app_txfax.c for asterisk 1.4 from
   http://soft-switch.org/downloads/snapshots/spandsp/test-apps-asterisk-1.4/
 * Removing app_dtmftotext and the package asterisk-app-dtmftotext: no longer
   provided by upstream.
 * Added a get-orig-source target.
 * asterisk_h.dpatch: fix it to point to our asterisk.h location.
 * include_fih.dpatch: Other minor fixes to feed upstream.
 * Bumped standards version to 3.7.2 .


Modified: asterisk-spandsp-plugins/trunk/debian/changelog
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/changelog	2007-06-22 21:31:38 UTC (rev 3685)
+++ asterisk-spandsp-plugins/trunk/debian/changelog	2007-06-23 20:04:48 UTC (rev 3686)
@@ -1,9 +1,20 @@
-asterisk-spandsp-plugins (0.0.20060218-5) UNRELEASED; urgency=low
+asterisk-spandsp-plugins (0.0.20070122-1) UNRELEASED; urgency=low
 
+  [ Kilian Krause ]
   * NOT RELEASED YET
 
- -- Kilian Krause <kilian at debian.org>  Tue, 16 Jan 2007 22:10:43 +0100
+  [ Tzafrir Cohen ]
+  * New versions of app_rxfax.c and app_txfax.c for asterisk 1.4 from
+    http://soft-switch.org/downloads/snapshots/spandsp/test-apps-asterisk-1.4/
+  * Removing app_dtmftotext and the package asterisk-app-dtmftotext: no longer
+    provided by upstream.
+  * Added a get-orig-source target.
+  * asterisk_h.dpatch: fix it to point to our asterisk.h location.
+  * include_fih.dpatch: Other minor fixes to feed upstream.
+  * Bumped standards version to 3.7.2 .
 
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 23 Jun 2007 21:55:10 +0300
+
 asterisk-spandsp-plugins (0.0.20060218-4) unstable; urgency=low
 
   * Fix #407203: make receive_fax be always shipped executable.

Modified: asterisk-spandsp-plugins/trunk/debian/control
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/control	2007-06-22 21:31:38 UTC (rev 3685)
+++ asterisk-spandsp-plugins/trunk/debian/control	2007-06-23 20:04:48 UTC (rev 3686)
@@ -2,9 +2,9 @@
 Section: comm
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libspandsp-dev (>= 0.0.2pre25), libspandsp-dev (<< 0.0.3),asterisk-dev (>= 1:1.2.1.dfsg), libjpeg62-dev, libtiff4-dev, dpatch
-Standards-Version: 3.6.1
+Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Build-Depends: debhelper (>= 4.0.0), libspandsp-dev (>= 0.0.4~pre1), asterisk-dev (>= 1:1.4.0~dfsg-1), libjpeg62-dev, libtiff4-dev, dpatch
+Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 
@@ -16,10 +16,3 @@
 Description: Softfax application for Asterisk
  This will allow you to send and receive faxes using the Asterisk PBX by
  generating Fax tones using a software DSP.
-
-Package: asterisk-app-dtmftotext
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Text entry application for Asterisk
- This allows people calling into your Asterisk box to enter text via the
- number pad.

Modified: asterisk-spandsp-plugins/trunk/debian/patches/00list
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/patches/00list	2007-06-22 21:31:38 UTC (rev 3685)
+++ asterisk-spandsp-plugins/trunk/debian/patches/00list	2007-06-23 20:04:48 UTC (rev 3686)
@@ -1 +1,2 @@
-dtmffix
+asterisk_h
+includes_fix

Added: asterisk-spandsp-plugins/trunk/debian/patches/asterisk_h.dpatch
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/patches/asterisk_h.dpatch	                        (rev 0)
+++ asterisk-spandsp-plugins/trunk/debian/patches/asterisk_h.dpatch	2007-06-23 20:04:48 UTC (rev 3686)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## asterisk_h.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: include asterisk.h from /usr/include/asterisk, rather than /usr/include
+
+ at DPATCH@
+diff -ur asterisk-spandsp-plugins-0.0.20070122/app_rxfax.c asterisk-spandsp-plugins-new/app_rxfax.c
+--- asterisk-spandsp-plugins-0.0.20070122/app_rxfax.c	2007-01-22 18:25:08.000000000 +0200
++++ asterisk-spandsp-plugins-new/app_rxfax.c	2007-06-19 23:53:10.000000000 +0300
+@@ -15,7 +15,7 @@
+          <depend>spandsp</depend>
+ ***/
+  
+-#include "asterisk.h"
++#include "asterisk/asterisk.h"
+ 
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
+ 
+diff -ur asterisk-spandsp-plugins-0.0.20070122/app_txfax.c asterisk-spandsp-plugins-new/app_txfax.c
+--- asterisk-spandsp-plugins-0.0.20070122/app_txfax.c	2007-01-22 18:25:30.000000000 +0200
++++ asterisk-spandsp-plugins-new/app_txfax.c	2007-06-19 23:52:59.000000000 +0300
+@@ -15,7 +15,7 @@
+          <depend>spandsp</depend>
+ ***/
+  
+-#include "asterisk.h"
++#include "asterisk/asterisk.h"
+ 
+ ASTERISK_FILE_VERSION(__FILE__, "$Revision:$")
+ 


Property changes on: asterisk-spandsp-plugins/trunk/debian/patches/asterisk_h.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch	                        (rev 0)
+++ asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch	2007-06-23 20:04:48 UTC (rev 3686)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## includes_fix.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * Remove an include that is common with spandp
+## DP: * Set AST_MODULE as the makfile doesn't.
+
+ at DPATCH@
+diff -urNad asterisk-spandsp-plugins-0.0.20070122~/app_rxfax.c asterisk-spandsp-plugins-0.0.20070122/app_rxfax.c
+--- asterisk-spandsp-plugins-0.0.20070122~/app_rxfax.c	2007-06-23 20:56:44.000000000 +0300
++++ asterisk-spandsp-plugins-0.0.20070122/app_rxfax.c	2007-06-23 20:58:19.000000000 +0300
+@@ -35,10 +35,13 @@
+ #include "asterisk/channel.h"
+ #include "asterisk/pbx.h"
+ #include "asterisk/module.h"
+-#include "asterisk/translate.h"
+ #include "asterisk/dsp.h"
+ #include "asterisk/manager.h"
+ 
++#ifndef AST_MODULE
++#define AST_MODULE "app_rxfax"
++#endif
++
+ static char *app = "RxFAX";
+ 
+ static char *synopsis = "Receive a FAX to a file";
+diff -urNad asterisk-spandsp-plugins-0.0.20070122~/app_txfax.c asterisk-spandsp-plugins-0.0.20070122/app_txfax.c
+--- asterisk-spandsp-plugins-0.0.20070122~/app_txfax.c	2007-06-23 20:56:44.000000000 +0300
++++ asterisk-spandsp-plugins-0.0.20070122/app_txfax.c	2007-06-23 20:57:47.000000000 +0300
+@@ -35,7 +35,10 @@
+ #include "asterisk/channel.h"
+ #include "asterisk/pbx.h"
+ #include "asterisk/module.h"
+-#include "asterisk/translate.h"
++
++#ifndef AST_MODULE
++#define AST_MODULE "app_rxfax"
++#endif
+ 
+ static char *app = "TxFAX";
+ 


Property changes on: asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk-spandsp-plugins/trunk/debian/rules
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/rules	2007-06-22 21:31:38 UTC (rev 3685)
+++ asterisk-spandsp-plugins/trunk/debian/rules	2007-06-23 20:04:48 UTC (rev 3686)
@@ -13,11 +13,21 @@
 
 include /usr/share/dpatch/dpatch.make
 
+# upstream sources:
+BASEURL = http://soft-switch.org/downloads/snapshots/spandsp/test-apps-asterisk-1.4
+SOURCES = app_rxfax.c app_txfax.c asterisk.patch
+SOURCE_URLS = $(SOURCES:%=$(BASEURL)/%)
+
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
+
+FILENAME := asterisk-spandsp-plugins_$(UPVERSION).orig.tar.gz
+
 build: build-stamp
 
 build-stamp: patch-stamp
 	dh_testdir
-	$(CC) $(CFLAGS) -shared -o app_dtmftotext.so app_dtmftotext.c -lspandsp
 	$(CC) $(CFLAGS) -shared -o app_rxfax.so app_rxfax.c -lspandsp
 	$(CC) $(CFLAGS) -shared -o app_txfax.so app_txfax.c -lspandsp
 	msgfmt -o debian/receive_fax/messages_de.mo debian/receive_fax/messages_de.po
@@ -28,7 +38,7 @@
 	dh_testdir
 	dh_testroot
 	$(RM) build-stamp
-	$(RM) app_txfax.so app_rxfax.so app_dtmftotext.so
+	$(RM) app_txfax.so app_rxfax.so
 	$(RM) debian/receive_fax/messages_de.mo
 	dh_clean 
 
@@ -65,5 +75,11 @@
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@dpatch-get-origtargz ../tarballs
+	@@mkdir -p ../tarballs/asterisk-$(UPVERSION)
+	@@echo Downloading sources for $(UPVERSION) from $(BASEURL) ...
+	@@wget -N -nv -T10 -t3 -P ../tarballs/asterisk-$(UPVERSION) $(SOURCE_URLS)
+	@@echo Packaging ...
+	@@cd ../tarballs && tar cfz $(FILENAME) asterisk-$(UPVERSION)
+	@@echo Cleaning up...
+	@@$(RM) -rf ../tarballs/asterisk-$(UPVERSION)

More information about the Pkg-voip-commits mailing list