[Pkg-voip-commits] r4137 - in asterisk/trunk/debian: . patches

paravoid at alioth.debian.org paravoid at alioth.debian.org
Sun Aug 19 18:50:20 UTC 2007


Author: paravoid
Date: 2007-08-19 18:50:19 +0000 (Sun, 19 Aug 2007)
New Revision: 4137

Added:
   asterisk/trunk/debian/patches/ast_key_dir
   asterisk/trunk/debian/patches/astvarrundir
   asterisk/trunk/debian/patches/bashism-safeasterisk
   asterisk/trunk/debian/patches/dbug433884
   asterisk/trunk/debian/patches/make-clean-fixes
   asterisk/trunk/debian/patches/pubkey_jnctn
   asterisk/trunk/debian/patches/series
Removed:
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/patches/ast_key_dir.dpatch
   asterisk/trunk/debian/patches/astvarrundir.dpatch
   asterisk/trunk/debian/patches/bashism-safeasterisk.dpatch
   asterisk/trunk/debian/patches/make-clean-fixes.dpatch
   asterisk/trunk/debian/patches/pubkey_jnctn.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
   asterisk/trunk/debian/rules
Log:
* Switch to quilt as a patch management system instead of dpatch.

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/changelog	2007-08-19 18:50:19 UTC (rev 4137)
@@ -7,19 +7,17 @@
   * Removing build requirement gtk (maybe needed for building the
     non-usable gtk console. If anybody needs it, please file a bug report.)
 
