[Pkg-voip-commits] r8244 - /asterisk-sounds/asterisk-core-sounds/debian/

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Mon Mar 29 12:48:36 UTC 2010


Author: tzafrir-guest
Date: Mon Mar 29 12:48:28 2010
New Revision: 8244

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8244
Log:
* Switching to alternatives for the symlinks
* Other formats depend on gsm.
* But we can still use asterisk-sounds-main instead of the en-gsm to reduce
  unnecessary changes.

Added:
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.prerm
      - copied, changed from r8226, asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.prerm
      - copied, changed from r8226, asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.prerm
      - copied, changed from r8226, asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postrm
Removed:
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-g722.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-g722.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-wav.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-wav.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-g722.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-g722.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-wav.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-wav.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-g722.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-g722.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postrm
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-wav.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-wav.postrm
Modified:
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postinst
    asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postinst
    asterisk-sounds/asterisk-core-sounds/debian/control

Modified: asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postinst?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postinst (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postinst Mon Mar 29 12:48:28 2010
@@ -16,13 +16,12 @@
 
 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-prompt-en \
+	    /usr/share/asterisk/sounds/en_US_f_Allison 50
+	update-alternatives --install \
+	    /usr/share/asterisk/sounds/en_US asterisk-prompt-en-us \
+	    /usr/share/asterisk/sounds/en_US_f_Allison 50
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.prerm (from r8226, asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postrm)
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.prerm?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.postrm (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-en-gsm.prerm Mon Mar 29 12:48:28 2010
@@ -1,11 +1,6 @@
 #! /bin/sh -e
 
-SYMLINK=/usr/share/asterisk/sounds/en
-TARGET=en_US_f_Allison
-
-if [ ! -d "$SYMLINK" ] && [ -L "$SYMLINK" ]; then
-    # dandling symlink? symlink to a file? kill it
-    rm -f "$SYMLINK"
-fi
+update-alternatives --remove asterisk-prompt-en    /usr/share/asterisk/sounds/en_US_f_Allison
+update-alternatives --remove asterisk-prompt-en-us /usr/share/asterisk/sounds/en_US_f_Allison
 
 #DEBHELPER#

Modified: asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postinst?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postinst (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postinst Mon Mar 29 12:48:28 2010
@@ -11,18 +11,14 @@
 #          <failed-install-package> <version> `removing'
 #          <conflicting-package> <version>
 
-SYMLINK=/usr/share/asterisk/sounds/es
-TARGET=es_MX_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/es asterisk-prompt-es \
+	    /usr/share/asterisk/sounds/es_MX_f_Allison 30
+	update-alternatives --install \
+	    /usr/share/asterisk/sounds/es_MX asterisk-prompt-es-mx \
+	    /usr/share/asterisk/sounds/es_MX_f_Allison 50
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.prerm (from r8226, asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postrm)
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.prerm?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.postrm (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-es-gsm.prerm Mon Mar 29 12:48:28 2010
@@ -1,11 +1,6 @@
 #! /bin/sh -e
 
-SYMLINK=/usr/share/asterisk/sounds/es
-TARGET=es_MX_f_Allison
-
-if [ ! -d "$SYMLINK" ] && [ -L "$SYMLINK" ]; then
-    # dandling symlink? symlink to a file? kill it
-    rm -f "$SYMLINK"
-fi
+update-alternatives --remove asterisk-prompt-es    /usr/share/asterisk/sounds/es_MX_f_Allison
+update-alternatives --remove asterisk-prompt-es-mx /usr/share/asterisk/sounds/es_MX_f_Allison
 
 #DEBHELPER#

Modified: asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postinst?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postinst (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postinst Mon Mar 29 12:48:28 2010
@@ -11,18 +11,14 @@
 #          <failed-install-package> <version> `removing'
 #          <conflicting-package> <version>
 
-SYMLINK=/usr/share/asterisk/sounds/fr
-TARGET=fr_CA_f_June
-
 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/fr asterisk-prompt-fr \
+	    /usr/share/asterisk/sounds/fr_CA_f_June 20
+	update-alternatives --install \
+	    /usr/share/asterisk/sounds/fr_CA asterisk-prompt-fr-ca \
+	    /usr/share/asterisk/sounds/fr_CA_f_June 50
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -40,5 +36,3 @@
 #DEBHELPER#
 
 exit 0
-
-

Copied: asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.prerm (from r8226, asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postrm)
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.prerm?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.postrm (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/asterisk-core-sounds-fr-gsm.prerm Mon Mar 29 12:48:28 2010
@@ -1,11 +1,6 @@
 #! /bin/sh -e
 
-SYMLINK=/usr/share/asterisk/sounds/fr
-TARGET=fr_CA_f_June
-
-if [ ! -d "$SYMLINK" ] && [ -L "$SYMLINK" ]; then
-    # dandling symlink? symlink to a file? kill it
-    rm -f "$SYMLINK"
-fi
+update-alternatives --remove asterisk-prompt-fr    /usr/share/asterisk/sounds/fr_CA_f_June
+update-alternatives --remove asterisk-prompt-fr-ca /usr/share/asterisk/sounds/fr_CA_f_June
 
 #DEBHELPER#

Modified: asterisk-sounds/asterisk-core-sounds/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-sounds/asterisk-core-sounds/debian/control?rev=8244&op=diff
==============================================================================
--- asterisk-sounds/asterisk-core-sounds/debian/control (original)
+++ asterisk-sounds/asterisk-core-sounds/debian/control Mon Mar 29 12:48:28 2010
@@ -10,7 +10,10 @@
 Package: asterisk-core-sounds-en-g722
 Section: comm
 Architecture: all
-Depends: ${misc:Depends}
+# For the moment we use the existing asterisk-sounds-main rather
+# than forcing the user to install our new package just to get new formats.
+# This should change on future versions.
+Depends: ${misc:Depends}, asterisk-core-sounds-en-en || asterisk-sounds-main ( >= 1.6.2.6)
 Description: asterisk sound files - English/g722
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -24,6 +27,7 @@
 Section: comm
 Architecture: all
 Depends: ${misc:Depends}
+Provides: asterisk-prompt-en, asterisk-prompt-en-us
 Conflicts: asterisk-sounds-main
 Description: asterisk sound files - English/gsm
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
@@ -34,11 +38,14 @@
  package contains the core part of that collection in English (US, by
  Allison Smith) in raw gsm-fr format (Compressed. Takes relatively little
  space. playable with sox).
+ .
+ This package also provides the 'en' and 'en_US' sound directories through
+ alternatives and hence is required by packages of other formats.
 
 Package: asterisk-core-sounds-en-wav
 Section: comm
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, asterisk-core-sounds-en-en || asterisk-sounds-main ( >= 1.6.2.6)
 Description: asterisk sound files - English/wav
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -51,7 +58,7 @@
 Package: asterisk-core-sounds-es-g722
 Section: comm
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, asterisk-core-sounds-es-gsm
 Description: asterisk sound files - Spanish/g722
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -65,6 +72,7 @@
 Section: comm
 Architecture: all
 Depends: ${misc:Depends}
+Provides: asterisk-prompt-es, asterisk-prompt-es-mx
 Description: asterisk sound files - Spanish/gsm
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -74,11 +82,14 @@
  package contains the core part of that collection in Spanish (US, by
  Allison Smith) in raw gsm-fr format (Compressed. Takes relatively little
  space. playable with sox).
+ .
+ This package also provides the 'es' and 'es_MX' sound directories through
+ alternatives and hence is required by packages of other formats.
 
 Package: asterisk-core-sounds-es-wav
 Section: comm
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, asterisk-core-sounds-es-gsm
 Description: asterisk sound files - Spanish/wav
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -91,7 +102,7 @@
 Package: asterisk-core-sounds-fr-g722
 Section: comm
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, asterisk-core-sounds-fr-gsm
 Description: asterisk sound files - French/g722
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -105,6 +116,7 @@
 Section: comm
 Architecture: all
 Depends: ${misc:Depends}
+Provides: asterisk-prompt-fr, asterisk-prompt-fr-ca
 Description: asterisk sound files - French/gsm
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,
@@ -114,11 +126,14 @@
  package contains the core part of that collection in French (Canada, by
  June Wallack) in raw gsm-fr format (Compressed. Takes relatively little
  space. playable with sox).
+ .
+ This package also provides the 'fr' and 'fr_CA' sound directories through
+ alternatives and hence is required by packages of other formats.
 
 Package: asterisk-core-sounds-fr-wav
 Section: comm
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, asterisk-core-sounds-fr-gsm
 Description: asterisk sound files - French/wav
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
  sense, middleware between Internet and telephony channels on the bottom,




More information about the Pkg-voip-commits mailing list