[Pkg-voip-commits] r5628 - in /asterisk-addons/trunk/debian: asterisk-ooh323c.docs asterisk-ooh323c.examples changelog patches/include_asterisk.dpatch patches/nomarch.dpatch rules

paravoid at alioth.debian.org paravoid at alioth.debian.org
Sun Apr 27 20:13:17 UTC 2008 

Author: paravoid
Date: Sun Apr 27 20:13:17 2008
New Revision: 5628

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5628
Log:
New upstream release.
- Adapt package to upstream's new directory structure.

Modified:
    asterisk-addons/trunk/debian/asterisk-ooh323c.docs
    asterisk-addons/trunk/debian/asterisk-ooh323c.examples
    asterisk-addons/trunk/debian/changelog
    asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
    asterisk-addons/trunk/debian/patches/nomarch.dpatch
    asterisk-addons/trunk/debian/rules

Modified: asterisk-addons/trunk/debian/asterisk-ooh323c.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/asterisk-ooh323c.docs?rev=5628&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/asterisk-ooh323c.docs (original)
+++ asterisk-addons/trunk/debian/asterisk-ooh323c.docs Sun Apr 27 20:13:17 2008
@@ -1,1 +1,1 @@
-asterisk-ooh323c/README
+channels/ooh323c/README

Modified: asterisk-addons/trunk/debian/asterisk-ooh323c.examples
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/asterisk-ooh323c.examples?rev=5628&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/asterisk-ooh323c.examples (original)
+++ asterisk-addons/trunk/debian/asterisk-ooh323c.examples Sun Apr 27 20:13:17 2008
@@ -1,2 +1,1 @@
-asterisk-ooh323c/extensions.conf.sample
-asterisk-ooh323c/h323.conf.sample
+configs/ooh323.conf.sample

Modified: asterisk-addons/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/changelog?rev=5628&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/changelog (original)
+++ asterisk-addons/trunk/debian/changelog Sun Apr 27 20:13:17 2008
@@ -1,14 +1,15 @@
-asterisk-addons (1.4.5-2) UNRELEASED; urgency=low
+asterisk-addons (1.4.6-1) UNRELEASED; urgency=low
 
   [ Faidon Liambotis ]
-  * NOT RELEASED YET
+  * New upstream release.
+    - Adapt package to upstream's new directory structure.
   * Bump Standards-Version to 3.7.3, no changes.
   * Switch to asterisk-1.4 dependency.
 
   [ Tzafrir Cohen ]
   * Watching downloads.digium.com directly again.
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 14 Apr 2008 15:27:40 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 27 Apr 2008 23:03:43 +0300
 
 asterisk-addons (1.4.5-1) unstable; urgency=low
 

Modified: asterisk-addons/trunk/debian/patches/include_asterisk.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/patches/include_asterisk.dpatch?rev=5628&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/patches/include_asterisk.dpatch (original)
+++ asterisk-addons/trunk/debian/patches/include_asterisk.dpatch Sun Apr 27 20:13:17 2008
@@ -1,15 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## include_asterisk.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Our asterisk-dev package puts asterisk.h in the asterisk/ include
 ## DP: dir. It seems that the files here expect to find it directly under
 ## DP: /usr/include . (and no: trying -I/usr/include/asterisk fails ).
 
 @DPATCH@
-diff -urNad asterisk-addons-1.4.2~/app_addon_sql_mysql.c asterisk-addons-1.4.2/app_addon_sql_mysql.c
---- asterisk-addons-1.4.2~/app_addon_sql_mysql.c	2006-11-28 18:40:27.000000000 +0200
-+++ asterisk-addons-1.4.2/app_addon_sql_mysql.c	2007-08-07 11:11:59.000000000 +0300
+--- a/apps/app_addon_sql_mysql.c
++++ b/apps/app_addon_sql_mysql.c
 @@ -12,7 +12,7 @@
   * the GNU General Public License
   */
@@ -19,9 +17,8 @@
  
  #include <stdlib.h>
  #include <unistd.h>
-diff -urNad asterisk-addons-1.4.2~/app_saycountpl.c asterisk-addons-1.4.2/app_saycountpl.c
---- asterisk-addons-1.4.2~/app_saycountpl.c	2006-09-01 08:03:34.000000000 +0300
-+++ asterisk-addons-1.4.2/app_saycountpl.c	2007-08-07 11:11:59.000000000 +0300
+--- a/apps/app_saycountpl.c
++++ b/apps/app_saycountpl.c
 @@ -7,7 +7,7 @@
   *
   */
