[Pkg-voip-commits] r8223 - in /asterisk/trunk/debian: asterisk-sounds-main.postinst asterisk-sounds-main.postrm asterisk-sounds-main.prerm changelog

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Fri Mar 19 22:30:34 2010
New Revision: 8223

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

Added:
    asterisk/trunk/debian/asterisk-sounds-main.postrm
      - copied, changed from r8206, asterisk/trunk/debian/asterisk-sounds-main.prerm
Removed:
    asterisk/trunk/debian/asterisk-sounds-main.prerm
Modified:
    asterisk/trunk/debian/asterisk-sounds-main.postinst
    asterisk/trunk/debian/changelog

Modified: asterisk/trunk/debian/asterisk-sounds-main.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk-sounds-main.postinst?rev=8223&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk-sounds-main.postinst (original)
+++ asterisk/trunk/debian/asterisk-sounds-main.postinst Fri Mar 19 22:30:34 2010
@@ -11,23 +11,17 @@
 #          <failed-install-package> <version> `removing'
 #          <conflicting-package> <version>
 
-PACKAGE=asterisk-sounds-main
-NAME=asterisk-sounds-en
 SYMLINK=/usr/share/asterisk/sounds/en
-TARGET=/usr/share/asterisk/sounds/en_US_f_Allison
-
+TARGET=en_US_f_Allison
 
 case "$1" in
     configure)
-        if [ ! -L $SYMLINK ] && [ -d $SYMLINK ]; then
-	    # Directory already exists. And not an alternative.
-	    # Don't register alternative.
-	    # FIXME: use debconf
-	    # FIXME: what if there's a link elsewhere?
-	    echo "Directory $SYMLINK already exists. Please remove it"
-	    echo "When done, run: dpkg-reconfigure $PACKAGE"
-	else
-	    update-alternatives --install $SYMLINK $NAME $TARGET 50
+        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
     ;;
 

Copied: asterisk/trunk/debian/asterisk-sounds-main.postrm (from r8206, asterisk/trunk/debian/asterisk-sounds-main.prerm)
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk-sounds-main.postrm?rev=8223&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk-sounds-main.prerm (original)
+++ asterisk/trunk/debian/asterisk-sounds-main.postrm Fri Mar 19 22:30:34 2010
@@ -1,9 +1,11 @@
 #! /bin/sh -e
 
-NAME=asterisk-sounds-en
-TARGET=/usr/share/asterisk/sounds/en_US_f_Allison
+SYMLINK=/usr/share/asterisk/sounds/en
+TARGET=en_US_f_Allison
 
-update-alternatives --remove $NAME $TARGET
-
+if [ ! -d "$SYMLINK" ] && [ -L "$SYMLINK" ]; then
+    # dandling symlink? symlink to a file? kill it
+    rm -f "$SYMLINK"
+fi
 
 #DEBHELPER#

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8223&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Mar 19 22:30:34 2010
@@ -6,11 +6,11 @@
   * 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 an alternative. English sounds installed to
+  * sounds/en/ is now a symlink. English sounds installed to
     en_US_f_Allison .
   * Removed empty es/ and fr/ directories under sounds/ 
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 15 Mar 2010 01:56:43 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 20 Mar 2010 00:29:53 +0200
 
 asterisk (1:1.6.2.2-1) unstable; urgency=medium