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

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: 2007-06-24 07:42:55 +0000 (Sun, 24 Jun 2007)
New Revision: 3697

Removed:
   asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch
Modified:
   asterisk-spandsp-plugins/trunk/debian/changelog
   asterisk-spandsp-plugins/trunk/debian/patches/00list
   asterisk-spandsp-plugins/trunk/debian/rules
Log:
New upstream snapshot: upstream has applied includes_fix.dpatch 
(without my typo...).


Modified: asterisk-spandsp-plugins/trunk/debian/changelog
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/changelog	2007-06-24 04:47:56 UTC (rev 3696)
+++ asterisk-spandsp-plugins/trunk/debian/changelog	2007-06-24 07:42:55 UTC (rev 3697)
@@ -1,4 +1,4 @@
-asterisk-spandsp-plugins (0.0.20070122-1) UNRELEASED; urgency=low
+asterisk-spandsp-plugins (0.0.20070624-1) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
   * NOT RELEASED YET
@@ -10,7 +10,6 @@
     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

Modified: asterisk-spandsp-plugins/trunk/debian/patches/00list
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/patches/00list	2007-06-24 04:47:56 UTC (rev 3696)
+++ asterisk-spandsp-plugins/trunk/debian/patches/00list	2007-06-24 07:42:55 UTC (rev 3697)
@@ -1,2 +1 @@
 asterisk_h
-includes_fix

Deleted: asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch	2007-06-24 04:47:56 UTC (rev 3696)
+++ asterisk-spandsp-plugins/trunk/debian/patches/includes_fix.dpatch	2007-06-24 07:42:55 UTC (rev 3697)
@@ -1,41 +0,0 @@
-#! /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";
- 

Modified: asterisk-spandsp-plugins/trunk/debian/rules
===================================================================
--- asterisk-spandsp-plugins/trunk/debian/rules	2007-06-24 04:47:56 UTC (rev 3696)
+++ asterisk-spandsp-plugins/trunk/debian/rules	2007-06-24 07:42:55 UTC (rev 3697)
@@ -72,11 +72,13 @@
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
 
+# Note: this will get the current version. Not necessarily the one 
+# referred to by the version in the changelog.
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@mkdir -p ../tarballs/asterisk-$(UPVERSION)
-	@@echo Downloading sources for $(UPVERSION) from $(BASEURL) ...
+	@@echo Downloading sources for from $(BASEURL) ...
 	@@wget -N -nv -T10 -t3 -P ../tarballs/asterisk-$(UPVERSION) $(SOURCE_URLS)
 	@@echo Packaging ...
 	@@cd ../tarballs && tar cfz $(FILENAME) asterisk-$(UPVERSION)