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

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Sun Oct 23 10:37:15 UTC 2011 

Author: tzafrir
Date: Sun Oct 23 10:37:14 2011
New Revision: 9343

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9343
Log:
* New upstream release: 1.8.7.1
  - Patch refix_bashism removed: applied upstream.
  - Patch openssl10 removed: applied upstream.
  - Patch gmime-2.4 removed: applied upstream.
  - Patch gcc46 removed - was a backport from upstream.

Removed:
    asterisk/trunk/debian/patches/fix_configure_armhf
    asterisk/trunk/debian/patches/gcc46
    asterisk/trunk/debian/patches/gmime-2.4
    asterisk/trunk/debian/patches/openssl10
    asterisk/trunk/debian/patches/refix_bashism
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/allow-tilde-destdir
    asterisk/trunk/debian/patches/enable_addons
    asterisk/trunk/debian/patches/kfreebsd
    asterisk/trunk/debian/patches/make-clean-fixes
    asterisk/trunk/debian/patches/safe_asterisk-config
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/patches/sound_files

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Oct 23 10:37:14 2011
@@ -1,9 +1,13 @@
-asterisk (1:1.8.4.4~dfsg-3) UNRELEASED; urgency=low
+asterisk (1:1.8.7.1~dfsg-1) UNRELEASED; urgency=low
 
   [ Tzafrir Cohen ]
   * NOT RELEASED YET
+  * New upstream release:
+    - Patch refix_bashism removed: applied upstream.
+    - Patch openssl10 removed: applied upstream.
+    - Patch gmime-2.4 removed: applied upstream.
+    - Patch gcc46 removed - was a backport from upstream.
   * Disable chan_h323: broken with curren h323plus, and not loved by upstream.
-  * Patch fix_configure_armhf: properly detect armhf.
   * Patch chan_iax2-detach-thread-on-non-stop-exit: Hopefully plugs a
     memory leak. EXPERIMENTAL. DO NOT UPLOAD WITH THIS FOR NOW.
   * Patch reinclude_docs: a copy of the included documentation that was
@@ -14,7 +18,7 @@
   * Ensure sub-packages with asterisk modules are the same version as the
     binary.
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 22 Oct 2011 12:32:05 +0200
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 23 Oct 2011 12:22:13 +0200
 
 asterisk (1:1.8.4.4~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/allow-tilde-destdir?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/allow-tilde-destdir (original)
+++ asterisk/trunk/debian/patches/allow-tilde-destdir Sun Oct 23 10:37:14 2011
@@ -14,7 +14,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -616,7 +616,7 @@ oldmodcheck:
+@@ -598,7 +598,7 @@ oldmodcheck:
  	fi
  
  badshell:

Modified: asterisk/trunk/debian/patches/enable_addons
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/enable_addons?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/enable_addons (original)
+++ asterisk/trunk/debian/patches/enable_addons Sun Oct 23 10:37:14 2011
@@ -17,9 +17,9 @@
  /*** MODULEINFO
  	<depend>mysqlclient</depend>
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>deprecated</support_level>
+ 	<replacement>func_odbc</replacement>
   ***/
- 
- #include "asterisk.h"
 --- a/addons/app_saycountpl.c
 +++ b/addons/app_saycountpl.c
 @@ -21,7 +21,6 @@
@@ -27,9 +27,9 @@
  
  /*** MODULEINFO
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>deprecated</support_level>
+ 	<replacement>say.conf</replacement>
   ***/
- 
- #include "asterisk.h"
 --- a/addons/chan_mobile.c
 +++ b/addons/chan_mobile.c
 @@ -27,7 +27,6 @@
@@ -37,9 +37,9 @@
  /*** MODULEINFO
  	<depend>bluetooth</depend>
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>extended</support_level>
   ***/
  
- #include "asterisk.h"
 --- a/addons/chan_ooh323.c
 +++ b/addons/chan_ooh323.c
 @@ -18,7 +18,6 @@
@@ -47,9 +47,9 @@
  
  /*** MODULEINFO
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>extended</support_level>
   ***/
  
- #include "chan_ooh323.h"
 --- a/addons/res_config_mysql.c
 +++ b/addons/res_config_mysql.c
 @@ -24,7 +24,6 @@
@@ -57,9 +57,9 @@
  /*** MODULEINFO
  	<depend>mysqlclient</depend>
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>extended</support_level>
   ***/
  
- #include "asterisk.h"
 --- a/addons/cdr_mysql.c
 +++ b/addons/cdr_mysql.c
 @@ -35,7 +35,6 @@
@@ -67,9 +67,9 @@
  /*** MODULEINFO
  	<depend>mysqlclient</depend>
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>deprecated</support_level>
+ 	<replacement>cdr_adaptive_odbc</replacement>
   ***/
- 
- #include "asterisk.h"
 --- a/addons/format_mp3.c
 +++ b/addons/format_mp3.c
 @@ -28,7 +28,6 @@
@@ -77,6 +77,6 @@
  
  /*** MODULEINFO
 -	<defaultenabled>no</defaultenabled>
+ 	<support_level>extended</support_level>
   ***/
  
- #include "asterisk.h"

Modified: asterisk/trunk/debian/patches/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/kfreebsd?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/kfreebsd (original)
+++ asterisk/trunk/debian/patches/kfreebsd Sun Oct 23 10:37:14 2011
@@ -5,7 +5,7 @@
 
 --- a/channels/chan_oss.c
 +++ b/channels/chan_oss.c
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  
  #ifdef __linux
  #include <linux/soundcard.h>
@@ -27,12 +27,12 @@
  
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -34,7 +34,7 @@
+@@ -34,7 +34,7 @@ AST_LIBS += $(OPENSSL_LIB)
  AST_LIBS += $(BKTR_LIB)
  AST_LIBS += $(LIBXML2_LIB) 
  
--ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi ),)
-+ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi kfreebsd-gnu),)
+-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi linux-gnueabihf ),)
++ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-gnueabi linux-gnueabihf kfreebsd-gnu),)
    ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
    AST_LIBS+=-ldl
    endif

Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Sun Oct 23 10:37:14 2011
@@ -8,9 +8,12 @@
 some soundfiles tarballs by default. Thus the normal procedure of
 running 'make dist-clean' before building the package would delete them.
 
