[Pkg-voip-commits] r8682 - in /asterisk/branches/experimental/debian: asterisk-doc.doc-base asterisk-doc.docs changelog patches/h323-extra-target rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sat Dec 18 21:59:40 2010
New Revision: 8682

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8682
Log:
New upstream release: 1.8.1.1

* As of 1.8.1, AST.pdf and AST.txt are generated from the wiki.
* And thus no generated HTML docs.

Modified:
    asterisk/branches/experimental/debian/asterisk-doc.doc-base
    asterisk/branches/experimental/debian/asterisk-doc.docs
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/patches/h323-extra-target
    asterisk/branches/experimental/debian/rules

Modified: asterisk/branches/experimental/debian/asterisk-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk-doc.doc-base?rev=8682&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/asterisk-doc.doc-base (original)
+++ asterisk/branches/experimental/debian/asterisk-doc.doc-base Sat Dec 18 21:59:40 2010
@@ -5,5 +5,8 @@
 Section: Network/Communication
 
 Format: PDF
-Files: /usr/share/doc/asterisk-doc/asterisk.pdf.gz
+Files: /usr/share/doc/asterisk-doc/AST.pdf.gz
 
+Format: text
+Files: /usr/share/doc/asterisk-doc/AST.txt.gz
+

Modified: asterisk/branches/experimental/debian/asterisk-doc.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk-doc.docs?rev=8682&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/asterisk-doc.docs (original)
+++ asterisk/branches/experimental/debian/asterisk-doc.docs Sat Dec 18 21:59:40 2010
@@ -7,5 +7,4 @@
 Zaptel-to-DAHDI.txt
 doc/*.txt
 doc/*.pdf
-doc/tex/asterisk.pdf
 configs

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=8682&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Sat Dec 18 21:59:40 2010
@@ -1,4 +1,4 @@
-asterisk (1:1.8.0-1) unstable; urgency=low
+asterisk (1:1.8.1.1-1) unstable; urgency=low
 
   * Switching to branch 1.8.
   * Patch parser-mangles-include dropped: merged upstream.
@@ -12,6 +12,7 @@
   * Patch rtcp_cli_fix dropped: merged upstream.
   * Sound files: version 1.4.20
   * Extra sub-package asterisk-dahdi for the dahdi modules.
+  * As of 1.8.1, AST.pdf and AST.txt are generated from the wiki.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 19 Nov 2010 02:17:58 +0200
 

Modified: asterisk/branches/experimental/debian/patches/h323-extra-target
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/h323-extra-target?rev=8682&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/h323-extra-target (original)
+++ asterisk/branches/experimental/debian/patches/h323-extra-target Sat Dec 18 21:59:40 2010
@@ -1,7 +1,7 @@
 Description: allow manually generating channels/h323/Makefile.ast
 Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Bug: https://issues.asterisk.org/view.php?id=17162
-Last-Update: 2010-04-10
+Last-Update: 2010-12-18
 
 This patch is a work-around to that bug. It allows running 'make h323-mak'
 from debian/rules to generate channels/h323/Makefile.ast before running
@@ -10,8 +10,8 @@
 --- a/Makefile
 +++ b/Makefile
 @@ -965,6 +965,9 @@ pdf: asterisk.pdf
- asterisk.txt:
- 	$(MAKE) -C doc/tex asterisk.txt
+ 	@cat sounds/sounds.xml >> $@
+ 	@echo "</menu>" >> $@
  
 +h323-mak:
 +	$(MAKE) -C channels h323/Makefile.ast

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=8682&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Sat Dec 18 21:59:40 2010
@@ -154,9 +154,6 @@
 	dh_testroot -i
 	dh_installlogrotate -i 
 	dh_installdocs -i -XREADME.cygwin
-	mkdir $(CURDIR)/debian/asterisk-doc/usr/share/doc/asterisk-doc/html
-	cp -a $(CURDIR)/doc/tex/asterisk/*.html $(CURDIR)/doc/tex/asterisk/*.png \
-	      $(CURDIR)/debian/asterisk-doc/usr/share/doc/asterisk-doc/html
 	dh_installexamples -i
 	dh_installcron -i
 	dh_installchangelogs ChangeLog -i