-  [ Mark Purcell ]
-  * Remove debian/patches/dbug433884.dpatch
-    - asterisk-h323: Asterisk crashes on startup with H323 package
-      installed. (Closes: #435146)
-
   * TODO: FL: Merge bristuff/ quilt from branches/experimental
 
   [ Kilian Krause ]
   * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version and
     source:Version.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 18 Aug 2007 21:52:44 +0200
+  [ Faidon Liambotis ]
+  * Switch to quilt as a patch management system instead of dpatch.
 
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 19 Aug 2007 21:44:14 +0300
+
 asterisk (1:1.4.10~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/control	2007-08-19 18:50:19 UTC (rev 4137)
@@ -4,7 +4,7 @@
 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>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4), dpatch (>= 2.0.10), zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libgtk2.0-dev, libc-client-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libgtk2.0-dev, libc-client-dev, dpkg-dev (>= 1.13.19)
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/asterisk/
 

Deleted: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/patches/00list	2007-08-19 18:50:19 UTC (rev 4137)
@@ -1,5 +0,0 @@
-astvarrundir
-ast_key_dir
-pubkey_jnctn
-make-clean-fixes
-bashism-safeasterisk

Added: asterisk/trunk/debian/patches/ast_key_dir
===================================================================
--- asterisk/trunk/debian/patches/ast_key_dir	                        (rev 0)
+++ asterisk/trunk/debian/patches/ast_key_dir	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,19 @@
+Put public/private keys in DATADIR/keys (aka /usr/share/asterisk/keys) instead
+of VARLIBDIR/keys. Besided being FHS compliant, that's where the Makefile
+installs them and what src/main/asterisk.c does when parsing asterisk.conf.
+
+Should be forwarded upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.9~dfsg.orig/build_tools/make_defaults_h
++++ asterisk-1.4.9~dfsg/build_tools/make_defaults_h
+@@ -14,7 +14,7 @@ cat << END
+ #define AST_DATA_DIR   "${INSTALL_PATH}${ASTDATADIR}"
+ #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
+ #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
+-#define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
++#define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
+ #define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
+ #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
+ 

Deleted: asterisk/trunk/debian/patches/ast_key_dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/ast_key_dir.dpatch	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/patches/ast_key_dir.dpatch	2007-08-19 18:50:19 UTC (rev 4137)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ast_key_dir.dpatch by Faidon Liambotis <paravoid at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Put public/private keys in DATADIR/keys (aka /usr/share/asterisk/keys)
-## DP: instead of VARLIBDIR/keys. Besided being FHS compliant, that's where
-## DP: the Makefile installs them and what src/main/asterisk.c does when
-## DP: parsing asterisk.conf. Should be forwarded upstream.
-
- at DPATCH@
-diff -urNad asterisk-1.4.9~dfsg~/build_tools/make_defaults_h asterisk-1.4.9~dfsg/build_tools/make_defaults_h
---- asterisk-1.4.9~dfsg~/build_tools/make_defaults_h	2006-04-16 01:53:53.000000000 +0300
-+++ asterisk-1.4.9~dfsg/build_tools/make_defaults_h	2007-08-06 04:24:38.000000000 +0300
-@@ -14,7 +14,7 @@
- #define AST_DATA_DIR   "${INSTALL_PATH}${ASTDATADIR}"
- #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
- #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
--#define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
-+#define AST_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
- #define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
- #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
- 

Added: asterisk/trunk/debian/patches/astvarrundir
===================================================================
--- asterisk/trunk/debian/patches/astvarrundir	                        (rev 0)
+++ asterisk/trunk/debian/patches/astvarrundir	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,15 @@
+Move ASTVARRUNDIR to /var/run/asterisk/
+
+ -- Mark Purcell <msp at debian.org>
+
+--- asterisk-1.4.9~dfsg.orig/Makefile
++++ asterisk-1.4.9~dfsg/Makefile
+@@ -115,7 +115,7 @@ else
+   ASTSBINDIR=$(sbindir)
+   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+   ASTLOGDIR=$(localstatedir)/log/asterisk
+-  ASTVARRUNDIR=$(localstatedir)/run
++  ASTVARRUNDIR=$(localstatedir)/run/asterisk
+   ASTMANDIR=$(mandir)
+ ifneq ($(findstring BSD,$(OSARCH)),)
+   ASTVARLIBDIR=$(prefix)/share/asterisk

Deleted: asterisk/trunk/debian/patches/astvarrundir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/astvarrundir.dpatch	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/patches/astvarrundir.dpatch	2007-08-19 18:50:19 UTC (rev 4137)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## varrundir.dpatch by Mark Purcell <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move ASTVARRUNDIR to /var/run/asterisk/
-
- at DPATCH@
-diff -urNad asterisk-1.4.2~dfsg~/Makefile asterisk-1.4.2~dfsg/Makefile
---- asterisk-1.4.2~dfsg~/Makefile	2007-03-16 01:41:00.000000000 +0000
-+++ asterisk-1.4.2~dfsg/Makefile	2007-03-24 18:28:56.000000000 +0000
-@@ -113,7 +113,7 @@
-   ASTSBINDIR=$(sbindir)
-   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-   ASTLOGDIR=$(localstatedir)/log/asterisk
--  ASTVARRUNDIR=$(localstatedir)/run
-+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-   ASTMANDIR=$(mandir)
- ifeq ($(OSARCH),FreeBSD)
-   ASTVARLIBDIR=$(prefix)/share/asterisk

Added: asterisk/trunk/debian/patches/bashism-safeasterisk
===================================================================
--- asterisk/trunk/debian/patches/bashism-safeasterisk	                        (rev 0)
+++ asterisk/trunk/debian/patches/bashism-safeasterisk	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,13 @@
+/bin/sh is not guranteed to handle bashisms. Switch interpreter of
+safe_asterisk to /bin/bash.
+
+ -- Mark Purcell <msp at debian.org>
+
+--- asterisk-1.4.9~dfsg.orig/contrib/scripts/safe_asterisk
++++ asterisk-1.4.9~dfsg/contrib/scripts/safe_asterisk
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
+ 
+ CLIARGS="$*"				# Grab any args passed to safe_asterisk

Deleted: asterisk/trunk/debian/patches/bashism-safeasterisk.dpatch
===================================================================
--- asterisk/trunk/debian/patches/bashism-safeasterisk.dpatch	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/patches/bashism-safeasterisk.dpatch	2007-08-19 18:50:19 UTC (rev 4137)
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## basim-safeasterisk.dpatch by  <mark at d620.purcell.homeip.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad asterisk-1.4.9~dfsg~/contrib/scripts/safe_asterisk asterisk-1.4.9~dfsg/contrib/scripts/safe_asterisk
---- asterisk-1.4.9~dfsg~/contrib/scripts/safe_asterisk	2007-06-18 18:46:40.000000000 +0100
-+++ asterisk-1.4.9~dfsg/contrib/scripts/safe_asterisk	2007-07-26 16:31:34.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
- 
- CLIARGS="$*"				# Grab any args passed to safe_asterisk

Added: asterisk/trunk/debian/patches/dbug433884
===================================================================
--- asterisk/trunk/debian/patches/dbug433884	                        (rev 0)
+++ asterisk/trunk/debian/patches/dbug433884	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,32 @@
+Don't link the Asterisk binary with the H.323 libraries since they are only
+used by separate shared object, chan_h323.so.
+
+http://bugs.debian.org/433884
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.9~dfsg.orig/main/Makefile
++++ asterisk-1.4.9~dfsg/main/Makefile
+@@ -120,13 +120,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+ AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
+ OBJS:=$(sort $(OBJS))
+ 
+-ifneq ($(wildcard ../channels/h323/Makefile.ast),)
+-  include ../channels/h323/Makefile.ast
+-else
+-  H323LDFLAGS=
+-  H323LDLIBS=
+-endif
+-
+ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+ 	@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
+ 	@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
+@@ -135,7 +128,7 @@ asterisk: $(OBJS) editline/libedit.a db1
+ 	@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
+ 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
++	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+ 	@$(ASTTOPDIR)/build_tools/strip_nonapi $@
+ 
+ clean::

Added: asterisk/trunk/debian/patches/make-clean-fixes
===================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes	                        (rev 0)
+++ asterisk/trunk/debian/patches/make-clean-fixes	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,70 @@
+Fix some upstream Makefiles so that make distclean correctly cleans up the
+tree as shipped by Digium.
+
+Besides the ilbc "fix", it should be forwarded upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.9~dfsg.orig/Makefile
++++ asterisk-1.4.9~dfsg/Makefile
+@@ -360,7 +360,6 @@ dist-clean: distclean
+ 
+ distclean: clean
+ 	@$(MAKE) -C menuselect dist-clean
+-	@$(MAKE) -C sounds dist-clean
+ 	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
+ 	rm -f makeopts.embed_rules
+ 	rm -f config.log config.status
+@@ -370,6 +369,10 @@ distclean: clean
+ 	rm -rf doc/api
+ 	rm -f build_tools/menuselect-deps
+ 
++# tarballs distributed by Digium include sounds
++all-clean: distclean
++	@$(MAKE) -C sounds dist-clean
++
+ datafiles: _all
+ 	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ # Should static HTTP be installed during make samples or even with its own target ala
+--- asterisk-1.4.9~dfsg.orig/channels/Makefile
++++ asterisk-1.4.9~dfsg/channels/Makefile
+@@ -68,6 +68,7 @@ ifneq ($(wildcard h323/Makefile.ast),)
+ H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
+ clean::
+ 	$(MAKE) -C h323 clean
++	rm -f h323/Makefile
+ else
+ h323/libchanh323.a h323/Makefile.ast:
+ 	$(CMD_PREFIX) $(MAKE) -C h323
+--- asterisk-1.4.9~dfsg.orig/codecs/Makefile
++++ asterisk-1.4.9~dfsg/codecs/Makefile
+@@ -38,7 +38,7 @@ endif
+ clean::
+ 	$(MAKE) -C gsm clean
+ 	$(MAKE) -C lpc10 clean
+-	$(MAKE) -C ilbc clean
++	-$(MAKE) -C ilbc clean
+ 
+ gsm/lib/libgsm.a:
+ 	@mkdir -p gsm/lib
+--- asterisk-1.4.9~dfsg.orig/menuselect/Makefile
++++ asterisk-1.4.9~dfsg/menuselect/Makefile
+@@ -79,6 +79,6 @@ clean:
+ dist-clean: distclean
+ 
+ distclean: clean
+-	@if test -f mxml/Makefile ; then $(MAKE) -C mxml clean ; fi
++	@if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
+ 	rm -f autoconfig.h config.status config.log makeopts
+ 	rm -rf autom4te.cache
+--- asterisk-1.4.9~dfsg.orig/menuselect/mxml/Makefile.in
++++ asterisk-1.4.9~dfsg/menuselect/mxml/Makefile.in
+@@ -119,6 +119,8 @@ clean:
+ 	$(RM) config.cache config.log config.status config.h
+ 	$(RM) -r autom4te*.cache
+ 
++distclean: clean
++	$(RM) mxml.list Makefile
+ 
+ #
+ # Install everything...

Deleted: asterisk/trunk/debian/patches/make-clean-fixes.dpatch
===================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes.dpatch	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/patches/make-clean-fixes.dpatch	2007-08-19 18:50:19 UTC (rev 4137)
@@ -1,76 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## make-clean-fixes.dpatch by  Faidon Liambotis <paravoid at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix some upstream Makefiles so that make distclean correctly cleans up
-## DP: besides the ilbc fix, it should go upstream
-
- at DPATCH@
-diff -urNad asterisk-1.4.8~dfsg~/Makefile asterisk-1.4.8~dfsg/Makefile
---- asterisk-1.4.8~dfsg~/Makefile	2007-07-22 06:17:53.000000000 +0300
-+++ asterisk-1.4.8~dfsg/Makefile	2007-07-22 06:18:27.000000000 +0300
-@@ -360,7 +360,6 @@
- 
- distclean: clean
- 	@$(MAKE) -C menuselect dist-clean
--	@$(MAKE) -C sounds dist-clean
- 	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
- 	rm -f makeopts.embed_rules
- 	rm -f config.log config.status
-@@ -370,6 +369,10 @@
- 	rm -rf doc/api
- 	rm -f build_tools/menuselect-deps
- 
-+# tarballs distributed by Digium include sounds
-+all-clean: distclean
-+	@$(MAKE) -C sounds dist-clean
-+
- datafiles: _all
- 	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- # Should static HTTP be installed during make samples or even with its own target ala
-diff -urNad asterisk-1.4.8~dfsg~/channels/Makefile asterisk-1.4.8~dfsg/channels/Makefile
---- asterisk-1.4.8~dfsg~/channels/Makefile	2007-07-22 06:17:53.000000000 +0300
-+++ asterisk-1.4.8~dfsg/channels/Makefile	2007-07-22 06:17:53.000000000 +0300
-@@ -68,6 +68,7 @@
- H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
- clean::
- 	$(MAKE) -C h323 clean
-+	rm -f h323/Makefile
- else
- h323/libchanh323.a h323/Makefile.ast:
- 	$(CMD_PREFIX) $(MAKE) -C h323
-diff -urNad asterisk-1.4.8~dfsg~/codecs/Makefile asterisk-1.4.8~dfsg/codecs/Makefile
---- asterisk-1.4.8~dfsg~/codecs/Makefile	2007-07-22 06:17:53.000000000 +0300
-+++ asterisk-1.4.8~dfsg/codecs/Makefile	2007-07-22 06:17:53.000000000 +0300
-@@ -38,7 +38,7 @@
- clean::
- 	$(MAKE) -C gsm clean
- 	$(MAKE) -C lpc10 clean
--	$(MAKE) -C ilbc clean
-+	-$(MAKE) -C ilbc clean
- 
- gsm/lib/libgsm.a:
- 	@mkdir -p gsm/lib
-diff -urNad asterisk-1.4.8~dfsg~/menuselect/Makefile asterisk-1.4.8~dfsg/menuselect/Makefile
---- asterisk-1.4.8~dfsg~/menuselect/Makefile	2007-07-22 06:17:53.000000000 +0300
-+++ asterisk-1.4.8~dfsg/menuselect/Makefile	2007-07-22 06:17:53.000000000 +0300
-@@ -79,6 +79,6 @@
- dist-clean: distclean
- 
- distclean: clean
--	@if test -f mxml/Makefile ; then $(MAKE) -C mxml clean ; fi
-+	@if test -f mxml/Makefile ; then $(MAKE) -C mxml distclean ; fi
- 	rm -f autoconfig.h config.status config.log makeopts
- 	rm -rf autom4te.cache
-diff -urNad asterisk-1.4.8~dfsg~/menuselect/mxml/Makefile.in asterisk-1.4.8~dfsg/menuselect/mxml/Makefile.in
---- asterisk-1.4.8~dfsg~/menuselect/mxml/Makefile.in	2007-07-22 06:17:53.000000000 +0300
-+++ asterisk-1.4.8~dfsg/menuselect/mxml/Makefile.in	2007-07-22 06:17:53.000000000 +0300
-@@ -119,6 +119,8 @@
- 	$(RM) config.cache config.log config.status config.h
- 	$(RM) -r autom4te*.cache
- 
-+distclean: clean
-+	$(RM) mxml.list Makefile
- 
- #
- # Install everything...

Added: asterisk/trunk/debian/patches/pubkey_jnctn
===================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn	                        (rev 0)
+++ asterisk/trunk/debian/patches/pubkey_jnctn	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,35 @@
+Public key for Junction Networks. From http://www.jnctn.net/jnctn.pub
+at Wed, 12 Oct 2005 23:35:06 +0200
+
+See also http://www.junctionnetworks.com/Asterisk-config.htm
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+
+Also fix the Makefile to copy all keys on make install instead of mentioning
+them explicitely.
+
+Should forward upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- /dev/null
++++ asterisk-1.4.9~dfsg/keys/jnctn.pub
+@@ -0,0 +1,6 @@
++-----BEGIN PUBLIC KEY-----
++MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWaDv4190BpeL5K+Yuq5Q7+vPs
++FVrkibbIp+Io1gCQ6CGZJbR0kUZvTdf58bBdG0zqf6azFN8XPaNz9PVLDl+KgHwU
++3Ilu//eX8ph8Wu+Oxs/ymi/hzKm+Cd6aty94zYuqiegc0KdrjvU5TLQAkIQpiB6k
++CvuIm0R0XXQjj3R7LwIDAQAB
++-----END PUBLIC KEY-----
+--- asterisk-1.4.9~dfsg.orig/Makefile
++++ asterisk-1.4.9~dfsg/Makefile
+@@ -435,8 +435,7 @@ bininstall: _all
+ 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+ 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+ 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
++	$(INSTALL) -m 644 keys/* $(DESTDIR)$(ASTDATADIR)/keys
+ 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+ 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8

Deleted: asterisk/trunk/debian/patches/pubkey_jnctn.dpatch
===================================================================
--- asterisk/trunk/debian/patches/pubkey_jnctn.dpatch	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/patches/pubkey_jnctn.dpatch	2007-08-19 18:50:19 UTC (rev 4137)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pubkey_jnctn.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Public key for Junction Networks. From http://www.jnctn.net/jnctn.pub
-## DP: at Wed, 12 Oct 2005 23:35:06 +0200
-## DP: See also http://www.junctionnetworks.com/Asterisk-config.htm
-
- at DPATCH@
-diff -urNad asterisk-1.4.9~dfsg~/Makefile asterisk-1.4.9~dfsg/Makefile
---- asterisk-1.4.9~dfsg~/Makefile	2007-08-06 04:40:26.000000000 +0300
-+++ asterisk-1.4.9~dfsg/Makefile	2007-08-06 04:41:07.000000000 +0300
-@@ -435,8 +435,7 @@
- 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
- 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
- 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
--	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
--	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-+	$(INSTALL) -m 644 keys/*.pub $(DESTDIR)$(ASTDATADIR)/keys
- 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
- 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-diff -urNad asterisk-1.4.9~dfsg~/keys/jnctn.pub asterisk-1.4.9~dfsg/keys/jnctn.pub
---- asterisk-1.4.9~dfsg~/keys/jnctn.pub	1970-01-01 02:00:00.000000000 +0200
-+++ asterisk-1.4.9~dfsg/keys/jnctn.pub	2007-08-06 04:40:27.000000000 +0300
-@@ -0,0 +1,6 @@
-+-----BEGIN PUBLIC KEY-----
-+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDWaDv4190BpeL5K+Yuq5Q7+vPs
-+FVrkibbIp+Io1gCQ6CGZJbR0kUZvTdf58bBdG0zqf6azFN8XPaNz9PVLDl+KgHwU
-+3Ilu//eX8ph8Wu+Oxs/ymi/hzKm+Cd6aty94zYuqiegc0KdrjvU5TLQAkIQpiB6k
-+CvuIm0R0XXQjj3R7LwIDAQAB
-+-----END PUBLIC KEY-----

Added: asterisk/trunk/debian/patches/series
===================================================================
--- asterisk/trunk/debian/patches/series	                        (rev 0)
+++ asterisk/trunk/debian/patches/series	2007-08-19 18:50:19 UTC (rev 4137)
@@ -0,0 +1,7 @@
+#
+astvarrundir
+ast_key_dir
+pubkey_jnctn
+dbug433884
+make-clean-fixes
+bashism-safeasterisk

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2007-08-19 15:15:12 UTC (rev 4136)
+++ asterisk/trunk/debian/rules	2007-08-19 18:50:19 UTC (rev 4137)
@@ -31,7 +31,7 @@
 	INSTALL_PROGRAM += -s
 endif
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -57,8 +57,7 @@
 		(echo "WARNING: non-free fpm sounds must be removed from sources before packaging." ; false )
 	touch $@
 	
-BRISTUFF_DIR=debian/build/asterisk-bristuff
-config.status: check-sounds patch-stamp
+config.status: check-sounds patch
 	dh_testdir
 
 	if [ ! -r configure.debian_sav ]; then cp -a configure configure.debian_sav; fi




More information about the Pkg-voip-commits mailing list