[Pkg-voip-commits] r3001 - in asterisk/trunk/debian: . patches
Kilian Krause
kilian at alioth.debian.org
Sat Jan 13 12:05:56 CET 2007
Author: kilian
Date: 2007-01-13 12:05:56 +0100 (Sat, 13 Jan 2007)
New Revision: 3001
Removed:
asterisk/trunk/debian/asterisk-sounds-main.dirs
asterisk/trunk/debian/asterisk-sounds-main.links
asterisk/trunk/debian/asterisk-sounds-main.postinst
Modified:
asterisk/trunk/debian/asterisk_fix
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
Log:
- Revert r2998: We don't ship that dir in the first place to then move it over.
We just have asterisk look for it in the right place right away.
- Close #406714: * Install private callerinfos in /var/lib/ where they belong
acording to FHS.
- Minor update to asterisk_fix to check for +x in /etc/init.d/asterisk instead
of just -f.
- Release asterisk (1:1.2.14~dfsg-2).
Deleted: asterisk/trunk/debian/asterisk-sounds-main.dirs
===================================================================
--- asterisk/trunk/debian/asterisk-sounds-main.dirs 2007-01-13 10:57:44 UTC (rev 3000)
+++ asterisk/trunk/debian/asterisk-sounds-main.dirs 2007-01-13 11:05:56 UTC (rev 3001)
@@ -1 +0,0 @@
-/var/lib/asterisk/sounds/priv-callerintros
Deleted: asterisk/trunk/debian/asterisk-sounds-main.links
===================================================================
--- asterisk/trunk/debian/asterisk-sounds-main.links 2007-01-13 10:57:44 UTC (rev 3000)
+++ asterisk/trunk/debian/asterisk-sounds-main.links 2007-01-13 11:05:56 UTC (rev 3001)
@@ -1 +0,0 @@
-var/lib/asterisk/sounds/priv-callerintros usr/share/asterisk/sounds/priv-callerintros
Deleted: asterisk/trunk/debian/asterisk-sounds-main.postinst
===================================================================
--- asterisk/trunk/debian/asterisk-sounds-main.postinst 2007-01-13 10:57:44 UTC (rev 3000)
+++ asterisk/trunk/debian/asterisk-sounds-main.postinst 2007-01-13 11:05:56 UTC (rev 3001)
@@ -1,25 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = "configure" ]; then
-
- ## Special magick to upgrade from versions 1:1.2.14~dfsg-1 and earlier
- ## Can be removed after release of lenny
- SRC=/usr/share/asterisk/sounds/priv-callerintros
- DST=/var/lib/asterisk/sounds/priv-callerintros
- if [ -d "${SRC}" ] && [ ! -h "${SRC}" ]; then
- # We need to move the callerintros directory to /var/lib
- # this is supposed to work also if $DST already exists.
- # (this must be the case as per policy § 6.2)
- mkdir -p "${DST}"
- # This overwrites files with the same name in $DST. This is
- # done on purpose, as the ones in $SRC are the ones actually
- # used by asterisk.
- find "${SRC}" -mindepth 1 -maxdepth 1 -print0 | xargs -s 1024 -n 100 --null mv --target-directory="${DST}"
- rmdir "${SRC}"
- fi
- if [ ! -h "${SRC}" ]; then
- ln -s "${DST}" "${SRC}"
- fi
- ## End special magick to upgrade
-
-fi
\ No newline at end of file
Modified: asterisk/trunk/debian/asterisk_fix
===================================================================
--- asterisk/trunk/debian/asterisk_fix 2007-01-13 10:57:44 UTC (rev 3000)
+++ asterisk/trunk/debian/asterisk_fix 2007-01-13 11:05:56 UTC (rev 3001)
@@ -23,6 +23,19 @@
fi
done
+# Update from /usr/share/asterisk/sounds/priv-callerintros to
+# /var/lib/asterisk/sounds/priv-callerintros
+if [ -d /usr/share/asterisk/sounds/priv-callerintros ];then
+ echo "Updating private callerinfos location to /var/lib/asterisk/sounds/priv-callerintros."
+ if [ ! -d /var/lib/asterisk/sounds/priv-callerintros ];then
+ mv /usr/share/asterisk/sounds/priv-callerintros /var/lib/asterisk/sounds/priv-callerintros
+ else
+ echo "Directory /var/lib/asterisk/sounds/priv-callerintros already exists. Please"
+ echo "move files from /usr/share/asterisk/sounds/priv-callerintros yourself and"
+ echo "remove /usr/share/asterisk/sounds/priv-callerintros manually."
+ fi
+fi
+
# Make sure all (possibly) used dirs exist and is owned by asterisk
# /var/run/asterisk is not yet handled by init.d :-(
@@ -37,6 +50,7 @@
"
subdirs="
+ /var/lib/asterisk/sounds/priv-callerintros
/var/log/asterisk/cdr-csv
/var/log/asterisk/cdr-custom
/var/spool/asterisk/dictate
@@ -74,7 +88,7 @@
####################################
# If asterisk in running, reload it
# otherwise start it
-if [ -f "/etc/init.d/asterisk" ];then
+if [ -x "/etc/init.d/asterisk" ];then
if [ -f /var/run/asterisk/asterisk.pid ];then
invoke-rc.d asterisk reload || exit $?
else
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2007-01-13 10:57:44 UTC (rev 3000)
+++ asterisk/trunk/debian/changelog 2007-01-13 11:05:56 UTC (rev 3001)
@@ -1,12 +1,10 @@
-asterisk (1:1.2.14~dfsg-2) UNRELEASED; urgency=low
+asterisk (1:1.2.14~dfsg-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Install private callerinfos in /var/lib/ where they belong acording to
+ FHS. (Closes: #406714)
- [Lionel Elie Mamane]
- * Place priv-callerintros directory in /var/lib (closes: #406714)
+ -- Kilian Krause <kilian at debian.org> Sat, 13 Jan 2007 12:01:33 +0100
- -- Lionel Elie Mamane <lmamane at debian.org> Sat, 13 Jan 2007 11:42:01 +0100
-
asterisk (1:1.2.14~dfsg-1) unstable; urgency=low
* New upstream release.
Modified: asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/30_ast-data-dir.dpatch 2007-01-13 10:57:44 UTC (rev 3000)
+++ asterisk/trunk/debian/patches/30_ast-data-dir.dpatch 2007-01-13 11:05:56 UTC (rev 3001)
@@ -47,10 +47,9 @@
if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/silence
-+ mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
+ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
More information about the Pkg-voip-commits
mailing list