[Pkg-voip-commits] r8447 - in /asterisk/trunk/debian: changelog patches/dahdi_fxs_false_ringing patches/fxs_ports_1626 patches/h323-extra-target patches/make-clean-fixes patches/series rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Wed Jun  2 21:15:30 2010
New Revision: 8447

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8447
Log:
* New upstream release: 1.6.2.8
- Patch dahdi_fxs_false_ringing removed: merged upstream.
- Patch fxs_ports_1626 removed: merged upstream.

Removed:
    asterisk/trunk/debian/patches/dahdi_fxs_false_ringing
    asterisk/trunk/debian/patches/fxs_ports_1626
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/h323-extra-target
    asterisk/trunk/debian/patches/make-clean-fixes
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8447&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Wed Jun  2 21:15:30 2010
@@ -1,8 +1,11 @@
-asterisk (1:1.6.2.7-2) UNRELEASED; urgency=low
+asterisk (1:1.6.2.8-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org>  Fri, 07 May 2010 21:20:07 +1000
+  * New upstream release
+  - Patch dahdi_fxs_false_ringing removed: merged upstream.
+  - Patch fxs_ports_1626 removed: merged upstream.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 02 Jun 2010 22:18:49 +0300
 
 asterisk (1:1.6.2.7-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/h323-extra-target
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-extra-target?rev=8447&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-extra-target (original)
+++ asterisk/trunk/debian/patches/h323-extra-target Wed Jun  2 21:15:30 2010
@@ -10,8 +10,8 @@
 --- a/Makefile
 +++ b/Makefile
 @@ -965,6 +965,9 @@ pdf: asterisk.pdf
- asterisk.pdf:
- 	$(MAKE) -C doc/tex asterisk.pdf
+ asterisk.txt:
+ 	$(MAKE) -C doc/tex asterisk.txt
  
 +h323-mak:
 +	$(MAKE) -C channels h323/Makefile.ast

Modified: asterisk/trunk/debian/patches/make-clean-fixes
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/make-clean-fixes?rev=8447&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/make-clean-fixes (original)
+++ asterisk/trunk/debian/patches/make-clean-fixes Wed Jun  2 21:15:30 2010
@@ -22,5 +22,5 @@
 +	@$(MAKE) -C sounds dist-clean
 +
  datafiles: _all
- 	if [ `$(ID) -u` = 0 ]; then \
- 		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/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/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8447&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Wed Jun  2 21:15:30 2010
@@ -18,6 +18,4 @@
 sound_files
 moh_datadir
 settings_show_dirs
-dahdi_fxs_false_ringing
 h323-extra-target
-fxs_ports_1626

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=8447&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Wed Jun  2 21:15:30 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.17.tar.gz debian/
+	mv sounds/asterisk-core-sounds-en-gsm-1.4.18.tar.gz debian/
 	GREP=grep AWK=awk $(MAKE) distclean
-	mv debian/asterisk-core-sounds-en-gsm-1.4.17.tar.gz sounds/
+	mv debian/asterisk-core-sounds-en-gsm-1.4.18.tar.gz sounds/
 	-$(RM) -rf debian/build
 
 	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi