[Pkg-voip-commits] r7365 - in /asterisk/trunk/debian: asterisk.install changelog patches/makefile_appdocs_dtd patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Jun 16 23:27:45 2009
New Revision: 7365

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7365
Log:
* Re-enable appdocs (it's working now)
* Patch makefile_appdocs_dtd: fix location of DTD installation.
* Register the HTML docs with doc-base as well.

Added:
    asterisk/trunk/debian/patches/makefile_appdocs_dtd
Modified:
    asterisk/trunk/debian/asterisk.install
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/asterisk.install
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.install?rev=7365&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.install (original)
+++ asterisk/trunk/debian/asterisk.install Tue Jun 16 23:27:45 2009
@@ -3,3 +3,4 @@
 usr/share/asterisk/firmware
 usr/share/asterisk/keys
 usr/share/asterisk/conf
+usr/share/asterisk/documentation

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7365&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Jun 16 23:27:45 2009
@@ -9,8 +9,7 @@
     - Drop patches astvarrundir, pubkey_jnctn; merged upstream (finally!).
     - Adapt patch safe_asterisk-nobg.
   * Switch to downloads.asterisk.org instead of downloads.digium.com.
-  * Add depends on libxml2-dev for the new XML documentation but temporarily
-    comment out its installation.
+  * Add depends on libxml2-dev for the new XML documentation.
   * Remove Conflicts/Replaces with asterisk-classic, asterisk-bristuff,
     asterisk-chan-capi (<< 1.1.1-1~), since those are pre-lenny.
   * Revert upstream's r190830 that ported app_osplookup to OSP Toolkit 3.5;
@@ -22,6 +21,8 @@
   * New upstream release.
     - Fixes that bashism in safe_asterisk (Closes: #530047) (not dashism).
     - Dropped patch astcanary_startup: merged upstream.
+  * Patch makefile_appdocs_dtd: fix location of DTD installation.
+  * Register the HTML docs with doc-base as well.
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 16 Jun 2009 12:30:26 +0300
 

Added: asterisk/trunk/debian/patches/makefile_appdocs_dtd
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/makefile_appdocs_dtd?rev=7365&op=file
==============================================================================
--- asterisk/trunk/debian/patches/makefile_appdocs_dtd (added)
+++ asterisk/trunk/debian/patches/makefile_appdocs_dtd Tue Jun 16 23:27:45 2009
@@ -1,0 +1,14 @@
+Install the Asterisk documentation DTD to the documentation directory
+(rather than trying to place it under ASTVARLIBDIR)
+
+--- a/Makefile
++++ b/Makefile
+@@ -576,7 +576,7 @@ bininstall: _all installdirs $(SUBDIRS_I
+ 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
+ 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+ 	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+-	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
++	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
+ 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+ 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+ 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7365&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Tue Jun 16 23:27:45 2009
@@ -4,7 +4,6 @@
 debian-banner
 hack-multiple-app-voicemail
 make-clean-fixes
-disable-appdocs
 safe_asterisk-config
 safe_asterisk-nobg
 
@@ -23,3 +22,4 @@
 dahdi_pri_debug_spannums
 
 hardware_dtmf_mute_fix
+makefile_appdocs_dtd

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=7365&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Tue Jun 16 23:27:45 2009
@@ -86,7 +86,6 @@
 		--with-cap \
 		--with-gsm \
 		--with-imap=system \
-		--disable-xmldoc \
 		--with-pwlib=/usr/share/pwlib/include/ \
 		--with-h323=/usr/share/openh323/