[Pkg-voip-commits] r8654 - in /asterisk/branches/experimental/debian: ./ patches/

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Wed Oct 20 22:26:59 UTC 2010 

Author: tzafrir
Date: Wed Oct 20 22:26:58 2010
New Revision: 8654

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8654
Log:
Asterisk 1.8.0-rc5 builds

* Patch parser-mangles-include dropped: merged upstream.
* Patch dahdi-fxsks-hookstate dropped: merged upstream.
* Patch dahdi_ptmp_nt dropped: silly hack no longer needed.
* Patch dahdi_pri_debug_spannums dropped: merged upstream.
* Patch moh_datadir dropped: merged upstream.
* Patch settings_show_dirs dropped: merged upstream.
* Patch man_hyphen dropped: merged upstream.
* Patch typos dropped: merged upstream.
* Patch rtcp_cli_fix dropped: merged upstream.
* Sound files: version 1.4.20

Removed:
    asterisk/branches/experimental/debian/patches/dahdi-fxsks-hookstate
    asterisk/branches/experimental/debian/patches/dahdi_pri_debug_spannums
    asterisk/branches/experimental/debian/patches/dahdi_ptmp_nt
    asterisk/branches/experimental/debian/patches/man_hyphen
    asterisk/branches/experimental/debian/patches/moh_datadir
    asterisk/branches/experimental/debian/patches/parser-mangles-include
    asterisk/branches/experimental/debian/patches/rtcp_cli_fix
    asterisk/branches/experimental/debian/patches/settings_show_dirs
    asterisk/branches/experimental/debian/patches/typos
Modified:
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/patches/allow-tilde-destdir
    asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk
    asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail
    asterisk/branches/experimental/debian/patches/make-clean-fixes
    asterisk/branches/experimental/debian/patches/series
    asterisk/branches/experimental/debian/rules

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Wed Oct 20 22:26:58 2010
@@ -1,3 +1,19 @@
+asterisk (1:1.8.0~rc5-1) unstable; urgency=low
+
+  * Switching to branch 1.8.
+  * Patch parser-mangles-include dropped: merged upstream.
+  * Patch dahdi-fxsks-hookstate dropped: merged upstream.
+  * Patch dahdi_ptmp_nt dropped: silly hack no longer needed.
+  * Patch dahdi_pri_debug_spannums dropped: merged upstream.
+  * Patch moh_datadir dropped: merged upstream.
+  * Patch settings_show_dirs dropped: merged upstream.
+  * Patch man_hyphen dropped: merged upstream.
+  * Patch typos dropped: merged upstream.
+  * Patch rtcp_cli_fix dropped: merged upstream.
+  * Sound files: version 1.4.20
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 20 Oct 2010 12:00:26 +0200
+
 asterisk (1:1.6.2.9-2) unstable; urgency=high
 
   [ Tzafrir Cohen ]

Modified: asterisk/branches/experimental/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/allow-tilde-destdir?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/allow-tilde-destdir (original)
+++ asterisk/branches/experimental/debian/patches/allow-tilde-destdir Wed Oct 20 22:26:58 2010
@@ -6,7 +6,7 @@
 badshell is disallowing tildes (~) in the DESTDIR directory to warn people
 who use a shell that doesn't expand it to $HOMEDIR.
 
-However, we have such a tilde in our directory (~dfsg) that isn't expanded
+However, we have such a tilde in our directory (~rcN) that isn't expanded
 to $HOMEDIR nor shouldn't be.
 
 This patch relaxes this test just for cases where the ~ is followed by a '/',

Modified: asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk Wed Oct 20 22:26:58 2010
@@ -1,7 +1,7 @@
 Subject: Avoid linking the asterisk binary with the H.323 libraries
 Author: Faidon Liambotis <paravoid at debian.org>
 Forwarded: no
