r2411 - in branches/nekohtml/debian: . debian

[Marcus Better]

Author: marcusb-guest
Date: 2006-09-13 11:09:10 +0000 (Wed, 13 Sep 2006)
New Revision: 2411

Modified:
   branches/nekohtml/debian/build-html.xml
   branches/nekohtml/debian/debian/libnekohtml-java.doc-base
   branches/nekohtml/debian/debian/libnekohtml-java.docs
   branches/nekohtml/debian/debian/libnekohtml-java.install
   branches/nekohtml/debian/debian/rules
Log:
Changes for full upstream sources.


Modified: branches/nekohtml/debian/build-html.xml
===================================================================
--- branches/nekohtml/debian/build-html.xml	2006-09-13 10:52:04 UTC (rev 2410)
+++ branches/nekohtml/debian/build-html.xml	2006-09-13 11:09:10 UTC (rev 2411)
@@ -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>

Modified: branches/nekohtml/debian/debian/libnekohtml-java.doc-base
===================================================================
--- branches/nekohtml/debian/debian/libnekohtml-java.doc-base	2006-09-13 10:52:04 UTC (rev 2410)
+++ branches/nekohtml/debian/debian/libnekohtml-java.doc-base	2006-09-13 11:09:10 UTC (rev 2411)
@@ -8,11 +8,10 @@
 Files: /usr/share/doc/libnekohtml-java/*.html
 
 Document: nekohtml-api
-Title: Programmer API for NekoHTML
-Abstract: This is the Javadoc programmer API documentation
- for the NekoHTML parser.
+Title: NekoHTML API documentation
+Abstract: JavaDoc documentation for NekoHTML.
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/libnekohtml-java/javadoc/index.html
-Files: /usr/share/doc/libnekohtml-java/javadoc/*
+Index: /usr/share/doc/libnekohtml-java/api/index.html
+Files: /usr/share/doc/libnekohtml-java/api/*

Modified: branches/nekohtml/debian/debian/libnekohtml-java.docs
===================================================================
--- branches/nekohtml/debian/debian/libnekohtml-java.docs	2006-09-13 10:52:04 UTC (rev 2410)
+++ branches/nekohtml/debian/debian/libnekohtml-java.docs	2006-09-13 11:09:10 UTC (rev 2411)
@@ -1 +1,2 @@
-doc/html/*
+doc/html/*.html
+doc/api

Modified: branches/nekohtml/debian/debian/libnekohtml-java.install
===================================================================
--- branches/nekohtml/debian/debian/libnekohtml-java.install	2006-09-13 10:52:04 UTC (rev 2410)
+++ branches/nekohtml/debian/debian/libnekohtml-java.install	2006-09-13 11:09:10 UTC (rev 2411)
@@ -1,3 +1,3 @@
-nekohtml.jar			/usr/share/java
-nekohtmlXni.jar			/usr/share/java
+bin/nekohtml.jar		/usr/share/java
+bin/nekohtmlXni.jar		/usr/share/java
 

Modified: branches/nekohtml/debian/debian/rules
===================================================================
--- branches/nekohtml/debian/debian/rules	2006-09-13 10:52:04 UTC (rev 2410)
+++ branches/nekohtml/debian/debian/rules	2006-09-13 11:09:10 UTC (rev 2411)
@@ -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