[Pkg-voip-commits] r6888 - in /asterisk-addons/trunk/debian: TODO.Debian asterisk-mobile.dirs changelog control patches/datadir patches/docs_destdir patches/series rules

Thu Mar 19 12:26:38 UTC 2009

Author: tzafrir-guest
Date: Thu Mar 19 12:26:38 2009
New Revision: 6888

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6888
Log:
* Switch from dpatch to quilt
* Fix Asterisk build dpendency
* Patch docs_destdir: don't fail on installing (empty) xmldocs.
* Patch datadir: We use /usr/share/asterisk
* Properly set package asterisk-mobile

Added:
    asterisk-addons/trunk/debian/TODO.Debian
    asterisk-addons/trunk/debian/asterisk-mobile.dirs
    asterisk-addons/trunk/debian/patches/datadir
    asterisk-addons/trunk/debian/patches/docs_destdir
    asterisk-addons/trunk/debian/patches/series
Modified:
    asterisk-addons/trunk/debian/changelog
    asterisk-addons/trunk/debian/control
    asterisk-addons/trunk/debian/rules

Added: asterisk-addons/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/TODO.Debian?rev=6888&op=file
==============================================================================

--- asterisk-addons/trunk/debian/TODO.Debian (added)
+++ asterisk-addons/trunk/debian/TODO.Debian Thu Mar 19 12:26:38 2009
@@ -1,0 +1,5 @@
+* Handle documentation. They get installed to 
+  /usr/share/asterisk/docuemntation as a single file for all modules.
+  As of asterisk 1.6.2 all the on-line help will be taken from there.
+  Maybe switch to a single package?
+* Get DATADIR from asterisk?

Added: asterisk-addons/trunk/debian/asterisk-mobile.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/asterisk-mobile.dirs?rev=6888&op=file
==============================================================================
--- asterisk-addons/trunk/debian/asterisk-mobile.dirs (added)
+++ asterisk-addons/trunk/debian/asterisk-mobile.dirs Thu Mar 19 12:26:38 2009
@@ -1,0 +1,1 @@
+usr/lib/asterisk/modules

Modified: asterisk-addons/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/changelog?rev=6888&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/changelog (original)
+++ asterisk-addons/trunk/debian/changelog Thu Mar 19 12:26:38 2009
@@ -4,8 +4,14 @@
   * Bumped Standards-Version to 3.8.0.
 
   [ Tzafrir Cohen ]
-  * Switching to Asterisk 1.6 .
+  * Switching to Asterisk-addons 1.6.1 .
+  * New binary package: asterisk-mobile (chan_mobile.so).
   * Fixed download URL.
+  * Patch docs_destdir: fix installing XML docs (though they're unused).
+  * Patch datadir: set DATADIR under /usr/share/asterisk
+  * Drop patch include_asterisk: not needed as of asterisk 1.4.18.
+  * Drop patch nomarch: aparantly no longer needed.
+  * Switch from dpatch to quilt. 
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 19 Mar 2009 07:44:22 +0200
 

Modified: asterisk-addons/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/control?rev=6888&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/control (original)
+++ asterisk-addons/trunk/debian/control Thu Mar 19 12:26:38 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Kilian Krause <kilian at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 5), libmysqlclient15-dev, asterisk-dev (>= 1:1.6.1.0~dfsg~rc2-1), autotools-dev, libbluetooth-dev
+Build-Depends: debhelper (>= 5), libmysqlclient15-dev, asterisk-dev (>= 1:1.6.1.0~dfsg~rc2), autotools-dev, quilt, libbluetooth-dev
 Standards-Version: 3.8.0
 Homepage: http://www.asterisk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk-addons/trunk/

Added: asterisk-addons/trunk/debian/patches/datadir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/patches/datadir?rev=6888&op=file
==============================================================================
--- asterisk-addons/trunk/debian/patches/datadir (added)
+++ asterisk-addons/trunk/debian/patches/datadir Thu Mar 19 12:26:38 2009
@@ -1,0 +1,16 @@
+A Debian-specific patch: the Asterisk datadir is under /usr/share.
+This patch still needs improving. 
+
+Better yet: get the settings from Asterisk's build-time settings (?)
+--- a/Makefile
++++ b/Makefile
+@@ -47,6 +47,9 @@ OTHER_SUBDIR_CFLAGS=$(ASTERISK_INCLUDE)
+ # endif
+ #endif
+ 
++# On Debian:
++ASTDATADIR=/usr/share/asterisk
++
+ ifneq ($(wildcard makeopts),)
+   include makeopts
+ endif

Added: asterisk-addons/trunk/debian/patches/docs_destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/patches/docs_destdir?rev=6888&op=file
==============================================================================
--- asterisk-addons/trunk/debian/patches/docs_destdir (added)
+++ asterisk-addons/trunk/debian/patches/docs_destdir Thu Mar 19 12:26:38 2009
@@ -1,0 +1,16 @@
+A missing DESTDIR
+
+http://bugs.digium.com/view.php?id=14701
+
+--- a/Makefile
++++ b/Makefile
+@@ -185,7 +185,8 @@ install: _all $(SUBDIRS_INSTALL) install
+ 
+ install-xmldoc: doc/addons-en_US.xml
+ 	@echo "Installing XML documentation"
+-	@$(INSTALL) -m 644 doc/addons-*.xml $(ASTDATADIR)/documentation
++	install -d $(DESTDIR)$(ASTDATADIR)/documentation
++	@$(INSTALL) -m 644 doc/addons-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+ 
+ cleantest:
+ 

Added: asterisk-addons/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/patches/series?rev=6888&op=file
==============================================================================
--- asterisk-addons/trunk/debian/patches/series (added)
+++ asterisk-addons/trunk/debian/patches/series Thu Mar 19 12:26:38 2009
@@ -1,0 +1,2 @@
+docs_destdir
+datadir

Modified: asterisk-addons/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk-addons/trunk/debian/rules?rev=6888&op=diff
==============================================================================
--- asterisk-addons/trunk/debian/rules (original)
+++ asterisk-addons/trunk/debian/rules Thu Mar 19 12:26:38 2009
@@ -43,7 +43,7 @@
 FILENAME := $(PACKAGE)_$(LOCALVERSION).orig.tar.gz
 URL := http://downloads.digium.com/pub/asterisk/releases/asterisk-addons-$(UPVERSION).tar.gz
 
--include /usr/share/dpatch/dpatch.make
+-include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g -fPIC
 
@@ -62,7 +62,7 @@
 	touch $@
 
 configure: config.status
-config.status: patch-stamp autotools-stamp
+config.status: patch autotools-stamp
 	dh_testdir
 	./configure $(confflags)
 


