r2413 - in trunk/nekohtml/nekohtml: . debian doc/html

Wed Sep 13 11:24:28 UTC 2006

Author: marcusb-guest
Date: 2006-09-13 11:24:28 +0000 (Wed, 13 Sep 2006)
New Revision: 2413

Added:
   trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api
   trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc
   trunk/nekohtml/nekohtml/doc/html/javadoc/
   trunk/nekohtml/nekohtml/lib/
   trunk/nekohtml/nekohtml/nekohtml.jar
   trunk/nekohtml/nekohtml/nekohtmlSamples.jar
Modified:
   trunk/nekohtml/nekohtml/build-html.xml
   trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs
   trunk/nekohtml/nekohtml/debian/libnekohtml-java.install
   trunk/nekohtml/nekohtml/debian/rules
Log:
Merged debian branch (r2412).


Modified: trunk/nekohtml/nekohtml/build-html.xml
===================================================================

--- trunk/nekohtml/nekohtml/build-html.xml	2006-09-13 11:15:33 UTC (rev 2412)
+++ trunk/nekohtml/nekohtml/build-html.xml	2006-09-13 11:24:28 UTC (rev 2413)
@@ -13,6 +13,7 @@
  <property name='copyright' value='(C) Copyright 2002-2005, ${author}. All rights reserved.'/>
  <property name='URL'       value='http://www.apache.org/~andyc/neko/doc/html/index.html'/>
   
+ <property name='javadoc.dir'    value='doc/api'/>
  <property name='jarfile'        value='${name}.jar'/>
  <property name='jarfileXni'     value='${name}Xni.jar'/>
  <property name='jarfileSamples' value='${name}Samples.jar'/>
@@ -57,10 +58,10 @@
    <fileset dir='.' includes='LICENSE'/>
    <fileset dir='src/html' includes='**/*.properties'/>
   </copy>
-  <jar jarfile='${jarfile}' basedir='bin/html' 
+  <jar jarfile='bin/${jarfile}' basedir='bin/html' 
        manifest='${version.manifest}'
        includes='LICENSE,org/**/*.class,org/**/*.properties'/>
-  <jar jarfile='${jarfileSamples}' basedir='bin/html'
+  <jar jarfile='bin/${jarfileSamples}' basedir='bin/html'
        includes='LICENSE,sample/**'/>
  </target> 
 
@@ -70,7 +71,7 @@
    <fileset dir='.' includes='LICENSE'/>
    <fileset dir='src/html' includes='META-INF/services/**'/>
   </copy>
-  <jar jarfile='${jarfileXni}' basedir='bin/html'
+  <jar jarfile='bin/${jarfileXni}' basedir='bin/html'
        includes='LICENSE,META-INF/services/**'/>
  </target>
 
@@ -100,10 +101,10 @@
  </target>
 
  <target name='doc' unless='docs.done'>
-  <delete dir='doc/html/javadoc'/>
-  <mkdir dir='doc/html/javadoc'/>
+  <delete dir='${javadoc.dir}'/>
+  <mkdir dir='${javadoc.dir}'/>
   <javadoc packagenames='${package},${package}.parsers,${package}.filters'
-           sourcepath='src/html' destdir='doc/html/javadoc'
+           sourcepath='src/html' destdir='${javadoc.dir}'
            author='true' version='true' use='true'
            windowtitle="${Name} Implementation"
            doctitle="${Name}"
@@ -174,13 +175,8 @@
  </target>
 
  <target name='clean'>
-  <delete dir='bin/html' quiet='true'/>
-  <delete dir='doc/html/javadoc' quiet='true'/>
-  <delete quiet='true'>
-   <fileset dir='.' includes='${name}*.jar,${name}*.zip,${name}*.tar.gz'/>
-  </delete>
-  <delete dir='bin/package' quiet='true'/>
-  <delete dir='bin/package-${name}' quiet='true'/>
+  <delete dir='bin' quiet='true'/>
+  <delete dir='${javadoc.dir}' quiet='true'/>
  </target>
 
 </project>

Copied: trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api (from rev 2412, branches/nekohtml/debian/debian/libnekohtml-java.doc-base.api)
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api	                        (rev 0)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api	2006-09-13 11:24:28 UTC (rev 2413)
@@ -0,0 +1,8 @@
+Document: nekohtml-api
+Title: NekoHTML API documentation
+Abstract: JavaDoc documentation for NekoHTML.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libnekohtml-java/api/index.html
+Files: /usr/share/doc/libnekohtml-java/api/*

Copied: trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc (from rev 2412, branches/nekohtml/debian/debian/libnekohtml-java.doc-base.doc)
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc	                        (rev 0)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc	2006-09-13 11:24:28 UTC (rev 2413)
@@ -0,0 +1,8 @@
+Document: nekohtml-doc
+Title: NekoHTML documentation
+Abstract: Documentation for the NekoHTML parser.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libnekohtml-java/index.html
+Files: /usr/share/doc/libnekohtml-java/*.html

Modified: trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs	2006-09-13 11:15:33 UTC (rev 2412)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs	2006-09-13 11:24:28 UTC (rev 2413)
@@ -1 +1,2 @@
-doc/html/*
+doc/html/*.html
+doc/api

Modified: trunk/nekohtml/nekohtml/debian/libnekohtml-java.install
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.install	2006-09-13 11:15:33 UTC (rev 2412)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.install	2006-09-13 11:24:28 UTC (rev 2413)
@@ -1,3 +1,2 @@
-nekohtml.jar			/usr/share/java
-nekohtmlXni.jar			/usr/share/java
-
+bin/nekohtml.jar		/usr/share/java
+bin/nekohtmlXni.jar		/usr/share/java

Modified: trunk/nekohtml/nekohtml/debian/rules
===================================================================
--- trunk/nekohtml/nekohtml/debian/rules	2006-09-13 11:15:33 UTC (rev 2412)
+++ trunk/nekohtml/nekohtml/debian/rules	2006-09-13 11:24:28 UTC (rev 2413)
@@ -17,25 +17,18 @@
 ANT_INVOKE	:= $(JAVACMD) -classpath $(DEB_CLASSPATH) \
 		org.apache.tools.ant.Main $(DEB_ANT_ARGS)
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp:
 	dh_testdir
 	$(ANT_INVOKE) -buildfile build-html.xml jar jar-xni doc
 	touch build-stamp
 
-clean: clean-patched
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp
 	dh_clean
 	$(ANT_INVOKE) -buildfile build-html.xml clean
-	-rmdir bin
 
 install: build
 	dh_testdir
@@ -46,8 +39,6 @@
 	dh_installchangelogs doc/html/changes.html
 	dh_installdocs
 	rm $(CURDIR)/debian/libnekohtml-java/usr/share/doc/libnekohtml-java/changes.html
-	dh_installexamples
-	dh_installman
 	dh_link
 
 # Build architecture-independent files here.
@@ -65,4 +56,4 @@
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean clean-patched binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install

Copied: trunk/nekohtml/nekohtml/doc/html/javadoc (from rev 2412, branches/nekohtml/debian/doc/html/javadoc)

Copied: trunk/nekohtml/nekohtml/lib (from rev 2412, branches/nekohtml/debian/lib)

Copied: trunk/nekohtml/nekohtml/nekohtml.jar (from rev 2412, branches/nekohtml/debian/nekohtml.jar)
===================================================================
(Binary files differ)

Copied: trunk/nekohtml/nekohtml/nekohtmlSamples.jar (from rev 2412, branches/nekohtml/debian/nekohtmlSamples.jar)
===================================================================
(Binary files differ)


