[Pkg-voip-commits] r3806 - in asterisk/trunk/debian: . patches
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Sun Jul 22 03:45:38 UTC 2007
Author: paravoid
Date: 2007-07-22 03:45:38 +0000 (Sun, 22 Jul 2007)
New Revision: 3806
Added:
asterisk/trunk/debian/patches/make-clean-fixes.dpatch
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/control
asterisk/trunk/debian/patches/00list
asterisk/trunk/debian/rules
Log:
* Add myself to Uploaders.
* Fix "debian/rules clean" to cleanup correctly the tree by calling "make
distclean" instead of "make clean". Also, fix some stuff in the upstream
Makefiles (debian/patches/make-clean-fixes). Fixes a lintian warning.
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2007-07-22 01:15:10 UTC (rev 3805)
+++ asterisk/trunk/debian/changelog 2007-07-22 03:45:38 UTC (rev 3806)
@@ -1,9 +1,16 @@
asterisk (1:1.4.8~dfsg-3) UNRELEASED; urgency=low
+ [ Mark Purcell ]
* NOT RELEASED YET
- -- Mark Purcell <msp at debian.org> Sat, 21 Jul 2007 18:52:46 +0100
+ [ Faidon Liambotis ]
+ * Add myself to Uploaders.
+ * Fix "debian/rules clean" to cleanup correctly the tree by calling "make
+ distclean" instead of "make clean". Also, fix some stuff in the upstream
+ Makefiles (debian/patches/make-clean-fixes). Fixes a lintian warning.
+ -- Faidon Liambotis <paravoid at debian.org> Sun, 22 Jul 2007 06:25:28 +0300
+
asterisk (1:1.4.8~dfsg-2) unstable; urgency=low
* Add patch from Faidon debian/patches/dbug433884.dpatch:
Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control 2007-07-22 01:15:10 UTC (rev 3805)
+++ asterisk/trunk/debian/control 2007-07-22 03:45:38 UTC (rev 3806)
@@ -2,7 +2,7 @@
Priority: optional
Section: comm
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>
+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.0.45), 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
Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list 2007-07-22 01:15:10 UTC (rev 3805)
+++ asterisk/trunk/debian/patches/00list 2007-07-22 03:45:38 UTC (rev 3806)
@@ -1,3 +1,4 @@
-astvarrundir.dpatch
+astvarrundir
pubkey_jnctn
-dbug433884.dpatch
+dbug433884
+make-clean-fixes
Added: asterisk/trunk/debian/patches/make-clean-fixes.dpatch
===================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes.dpatch (rev 0)
+++ asterisk/trunk/debian/patches/make-clean-fixes.dpatch 2007-07-22 03:45:38 UTC (rev 3806)
@@ -0,0 +1,76 @@
+#! /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...
Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules 2007-07-22 01:15:10 UTC (rev 3805)
+++ asterisk/trunk/debian/rules 2007-07-22 03:45:38 UTC (rev 3806)
@@ -54,7 +54,7 @@
[ ! -f sounds/fpm-calm-river.mp3 ] && \
[ ! -f sounds/fpm-sunshine.mp3 ] && \
[ ! -f sounds/fpm-world-mix.mp3 ] ) || \
- (echo "WARNING: fpm sounds must to be removed from sources before packaging." ; false )
+ (echo "WARNING: non-free fpm sounds must be removed from sources before packaging." ; false )
touch $@
BRISTUFF_DIR=debian/build/asterisk-bristuff
@@ -86,7 +86,6 @@
sed -i -e '/MENUSELECT_CHANNELS=/s/chan_h323//' menuselect.makeopts
cat menuselect.makedeps
cat menuselect.makeopts
- touch channels/Makefile.ast
build: build-arch build-indep
@@ -115,12 +114,13 @@
clean: cleaned unpatch
-cleaned:
+# make clean breaks if we don't patch it up, hence the dependency
+cleaned: patch
dh_testdir
dh_testroot
# Add here commands to clean up after the build process.
- -$(MAKE) clean
+ $(MAKE) distclean
-$(RM) -rf debian/build
if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi
More information about the Pkg-voip-commits
mailing list