@@ -31,9 +28,8 @@
  #include <stdio.h>
  #include <asterisk/file.h>
  #include <asterisk/logger.h>
-diff -urNad asterisk-addons-1.4.2~/asterisk-ooh323c/src/chan_h323.h asterisk-addons-1.4.2/asterisk-ooh323c/src/chan_h323.h
---- asterisk-addons-1.4.2~/asterisk-ooh323c/src/chan_h323.h	2007-01-30 18:58:31.000000000 +0200
-+++ asterisk-addons-1.4.2/asterisk-ooh323c/src/chan_h323.h	2007-08-07 11:11:59.000000000 +0300
+--- a/channels/chan_ooh323.h
++++ b/channels/chan_ooh323.h
 @@ -16,7 +16,7 @@
  #ifndef _OO_CHAN_H323_H_
  #define _OO_CHAN_H323_H_
@@ -43,9 +39,8 @@
  #undef PACKAGE_NAME
  #undef PACKAGE_TARNAME
  #undef PACKAGE_VERSION
-diff -urNad asterisk-addons-1.4.2~/cdr_addon_mysql.c asterisk-addons-1.4.2/cdr_addon_mysql.c
---- asterisk-addons-1.4.2~/cdr_addon_mysql.c	2007-06-19 01:40:40.000000000 +0300
-+++ asterisk-addons-1.4.2/cdr_addon_mysql.c	2007-08-07 11:11:59.000000000 +0300
+--- a/cdr/cdr_addon_mysql.c
++++ b/cdr/cdr_addon_mysql.c
 @@ -19,7 +19,7 @@
   *
   */
@@ -55,9 +50,8 @@
  
  #include <sys/types.h>
  #include <asterisk/config.h>
-diff -urNad asterisk-addons-1.4.2~/configure asterisk-addons-1.4.2/configure
---- asterisk-addons-1.4.2~/configure	2007-05-14 19:22:44.000000000 +0300
-+++ asterisk-addons-1.4.2/configure	2007-08-07 11:12:07.000000000 +0300
+--- a/configure
++++ b/configure
 @@ -6324,7 +6324,7 @@
  echo $ECHO_N "checking for asterisk.h... $ECHO_C" >&6; }
     saved_cppflags="${CPPFLAGS}"
