[Pkg-voip-commits] r7718 - in /asterisk/trunk/debian/patches: configure-armel dahdi-fxsks-hookstate dahdi_pri_debug_spannums dahdi_ptmp_nt h323-no-deps-on-asterisk make-clean-fixes

paravoid at alioth.debian.org paravoid at alioth.debian.org
Sun Oct 25 22:56:14 UTC 2009 

Author: paravoid
Date: Sun Oct 25 22:56:14 2009
New Revision: 7718

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7718
Log:
Do a quilt refresh on all patches

Modified:
    asterisk/trunk/debian/patches/configure-armel
    asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
    asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
    asterisk/trunk/debian/patches/dahdi_ptmp_nt
    asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
    asterisk/trunk/debian/patches/make-clean-fixes

Modified: asterisk/trunk/debian/patches/configure-armel
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/configure-armel?rev=7718&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/configure-armel (original)
+++ asterisk/trunk/debian/patches/configure-armel Sun Oct 25 22:56:14 2009
@@ -9,7 +9,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -4317,6 +4317,9 @@ case "${host_os}" in
+@@ -4192,6 +4192,9 @@ case "${host_os}" in
       OSARCH=cygwin
       PBX_WINARCH=1
       ;;
@@ -19,7 +19,7 @@
       *)
       OSARCH=${host_os}
       ;;
-@@ -21250,7 +21253,7 @@ _ACEOF
+@@ -20763,7 +20766,7 @@ _ACEOF
  fi
  
  
@@ -30,7 +30,7 @@
     pbxlibdir=""
 --- a/configure.ac
 +++ b/configure.ac
-@@ -115,6 +115,9 @@ case "${host_os}" in
+@@ -121,6 +121,9 @@ case "${host_os}" in
       OSARCH=cygwin
       PBX_WINARCH=1
       ;;
@@ -40,7 +40,7 @@
       *)
       OSARCH=${host_os}
       ;;
-@@ -650,7 +653,7 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
+@@ -656,7 +659,7 @@ AST_EXT_LIB_CHECK([ALSA], [asound], [snd
  
  AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
  

Modified: asterisk/trunk/debian/patches/dahdi-fxsks-hookstate
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi-fxsks-hookstate?rev=7718&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi-fxsks-hookstate (original)
+++ asterisk/trunk/debian/patches/dahdi-fxsks-hookstate Sun Oct 25 22:56:14 2009
@@ -12,7 +12,7 @@
 
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -10617,12 +10617,16 @@ static inline int available(struct dahdi
+@@ -10666,12 +10666,16 @@ static inline int available(struct dahdi
  				/* When "onhook" that means no battery on the line, and thus
  				  it is out of service..., if it's on a TDM card... If it's a channel
  				  bank, there is no telling... */

Modified: asterisk/trunk/debian/patches/dahdi_pri_debug_spannums
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_pri_debug_spannums?rev=7718&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_pri_debug_spannums (original)
+++ asterisk/trunk/debian/patches/dahdi_pri_debug_spannums Sun Oct 25 22:56:14 2009
@@ -6,7 +6,7 @@
 Upstream issue: http://issues.asterisk.org/view.php?id=15054
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -12133,6 +12133,8 @@ static void dahdi_pri_message(struct pri
+@@ -12185,6 +12185,8 @@ static void dahdi_pri_message(struct pri
  		}
  		if (dchancount > 1 && (span > -1))
  			ast_verbose("[Span %d D-Channel %d]%s", span, dchan, s);
@@ -15,7 +15,7 @@
  		else
  			ast_verbose("%s", s);
  	} else
-@@ -12174,6 +12176,8 @@ static void dahdi_pri_error(struct pri *
+@@ -12226,6 +12228,8 @@ static void dahdi_pri_error(struct pri *
  		}
  		if ((dchancount > 1) && (span > -1))
  			ast_log(LOG_ERROR, "[Span %d D-Channel %d] PRI: %s", span, dchan, s);

Modified: asterisk/trunk/debian/patches/dahdi_ptmp_nt
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdi_ptmp_nt?rev=7718&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/dahdi_ptmp_nt (original)
+++ asterisk/trunk/debian/patches/dahdi_ptmp_nt Sun Oct 25 22:56:14 2009
@@ -6,7 +6,7 @@
 http://issues.asterisk.org/view.php?id=15048
 --- a/channels/chan_dahdi.c
 +++ b/channels/chan_dahdi.c
-@@ -16410,7 +16410,8 @@ static int process_dahdi(struct dahdi_ch
+@@ -16480,7 +16480,8 @@ static int process_dahdi(struct dahdi_ch
  					confp->chan.sig = SIG_BRI_PTMP;
  					confp->pri.nodetype = PRI_CPE;
  				} else if (!strcasecmp(v->value, "bri_net_ptmp")) {

Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=7718&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Sun Oct 25 22:56:14 2009
@@ -9,7 +9,7 @@
 
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -142,13 +142,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -143,13 +143,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
  AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
  OBJS:=$(sort $(OBJS))
  
@@ -23,9 +23,9 @@
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
  MAIN_TGT:=asterisk.dll
  asterisk: cygload
-@@ -166,11 +159,7 @@ endif
+@@ -167,11 +160,7 @@ endif
  $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
- 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 -ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
  	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)

Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=7718&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Sun Oct 25 22:56:14 2009
@@ -8,7 +8,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -461,7 +461,6 @@ dist-clean: distclean
+@@ -459,7 +459,6 @@ dist-clean: distclean
  
  distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	@$(MAKE) -C menuselect dist-clean
@@ -16,7 +16,7 @@
  	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
  	rm -f makeopts.embed_rules
  	rm -f config.log config.status config.cache
-@@ -471,6 +470,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -469,6 +468,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  
@@ -25,5 +25,5 @@
 +	@$(MAKE) -C sounds dist-clean
 +
  datafiles: _all
- 	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- # Should static HTTP be installed during make samples or even with its own target ala
+ 	if [ `$(ID) -u` = 0 ]; then \
+ 		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \

More information about the Pkg-voip-commits mailing list