[Pkg-voip-commits] r8899 - in /asterisk/trunk/debian: asterisk-sounds-main.install asterisk-sounds-main.lintian-overrides asterisk-sounds-main.postinst asterisk-sounds-main.prerm changelog control rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon Apr 25 19:30:30 2011
New Revision: 8899

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8899
Log:
* Drop asterisk-sounds-main: we already have that functionality the
  asterisk-core-sounds packages.
* Recommend a moh (music-on-hold) package to have music played on hold.

Removed:
    asterisk/trunk/debian/asterisk-sounds-main.install
    asterisk/trunk/debian/asterisk-sounds-main.lintian-overrides
    asterisk/trunk/debian/asterisk-sounds-main.postinst
    asterisk/trunk/debian/asterisk-sounds-main.prerm
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8899&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Apr 25 19:30:30 2011
@@ -33,6 +33,9 @@
     modules were not built.
   * Bump Standards version to 3.9.2.0 (no change needed).
   * Upstream prefers chan_ooh323 to chan_h323. Suggest asterisk-ooh323.
+  * Drop asterisk-sounds-main: we already have that functionality the
+    asterisk-core-sounds packages.
+  * Recommend a moh (music-on-hold) package to have music played on hold.
 
   [ Faidon Liambotis ]
   * Switch to the "3.0 (quilt)" package source format.

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=8899&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Mon Apr 25 19:30:30 2011
@@ -56,10 +56,10 @@
 
 Package: asterisk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, asterisk-modules (= ${binary:Version}), adduser, asterisk-prompt-en, asterisk-voicemail | asterisk-voicemail-odbcstorage | asterisk-voicemail-imapstorage 
+Depends: ${shlibs:Depends}, ${misc:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, asterisk-modules (= ${binary:Version}), adduser, asterisk-core-sounds-en-gsm | asterisk-prompt-en, asterisk-voicemail | asterisk-voicemail-odbcstorage | asterisk-voicemail-imapstorage 
 Provides: asterisk-1.8
-Recommends: sox, asterisk-voicemail | asterisk-voicemail-storage
-Suggests: asterisk-doc, asterisk-dev, asterisk-ooh323
+Recommends: sox, asterisk-voicemail | asterisk-voicemail-storage, asterisk-moh-opsound-gsm
+Suggests: asterisk-doc, asterisk-dev, asterisk-ooh323, asterisk-dahdi
 Description: Open Source Private Branch Exchange (PBX)
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -272,18 +272,6 @@
  Asterisk. The debugging symbols are used for execution tracing and core 
  dump analysis. 
 
-Package: asterisk-sounds-main
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: asterisk
-Replaces: asterisk-sounds-extra
-Provides: asterisk-prompt-en, asterisk-prompt-en-us
-Description: Core Sound files for Asterisk (English)
- Asterisk is an Open Source PBX and telephony toolkit.
- .
- This package contains the default (core) sound files in English, useful for
- the operation of Asterisk.
-
 Package: asterisk-config
 Depends: ${misc:Depends}
 Recommends: asterisk

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=8899&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Mon Apr 25 19:30:30 2011
@@ -164,11 +164,6 @@
 	dh_installdirs -i
 
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) DESTDIR=$(CURDIR)/debian/tmp install samples
-	rm -rf $(CURDIR)/debian/tmp/usr/share/asterisk/sounds/es
-	rm -rf $(CURDIR)/debian/tmp/usr/share/asterisk/sounds/fr
-	mv $(CURDIR)/debian/tmp/usr/share/asterisk/sounds/en \
-	   $(CURDIR)/debian/tmp/usr/share/asterisk/sounds/en_US_f_Allison
-
 	dh_install -i --sourcedir=debian/tmp
 	dh_lintian -i