r2417 - trunk/nekohtml/nekohtml/debian
Marcus Better
marcusb-guest at costa.debian.org
Thu Sep 14 10:00:03 UTC 2006
Author: marcusb-guest
Date: 2006-09-14 10:00:02 +0000 (Thu, 14 Sep 2006)
New Revision: 2417
Added:
trunk/nekohtml/nekohtml/debian/dirs
trunk/nekohtml/nekohtml/debian/doc-base.api
trunk/nekohtml/nekohtml/debian/doc-base.doc
trunk/nekohtml/nekohtml/debian/docs
trunk/nekohtml/nekohtml/debian/install
Removed:
trunk/nekohtml/nekohtml/debian/libnekohtml-java.dirs
trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api
trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc
trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs
trunk/nekohtml/nekohtml/debian/libnekohtml-java.install
Modified:
trunk/nekohtml/nekohtml/debian/control
trunk/nekohtml/nekohtml/debian/rules
Log:
Merged debian branch (r2416).
Modified: trunk/nekohtml/nekohtml/debian/control
===================================================================
--- trunk/nekohtml/nekohtml/debian/control 2006-09-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/control 2006-09-14 10:00:02 UTC (rev 2417)
@@ -17,6 +17,6 @@
files and "fix up" many common mistakes that human (and computer)
authors make in writing HTML documents. NekoHTML adds missing parent
elements; automatically closes elements with optional end tags; and
- can handle mismatched inline element tags.
+ can handle mismatched in-line element tags.
.
- Homepage: http://people.apache.org/~andyc/neko/doc/html/
+ Homepage: http://people.apache.org/~andyc/neko/doc/html/
Copied: trunk/nekohtml/nekohtml/debian/dirs (from rev 2416, branches/nekohtml/debian/debian/dirs)
===================================================================
--- trunk/nekohtml/nekohtml/debian/dirs (rev 0)
+++ trunk/nekohtml/nekohtml/debian/dirs 2006-09-14 10:00:02 UTC (rev 2417)
@@ -0,0 +1,2 @@
+usr/share/doc/libnekohtml-java/doc
+usr/share/java
Copied: trunk/nekohtml/nekohtml/debian/doc-base.api (from rev 2416, branches/nekohtml/debian/debian/doc-base.api)
===================================================================
--- trunk/nekohtml/nekohtml/debian/doc-base.api (rev 0)
+++ trunk/nekohtml/nekohtml/debian/doc-base.api 2006-09-14 10:00:02 UTC (rev 2417)
@@ -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/doc-base.doc (from rev 2416, branches/nekohtml/debian/debian/doc-base.doc)
===================================================================
--- trunk/nekohtml/nekohtml/debian/doc-base.doc (rev 0)
+++ trunk/nekohtml/nekohtml/debian/doc-base.doc 2006-09-14 10:00:02 UTC (rev 2417)
@@ -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/doc/index.html
+Files: /usr/share/doc/libnekohtml-java/doc/*.html
Copied: trunk/nekohtml/nekohtml/debian/docs (from rev 2416, branches/nekohtml/debian/debian/docs)
===================================================================
--- trunk/nekohtml/nekohtml/debian/docs (rev 0)
+++ trunk/nekohtml/nekohtml/debian/docs 2006-09-14 10:00:02 UTC (rev 2417)
@@ -0,0 +1 @@
+doc/api
Copied: trunk/nekohtml/nekohtml/debian/install (from rev 2416, branches/nekohtml/debian/debian/install)
===================================================================
--- trunk/nekohtml/nekohtml/debian/install (rev 0)
+++ trunk/nekohtml/nekohtml/debian/install 2006-09-14 10:00:02 UTC (rev 2417)
@@ -0,0 +1,2 @@
+bin/nekohtml.jar /usr/share/java
+bin/nekohtmlXni.jar /usr/share/java
Deleted: trunk/nekohtml/nekohtml/debian/libnekohtml-java.dirs
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.dirs 2006-09-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.dirs 2006-09-14 10:00:02 UTC (rev 2417)
@@ -1 +0,0 @@
-usr/share/java
Deleted: trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api 2006-09-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.api 2006-09-14 10:00:02 UTC (rev 2417)
@@ -1,8 +0,0 @@
-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/*
Deleted: trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc 2006-09-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.doc-base.doc 2006-09-14 10:00:02 UTC (rev 2417)
@@ -1,8 +0,0 @@
-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
Deleted: trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs 2006-09-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.docs 2006-09-14 10:00:02 UTC (rev 2417)
@@ -1,2 +0,0 @@
-doc/html/*.html
-doc/api
Deleted: trunk/nekohtml/nekohtml/debian/libnekohtml-java.install
===================================================================
--- trunk/nekohtml/nekohtml/debian/libnekohtml-java.install 2006-09-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/libnekohtml-java.install 2006-09-14 10:00:02 UTC (rev 2417)
@@ -1,3 +0,0 @@
-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-14 09:59:28 UTC (rev 2416)
+++ trunk/nekohtml/nekohtml/debian/rules 2006-09-14 10:00:02 UTC (rev 2417)
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+INSTALLDIR := $(CURDIR)/debian/libnekohtml-java
+
JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_JARS_BASE := /usr/share/java
JAVACMD := $(JAVA_HOME)/bin/java
@@ -27,24 +29,23 @@
dh_testdir
dh_testroot
rm -f build-stamp
+ $(ANT_INVOKE) -buildfile build-html.xml clean
dh_clean
- $(ANT_INVOKE) -buildfile build-html.xml clean
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- dh_install
- dh_installchangelogs doc/html/changes.html
- dh_installdocs
- rm $(CURDIR)/debian/libnekohtml-java/usr/share/doc/libnekohtml-java/changes.html
- dh_link
+ install doc/html/*.html $(INSTALLDIR)/usr/share/doc/libnekohtml-java/doc
-# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
+ dh_installchangelogs doc/html/changes.html
+ dh_installdocs
+ dh_install
+ dh_link
dh_compress
dh_fixperms
dh_installdeb
@@ -52,7 +53,6 @@
dh_md5sums
dh_builddeb
-# Build architecture-dependent files here.
binary-arch: build install
binary: binary-indep binary-arch
More information about the pkg-java-commits
mailing list