[pkg-java] r18220 - trunk/nekohtml/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-06-23 21:37:59 +0000 (Mon, 23 Jun 2014)
New Revision: 18220

Added:
   trunk/nekohtml/debian/libnekohtml-java-doc.doc-base.manual
Removed:
   trunk/nekohtml/debian/libnekohtml-java.doc-base
Modified:
   trunk/nekohtml/debian/changelog
   trunk/nekohtml/debian/rules
Log:
Moved the HTML documentation in the libnekohtml-java-doc package



Modified: trunk/nekohtml/debian/changelog
===================================================================
--- trunk/nekohtml/debian/changelog	2014-06-23 20:13:57 UTC (rev 18219)
+++ trunk/nekohtml/debian/changelog	2014-06-23 21:37:59 UTC (rev 18220)
@@ -3,6 +3,7 @@
   * Team upload
   * New upstream release
   * Standards-Version updated to 3.9.5 (no changes)
+  * Moved the HTML documentation in the libnekohtml-java-doc package
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 23 Jun 2014 21:44:46 +0200
 

Copied: trunk/nekohtml/debian/libnekohtml-java-doc.doc-base.manual (from rev 18218, trunk/nekohtml/debian/libnekohtml-java.doc-base)
===================================================================
--- trunk/nekohtml/debian/libnekohtml-java-doc.doc-base.manual	                        (rev 0)
+++ trunk/nekohtml/debian/libnekohtml-java-doc.doc-base.manual	2014-06-23 21:37:59 UTC (rev 18220)
@@ -0,0 +1,8 @@
+Document: nekohtml-doc
+Title: NekoHTML documentation
+Abstract: Documentation for the NekoHTML parser.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libnekohtml-java/doc/index.html
+Files: /usr/share/doc/libnekohtml-java/doc/*.html

Deleted: trunk/nekohtml/debian/libnekohtml-java.doc-base
===================================================================
--- trunk/nekohtml/debian/libnekohtml-java.doc-base	2014-06-23 20:13:57 UTC (rev 18219)
+++ trunk/nekohtml/debian/libnekohtml-java.doc-base	2014-06-23 21:37:59 UTC (rev 18220)
@@ -1,8 +0,0 @@
-Document: nekohtml-doc
-Title: NekoHTML documentation
-Abstract: Documentation for the NekoHTML parser.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libnekohtml-java/doc/index.html
-Files: /usr/share/doc/libnekohtml-java/doc/*.html

Modified: trunk/nekohtml/debian/rules
===================================================================
--- trunk/nekohtml/debian/rules	2014-06-23 20:13:57 UTC (rev 18219)
+++ trunk/nekohtml/debian/rules	2014-06-23 21:37:59 UTC (rev 18220)
@@ -16,14 +16,15 @@
 	uscan --download-version $(VERSION) --force-download --rename
 
 binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java doc usr/share/doc/lib$(PACKAGE)-java
 	mh_installpoms -plib$(PACKAGE)-java
 	mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) pom.xml build/lib/$(PACKAGE).jar
 	mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) debian/nekohtml-xni.pom build/lib/$(PACKAGE)Xni.jar
 
 binary-post-install/lib$(PACKAGE)-java-doc::
+	dh_install -plib$(PACKAGE)-java-doc doc usr/share/doc/lib$(PACKAGE)-java
 	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
 
 clean::
 	mh_clean
 	-rm -rf debian/tmp
+