[nekohtml] 13/46: Merged debian branch (r2416).

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository nekohtml.

commit c8f501a2a75cb74ed1cfac553bd275cf16fee989
Author: Marcus Better <marcus at better.se>
Date:   Thu Sep 14 10:00:02 2006 +0000

    Merged debian branch (r2416).
---
 nekohtml/debian/control                                  |  4 ++--
 nekohtml/debian/dirs                                     |  2 ++
 .../{libnekohtml-java.doc-base.api => doc-base.api}      |  0
 .../{libnekohtml-java.doc-base.doc => doc-base.doc}      |  4 ++--
 nekohtml/debian/docs                                     |  1 +
 nekohtml/debian/{libnekohtml-java.install => install}    |  1 -
 nekohtml/debian/libnekohtml-java.dirs                    |  1 -
 nekohtml/debian/libnekohtml-java.docs                    |  2 --
 nekohtml/debian/rules                                    | 16 ++++++++--------
 9 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/nekohtml/debian/control b/nekohtml/debian/control
index 483063b..176c9c7 100644
--- a/nekohtml/debian/control
+++ b/nekohtml/debian/control
@@ -17,6 +17,6 @@ Description: HTML parser for Java
  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/
diff --git a/nekohtml/debian/dirs b/nekohtml/debian/dirs
new file mode 100644
index 0000000..502a327
--- /dev/null
+++ b/nekohtml/debian/dirs
@@ -0,0 +1,2 @@
+usr/share/doc/libnekohtml-java/doc
+usr/share/java
diff --git a/nekohtml/debian/libnekohtml-java.doc-base.api b/nekohtml/debian/doc-base.api
similarity index 100%
rename from nekohtml/debian/libnekohtml-java.doc-base.api
rename to nekohtml/debian/doc-base.api
diff --git a/nekohtml/debian/libnekohtml-java.doc-base.doc b/nekohtml/debian/doc-base.doc
similarity index 57%
rename from nekohtml/debian/libnekohtml-java.doc-base.doc
rename to nekohtml/debian/doc-base.doc
index 6e896ec..7df9967 100644
--- a/nekohtml/debian/libnekohtml-java.doc-base.doc
+++ b/nekohtml/debian/doc-base.doc
@@ -4,5 +4,5 @@ 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
+Index: /usr/share/doc/libnekohtml-java/doc/index.html
+Files: /usr/share/doc/libnekohtml-java/doc/*.html
diff --git a/nekohtml/debian/docs b/nekohtml/debian/docs
new file mode 100644
index 0000000..a37585e
--- /dev/null
+++ b/nekohtml/debian/docs
@@ -0,0 +1 @@
+doc/api
diff --git a/nekohtml/debian/libnekohtml-java.install b/nekohtml/debian/install
similarity index 98%
rename from nekohtml/debian/libnekohtml-java.install
rename to nekohtml/debian/install
index ace7fec..68257f7 100644
--- a/nekohtml/debian/libnekohtml-java.install
+++ b/nekohtml/debian/install
@@ -1,3 +1,2 @@
 bin/nekohtml.jar		/usr/share/java
 bin/nekohtmlXni.jar		/usr/share/java
-
diff --git a/nekohtml/debian/libnekohtml-java.dirs b/nekohtml/debian/libnekohtml-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/nekohtml/debian/libnekohtml-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/nekohtml/debian/libnekohtml-java.docs b/nekohtml/debian/libnekohtml-java.docs
deleted file mode 100644
index 9be6900..0000000
--- a/nekohtml/debian/libnekohtml-java.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/html/*.html
-doc/api
diff --git a/nekohtml/debian/rules b/nekohtml/debian/rules
index c6f9859..2039ae2 100755
--- a/nekohtml/debian/rules
+++ b/nekohtml/debian/rules
@@ -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 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	dh_clean
 	$(ANT_INVOKE) -buildfile build-html.xml clean
+	dh_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 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-dependent files here.
 binary-arch: build install
 
 binary: binary-indep binary-arch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nekohtml.git