[Pkg-voip-commits] r7715 - in /asterisk/trunk/debian: asterisk-doc.doc-base asterisk-doc.docs changelog rules

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun Oct 25 21:51:44 2009
New Revision: 7715

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7715
Log:
Cleanup the documentation provided in the asterisk-doc package.
(Closes: #499215)

Modified:
    asterisk/trunk/debian/asterisk-doc.doc-base
    asterisk/trunk/debian/asterisk-doc.docs
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/asterisk-doc.doc-base
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk-doc.doc-base?rev=7715&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk-doc.doc-base (original)
+++ asterisk/trunk/debian/asterisk-doc.doc-base Sun Oct 25 21:51:44 2009
@@ -5,5 +5,5 @@
 Section: Network/Communication
 
 Format: PDF
-Files: /usr/share/doc/asterisk-doc/doc/tex/asterisk.pdf.gz
+Files: /usr/share/doc/asterisk-doc/asterisk.pdf.gz
 

Modified: asterisk/trunk/debian/asterisk-doc.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk-doc.docs?rev=7715&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk-doc.docs (original)
+++ asterisk/trunk/debian/asterisk-doc.docs Sun Oct 25 21:51:44 2009
@@ -5,6 +5,7 @@
 UPGRADE.txt
 UPGRADE-1.6.txt
 Zaptel-to-DAHDI.txt
-doc
-contrib
+doc/*.txt
+doc/*.pdf
+doc/tex/asterisk.pdf
 configs

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7715&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Oct 25 21:51:44 2009
@@ -9,13 +9,15 @@
     material (IAXy's firmware) from the tarball upon our request.
     Thanks Digium!
   * Remove patches/debian-banner, no need to warn users to use our BTS
-    anymore, we don't diverge that much nowadays.
+    anymore as we don't diverge that much nowadays.
   * Temporarily remove OSP support, Asterisk needs a new version (3.5) that
     isn't yet in Debian.
   * Add sox to Recommends, used by res_monitor.
   * Remove ekiga, ohphone, twinkle, kphone from Suggests.
-
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 Oct 2009 21:37:29 +0200
+  * Cleanup the documentation provided in the asterisk-doc package.
+    (Closes: #499215)
+
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 Oct 2009 23:51:34 +0200
 
 asterisk (1:1.6.2.0~dfsg~rc1-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=7715&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Sun Oct 25 21:51:44 2009
@@ -136,7 +136,8 @@
 	dh_lintian -i
 
 	# create a simple config
-	echo "; please read doc/manager.txt" > $(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d/README.conf
+	echo "; please read the documentation regarding the Manager Interface (asterisk-doc package)" > \
+		$(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d/README.conf
 	touch $@
 
 binary: binary-indep binary-arch
@@ -145,6 +146,9 @@
 	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
@@ -156,7 +160,6 @@
 	chmod o-rwx $(CURDIR)/debian/asterisk-config/etc/asterisk/*
 	chmod o+rx  $(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d
 	dh_installdeb -i
-	rm -rf $(CURDIR)/debian/asterisk-doc/usr/share/doc/asterisk-doc/doc/api
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i