+Not used ATM as we ship a tarball with the sound files stripped out. May be
+re-used in the future.
+
 --- a/Makefile
 +++ b/Makefile
-@@ -466,7 +466,6 @@ dist-clean: distclean
+@@ -442,7 +442,6 @@ dist-clean: distclean
  
  distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	@$(MAKE) -C menuselect dist-clean
@@ -18,7 +21,7 @@
  	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
  	rm -f makeopts.embed_rules
  	rm -f config.log config.status config.cache
-@@ -476,6 +475,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -452,6 +451,10 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  
@@ -27,5 +30,5 @@
 +	@$(MAKE) -C sounds dist-clean
 +
  datafiles: _all doc/core-en_US.xml
- 	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
+ 	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/trunk/debian/patches/safe_asterisk-config
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/safe_asterisk-config?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/safe_asterisk-config (original)
+++ asterisk/trunk/debian/patches/safe_asterisk-config Sun Oct 23 10:37:14 2011
@@ -8,7 +8,7 @@
 
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
-@@ -112,7 +116,7 @@ ulimit -c unlimited
+@@ -105,7 +105,7 @@ ulimit -c unlimited
  # Don't fork when running "safely"
  #
  ASTARGS=""
@@ -17,7 +17,7 @@
  	if test -c /dev/tty${TTY} ; then
  		TTY=tty${TTY}
  	elif test -c /dev/vc/${TTY} ; then
-@@ -152,7 +156,7 @@ run_asterisk()
+@@ -145,7 +145,7 @@ run_asterisk()
  {
  	while :; do 
  

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sun Oct 23 10:37:14 2011
@@ -1,10 +1,9 @@
-# fixed upstream
-
 # upstream fixes
 allow-tilde-destdir
 
 hack-multiple-app-voicemail
-make-clean-fixes
+# Not used ATM. See comment in patch:
+#make-clean-fixes
 safe_asterisk-config
 safe_asterisk-nobg
 #
@@ -20,12 +19,7 @@
 #h323-extra-target
 mpglib
 enable_addons
-gmime-2.4
-openssl10
-refix_bashism
 no_uname
 kfreebsd
-gcc46
-fix_configure_armhf
 
 chan_iax2-detach-thread-on-non-stop-exit

Modified: asterisk/trunk/debian/patches/sound_files
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/sound_files?rev=9343&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/sound_files (original)
+++ asterisk/trunk/debian/patches/sound_files Sun Oct 23 10:37:14 2011
@@ -22,7 +22,7 @@
  		</member>
  		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
  		</member>
-@@ -75,7 +74,6 @@
+@@ -93,7 +92,6 @@
  	</category>
  	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
  		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >

More information about the Pkg-voip-commits mailing list