[Pkg-voip-commits] r6898 - in /asterisk/trunk/debian/patches: allow-tilde-destdir apptest_sleep astvarrundir bristuff/ make-clean-fixes use-libpri-bristuffed zap-fix-cause34 zap-fix-deadlock

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Mar 22 00:46:13 2009
New Revision: 6898

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6898
Log:
Remove bristuff and other old patches. Add upstream references to others

Removed:
    asterisk/trunk/debian/patches/bristuff/
    asterisk/trunk/debian/patches/use-libpri-bristuffed
    asterisk/trunk/debian/patches/zap-fix-cause34
    asterisk/trunk/debian/patches/zap-fix-deadlock
Modified:
    asterisk/trunk/debian/patches/allow-tilde-destdir
    asterisk/trunk/debian/patches/apptest_sleep
    asterisk/trunk/debian/patches/astvarrundir
    asterisk/trunk/debian/patches/make-clean-fixes

Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=6898&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Sun Mar 22 00:46:13 2009
@@ -4,18 +4,18 @@
 However, we have such a tilde in our directory (~dfsg) that isn't expanded
 to $HOMEDIR nor shouldn't be.
 
-Should be reported upstream.
+This patch relaxes this test just for cases where the ~ is followed by a '/',
+which should catch most cases.
 
- -- Faidon Liambotis <paravoid at debian.org>
-
+Upstream issue: http://bugs.digium.com/view.php?id=14718
 --- a/Makefile
 +++ b/Makefile
-@@ -507,7 +507,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
+@@ -575,7 +575,7 @@ oldmodcheck:
+ 	fi
+ 
+ badshell:
+-ifneq ($(findstring ~,$(DESTDIR)),)
++ifneq ($(findstring ~/,$(DESTDIR)),)
+ 	@echo "Your shell doesn't do ~ expansion when expected (specifically, when doing \"make install DESTDIR=~/path\")."
+ 	@echo "Try replacing ~ with \$$HOME, as in \"make install DESTDIR=\$$HOME/path\"."
  	@exit 1
- endif
- 
--install: badshell datafiles bininstall
-+install: datafiles bininstall
- 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
- 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- 	fi

Modified: asterisk/trunk/debian/patches/apptest_sleep
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/apptest_sleep?rev=6898&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/apptest_sleep (original)
+++ asterisk/trunk/debian/patches/apptest_sleep Sun Mar 22 00:46:13 2009
@@ -1,7 +1,8 @@
 An extra little sleep that seems to work around a problem when 
 running the test between two PRI channels.
 
-Upstream bug: http://bugs.digium.com/12442
+Upstream bug: http://bugs.digium.com/view.php?id=12442
+
 --- a/apps/app_test.c
 +++ b/apps/app_test.c
 @@ -297,6 +297,8 @@ static int testclient_exec(struct ast_ch

Modified: asterisk/trunk/debian/patches/astvarrundir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/astvarrundir?rev=6898&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/astvarrundir (original)
+++ asterisk/trunk/debian/patches/astvarrundir Sun Mar 22 00:46:13 2009
@@ -5,6 +5,9 @@
 
  -- Mark Purcell <msp at debian.org>
 
+Upstream issue: http://bugs.digium.com/view.php?id=13153
+
+Fixed in 1.6.2
 --- a/Makefile
 +++ b/Makefile
 @@ -125,7 +125,7 @@ else

Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=6898&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Sun Mar 22 00:46:13 2009
@@ -2,6 +2,9 @@
 one of them.
 
  -- Faidon Liambotis <paravoid at debian.org>
+
+Currently no upstream issue. But anyway, we should revisit it when we decide
+on packaging of sound files.
 
 --- a/Makefile
 +++ b/Makefile