-Last-Update: 2010-02-14
+Last-Update: 2010-10-20
 
 Don't link the Asterisk binary with the H.323 libraries since they are only
 used by separate shared object, chan_h323.so. (Closes: #433884)
@@ -30,12 +30,12 @@
 @@ -177,11 +170,7 @@ endif
  $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
  	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+ 	$(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
 -ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+ 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 -else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 -endif
- 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  
- clean::
+ ifeq ($(GNU_LD),1)
+ $(MAIN_TGT): asterisk.exports

Modified: asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail (original)
+++ asterisk/branches/experimental/debian/patches/hack-multiple-app-voicemail Wed Oct 20 22:26:58 2010
@@ -1,7 +1,7 @@
 Subject: build multiple versions of app_voicemail.so
 Author: Faidon Liambotis <paravoid at debian.org>
 Bug: http://issues.asterisk.org/view.php?id=13822
-Last-Update: 2009-12-19
+Last-Update: 2010-10-20
 
 This is a very ugly hack on upstream's Makefiles to allow building multiple
 variants of app_voicemail. Three variants are created:
@@ -57,18 +57,6 @@
  ifneq ($(MODULE_PREFIX),)
 -    ALL_C_MODS:=
 +    ALL_C_MODS:=$(MODS_C_ADDITIONAL)
+     ALL_CC_MODS:=
      ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
-     ALL_CC_MODS:=
      ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
---- a/apps/app_voicemail.c
-+++ b/apps/app_voicemail.c
-@@ -40,6 +40,9 @@ c-client (http://www.washington.edu/imap
-  *        with a plan to clean this up.
-  */
- 
-+/*** MODULEINFO
-+ ***/
-+
- /*** MAKEOPTS
- <category name="MENUSELECT_OPTS_app_voicemail" displayname="Voicemail Build Options" positive_output="yes" remove_on_change="apps/app_voicemail.o apps/app_voicemail.so apps/app_directory.o apps/app_directory.so">
- 	<member name="FILE_STORAGE" displayname="Storage of Voicemail using filesystem">

Modified: asterisk/branches/experimental/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/make-clean-fixes?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/make-clean-fixes (original)
+++ asterisk/branches/experimental/debian/patches/make-clean-fixes Wed Oct 20 22:26:58 2010
@@ -1,7 +1,12 @@
 Subject: Don't remove sounds on dist-clean
 Author: Faidon Liambotis <paravoid at debian.org>
 Forwarded: not-needed
-Last-Update: 2009-12-19
+Last-Update: 2010-10-20
+
+Upstream build system may optionally download some extra sound files.
+Thus those sound files are deleted on dist-clean. The tarballs include
+some soundfiles tarballs by default. Thus the normal procedure of
+running 'make dist-clean' before building the package would delete them.
 
 --- a/Makefile
 +++ b/Makefile
@@ -21,6 +26,6 @@
 +all-clean: distclean
 +	@$(MAKE) -C sounds dist-clean
 +
- datafiles: _all
+ datafiles: _all doc/core-en_US.xml
  	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
  # Should static HTTP be installed during make samples or even with its own target ala

Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Wed Oct 20 22:26:58 2010
@@ -1,5 +1,4 @@
 # fixed upstream
-parser-mangles-include
 
 # upstream fixes
 allow-tilde-destdir
@@ -15,13 +14,5 @@
 astgenkey-security
 
 # bugfixes on top of everything
-dahdi-fxsks-hookstate
-dahdi_ptmp_nt
-dahdi_pri_debug_spannums
 sound_files
-moh_datadir
-settings_show_dirs
 h323-extra-target
-man_hyphen
-typos
-rtcp_cli_fix

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=8654&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Wed Oct 20 22:26:58 2010
@@ -89,9 +89,9 @@
 	
 	# The clean target seems to be run before patches are applied.
 	# A brute-force fix to keep the tarball from getting deleted:
-	mv sounds/asterisk-core-sounds-en-gsm-1.4.19.tar.gz debian/
+	mv sounds/asterisk-core-sounds-en-gsm-1.4.20.tar.gz debian/
 	GREP=grep AWK=awk $(MAKE) distclean
-	mv debian/asterisk-core-sounds-en-gsm-1.4.19.tar.gz sounds/
+	mv debian/asterisk-core-sounds-en-gsm-1.4.20.tar.gz sounds/
 	-$(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