[Pkg-voip-commits] r8237 - in /asterisk/trunk/debian: README.Debian asterisk-sounds-main.postinst asterisk-sounds-main.postrm asterisk-sounds-main.prerm changelog control

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Mar 29 09:54:55 2010
New Revision: 8237

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8237
Log:
sounds/en/ is now an alternative. English sounds installed to

Added:
    asterisk/trunk/debian/asterisk-sounds-main.prerm
      - copied unchanged from r8222, asterisk/trunk/debian/asterisk-sounds-main.prerm
Removed:
    asterisk/trunk/debian/asterisk-sounds-main.postrm
Modified:
    asterisk/trunk/debian/README.Debian
    asterisk/trunk/debian/asterisk-sounds-main.postinst
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control

Modified: asterisk/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/README.Debian?rev=8237&op=diff
==============================================================================
--- asterisk/trunk/debian/README.Debian (original)
+++ asterisk/trunk/debian/README.Debian Mon Mar 29 09:54:55 2010
@@ -102,17 +102,21 @@
 
 Thus various sound file packages place their files under
 /usr/share/sounds/asterisk/xx_YY_Foobar
-(for sound files set Foobar of language 'xx' and country 'YY') and will
-normally create a symlink:
-/usr/share/sounds/asterisk/xx -> xx_YY_Foobar
+(for sound files set Foobar of language 'xx' and country 'YY').
+They also provide the alternatives 'asterisk-promtp-xx' and
+'asterisk-prompt-xx-yy' for the symlinks 
+/usr/share/asterisk/sounds/xx and /usr/share/asterisk/sounds/xx_YY .
 
-If you install your own set of files or otherwise unhappy with the
-current default sound set for the language, just set the symlink
-manually for the language. The following will use the files from the set
-'Baz' instead:
+If you have multiple such packages and want to change that selection, use:
 
-  rm /usr/share/asterisk/sounds/xx
-  ln -s xx_YY_Baz /usr/share/asterisk/sounds/xx
+  update-alternatives --config asterisk-prompt-xx
+
+Or:
+
+  update-alternatives --config asterisk-prompt-xx-yy
+
+(TODO: document using an empty alternative directory for 'en' to have no
+fallback sounds)
 
 
 Missing Modules

Modified: asterisk/trunk/debian/asterisk-sounds-main.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk-sounds-main.postinst?rev=8237&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk-sounds-main.postinst (original)
+++ asterisk/trunk/debian/asterisk-sounds-main.postinst Mon Mar 29 09:54:55 2010
@@ -11,18 +11,14 @@
 #          <failed-install-package> <version> `removing'
 #          <conflicting-package> <version>
 
-SYMLINK=/usr/share/asterisk/sounds/en
-TARGET=en_US_f_Allison
-
 case "$1" in
     configure)
-        if [ ! -d "$SYMLINK" ]; then
-	    if [ -L "$SYMLINK" ]; then
-		# dandling symlink? symlink to a file? kill it
-		rm -f "$SYMLINK"
-	    fi
-	    ln -s "$TARGET" "$SYMLINK"
-	fi
+	update-alternatives --install \
+	    /usr/share/asterisk/sounds/en asterisk-sounds-en \
+	    /usr/share/asterisk/sounds/en_US_f_Allison 50
+	update-alternatives --install \
+	    /usr/share/asterisk/sounds/en_US asterisk-sounds-en-us \
+	    /usr/share/asterisk/sounds/en_US_f_Allison 50
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8237&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Mar 29 09:54:55 2010
@@ -6,13 +6,13 @@
   * Patch moh_datadir: Make the datadir the default base for moh files
     if a relative path is used.
   * Patch dahdi-fxsks-hookstate: a simpler version. 
-  * sounds/en/ is now a symlink. English sounds installed to
+  * sounds/en/ is now an alternative. English sounds installed to
     en_US_f_Allison .
   * Removed empty es/ and fr/ directories under sounds/ 
   * Patch settings_show_dirs: display the user values of more configurable
     items. 
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 24 Mar 2010 01:56:36 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 29 Mar 2010 12:53:18 +0300
 
 asterisk (1:1.6.2.2-1) unstable; urgency=medium
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=8237&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Mon Mar 29 09:54:55 2010
@@ -48,7 +48,7 @@
 
 Package: asterisk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser, asterisk-sounds-main, dahdi
+Depends: ${shlibs:Depends}, ${misc:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser, asterisk-prompt-en, dahdi
 Provides: asterisk-1.6.2
 Recommends: sox
 Suggests: asterisk-doc, asterisk-dev, asterisk-h323
@@ -135,6 +135,7 @@
 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.
  .