@@ -76,9 +70,8 @@
  int
  main ()
  {
-diff -urNad asterisk-addons-1.4.2~/configure.ac asterisk-addons-1.4.2/configure.ac
---- asterisk-addons-1.4.2~/configure.ac	2007-05-14 19:22:44.000000000 +0300
-+++ asterisk-addons-1.4.2/configure.ac	2007-08-07 11:12:15.000000000 +0300
+--- a/configure.ac
++++ b/configure.ac
 @@ -214,12 +214,12 @@
     AC_MSG_CHECKING(for asterisk.h)
     saved_cppflags="${CPPFLAGS}"
@@ -94,9 +87,8 @@
  	[])
  	],
  	[	AC_MSG_RESULT(yes) 
-diff -urNad asterisk-addons-1.4.2~/format_mp3/format_mp3.c asterisk-addons-1.4.2/format_mp3/format_mp3.c
---- asterisk-addons-1.4.2~/format_mp3/format_mp3.c	2006-09-01 08:03:34.000000000 +0300
-+++ asterisk-addons-1.4.2/format_mp3/format_mp3.c	2007-08-07 11:11:59.000000000 +0300
+--- a/formats/format_mp3.c
++++ b/formats/format_mp3.c
 @@ -15,7 +15,7 @@
   * the GNU General Public License
   */
@@ -106,9 +98,8 @@
  
  #include "mpg123.h" 
  #include "mpglib.h" 
-diff -urNad asterisk-addons-1.4.2~/res_config_mysql.c asterisk-addons-1.4.2/res_config_mysql.c
---- asterisk-addons-1.4.2~/res_config_mysql.c	2007-04-09 23:44:51.000000000 +0300
-+++ asterisk-addons-1.4.2/res_config_mysql.c	2007-08-07 11:11:59.000000000 +0300
+--- a/res/res_config_mysql.c
++++ b/res/res_config_mysql.c
 @@ -38,7 +38,7 @@
   *                       Code beautification (doc/CODING-GUIDELINES)
   */

Modified: asterisk-addons/trunk/debian/patches/nomarch.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/patches/nomarch.dpatch?rev=5628&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/patches/nomarch.dpatch (original)
+++ asterisk-addons/trunk/debian/patches/nomarch.dpatch Sun Apr 27 20:13:17 2008
@@ -1,13 +1,11 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## nomarch.dpatch by Kilian Krause <kilian at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Use -O2 instead of -O6
 
 @DPATCH@
-diff -urNad asterisk-addons-1.4.0~/format_mp3/Makefile asterisk-addons-1.4.0/format_mp3/Makefile
---- asterisk-addons-1.4.0~/format_mp3/Makefile	2006-08-11 17:09:50.000000000 +0200
-+++ asterisk-addons-1.4.0/format_mp3/Makefile	2007-08-02 21:21:34.000000000 +0200
+--- a/formats/mp3/Makefile
++++ b/formats/mp3/Makefile
 @@ -8,12 +8,6 @@
  
  ifeq (${OSARCH},Linux)

Modified: asterisk-addons/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/rules?rev=5628&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/rules (original)
+++ asterisk-addons/trunk/debian/rules Sun Apr 27 20:13:17 2008
@@ -31,16 +31,14 @@
 # some generics
 confflags += --prefix=/usr --sysconfdir=/etc/asterisk
 
-PACKEAGE:=asterisk-addons
+PACKAGE:=asterisk-addons
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
-FILENAME := $(PACKEAGE)_$(UPVERSION).orig.tar.gz
+FILENAME := $(PACKAGE)_$(UPVERSION).orig.tar.gz
 URL := http://ftp2.digium.com/pub/asterisk/releases/asterisk-addons-$(UPVERSION).tar.gz
-
-H323_DIR=asterisk-ooh323c
 
 -include /usr/share/dpatch/dpatch.make
 
@@ -53,24 +51,17 @@
 endif
 
 autotools-stamp:
-	for dir in . asterisk-ooh323c/config asterisk-ooh323c menuselect; do \
-	rm -f $$dir/config.sub $$dir/config.guess ; \
-	cp /usr/share/misc/config.sub $$dir/config.sub ; \
-	cp /usr/share/misc/config.guess $$dir/config.guess ; \
+	for dir in . channels menuselect; do \
+		rm -f $$dir/config.sub $$dir/config.guess ; \
+		cp /usr/share/misc/config.sub $$dir/config.sub ; \
+		cp /usr/share/misc/config.guess $$dir/config.guess ; \
 	done
 	touch $@
 
 configure: config.status
 config.status: patch-stamp autotools-stamp
 	dh_testdir
-	# Add here commands to configure the package.
-	if [ ! -f asterisk-ooh323c/config.h_dist ]; then \
-	  mv asterisk-ooh323c/config.h asterisk-ooh323c/config.h_dist ; \
-	fi
 	./configure $(confflags)
-	#./asterisk-ooh323c/configure $(confflags)
-	#./menuselect/configure $(confflags)
-
 
 build: build-arch build-indep
 
@@ -92,6 +83,10 @@
 	rm -f build-arch-stamp build-indep-stamp config.status
 	$(MAKE) distclean
 	rm -f menuselect/mxml/Makefile menuselect/mxml/mxml.list
+	for dir in . channels menuselect; do \
+		rm -f $$dir/config.sub $$dir/config.guess ; \
+	done
+	rm -f autotools-stamp
 	dh_clean 
 
 install: install-indep install-arch
@@ -120,7 +115,7 @@
 binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -pasterisk-oo323c asterisk-ooh323c/ChangeLog
+	dh_installchangelogs -pasterisk-oo323c doc/ChangeLog.chan_ooh323
 	dh_installdocs
 	dh_installexamples
 	dh_installman
@@ -128,7 +123,7 @@
 	dh_strip
 	dh_compress 
 	dh_fixperms
-#	# -n: there are no /usr/lib libraries inthis package
+	# -n: there are no /usr/lib libraries in these packages
 	dh_makeshlibs -n
 	dh_installdeb
 	dh_shlibdeps
@@ -152,7 +147,7 @@
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch patch unpatch

More information about the Pkg-voip-commits mailing list