r2418 - branches/xml-im-exporter/feature/debian/debian

Marcus Better marcusb-guest at costa.debian.org
Thu Sep 14 10:03:39 UTC 2006


Author: marcusb-guest
Date: 2006-09-14 10:03:38 +0000 (Thu, 14 Sep 2006)
New Revision: 2418

Added:
   branches/xml-im-exporter/feature/debian/debian/dirs
   branches/xml-im-exporter/feature/debian/debian/doc-base
   branches/xml-im-exporter/feature/debian/debian/docs
   branches/xml-im-exporter/feature/debian/debian/install
   branches/xml-im-exporter/feature/debian/debian/links
Removed:
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.dirs
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.install
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.links
Modified:
   branches/xml-im-exporter/feature/debian/debian/control
   branches/xml-im-exporter/feature/debian/debian/rules
Log:
Minor cleanups.


Modified: branches/xml-im-exporter/feature/debian/debian/control
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/control	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/control	2006-09-14 10:03:38 UTC (rev 2418)
@@ -16,4 +16,4 @@
  importing and exporting XML in Java programs. It is designed with
  performance and simplicity in mind.
  .
- Homepage: http://xml-im-exporter.sourceforge.net
+  Homepage: http://xml-im-exporter.sourceforge.net

Copied: branches/xml-im-exporter/feature/debian/debian/dirs (from rev 2417, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.dirs)
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/dirs	                        (rev 0)
+++ branches/xml-im-exporter/feature/debian/debian/dirs	2006-09-14 10:03:38 UTC (rev 2418)
@@ -0,0 +1 @@
+usr/share/java

Copied: branches/xml-im-exporter/feature/debian/debian/doc-base (from rev 2417, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base)
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/doc-base	                        (rev 0)
+++ branches/xml-im-exporter/feature/debian/debian/doc-base	2006-09-14 10:03:38 UTC (rev 2418)
@@ -0,0 +1,8 @@
+Document: xml-im-exporter-api
+Title: XML Im-/Exporter API documentation
+Abstract: JavaDoc documentation for the XML Im-/Exporter
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libxml-im-exporter-java/api/index.html
+Files: /usr/share/doc/libxml-im-exporter-java/api/*

Copied: branches/xml-im-exporter/feature/debian/debian/docs (from rev 2417, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs)
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/docs	                        (rev 0)
+++ branches/xml-im-exporter/feature/debian/debian/docs	2006-09-14 10:03:38 UTC (rev 2418)
@@ -0,0 +1,2 @@
+doc/index.html
+build/javadoc

Copied: branches/xml-im-exporter/feature/debian/debian/install (from rev 2417, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.install)
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/install	                        (rev 0)
+++ branches/xml-im-exporter/feature/debian/debian/install	2006-09-14 10:03:38 UTC (rev 2418)
@@ -0,0 +1 @@
+build/lib/xml-im-exporter1.1.jar	/usr/share/java

Deleted: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.dirs
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.dirs	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.dirs	2006-09-14 10:03:38 UTC (rev 2418)
@@ -1 +0,0 @@
-usr/share/java

Deleted: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base	2006-09-14 10:03:38 UTC (rev 2418)
@@ -1,8 +0,0 @@
-Document: xml-im-exporter-api
-Title: XML Im-/Exporter API documentation
-Abstract: JavaDoc documentation for the XML Im-/Exporter
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/libxml-im-exporter-java/api/index.html
-Files: /usr/share/doc/libxml-im-exporter-java/api/*

Deleted: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs	2006-09-14 10:03:38 UTC (rev 2418)
@@ -1,2 +0,0 @@
-doc/index.html
-build/javadoc

Deleted: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.install
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.install	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.install	2006-09-14 10:03:38 UTC (rev 2418)
@@ -1 +0,0 @@
-build/lib/xml-im-exporter1.1.jar	/usr/share/java

Deleted: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.links
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.links	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.links	2006-09-14 10:03:38 UTC (rev 2418)
@@ -1 +0,0 @@
-usr/share/java/xml-im-exporter1.1.jar	/usr/share/java/xml-im-exporter.jar

Copied: branches/xml-im-exporter/feature/debian/debian/links (from rev 2417, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.links)
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/links	                        (rev 0)
+++ branches/xml-im-exporter/feature/debian/debian/links	2006-09-14 10:03:38 UTC (rev 2418)
@@ -0,0 +1 @@
+usr/share/java/xml-im-exporter1.1.jar	/usr/share/java/xml-im-exporter.jar

Modified: branches/xml-im-exporter/feature/debian/debian/rules
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/rules	2006-09-14 10:00:02 UTC (rev 2417)
+++ branches/xml-im-exporter/feature/debian/debian/rules	2006-09-14 10:03:38 UTC (rev 2418)
@@ -20,6 +20,7 @@
 
 PKGNAME		:= libxml-im-exporter-java
 INSTALLDIR	:= $(CURDIR)/debian/$(PKGNAME)
+DOCDIR		:= $(INSTALLDIR)/usr/share/doc/$(PKGNAME)
 
 test: test-stamp
 test-stamp:
@@ -37,8 +38,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	dh_clean
 	$(ANT_INVOKE) scrub
+	dh_clean
 
 install: build
 	dh_testdir
@@ -49,13 +50,11 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_install
 	dh_installchangelogs
 	dh_installdocs
-	mv $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/index.html \
-	   $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/README.html
-	mv $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/javadoc \
-	   $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/api
+	dh_install
+	mv $(DOCDIR)/index.html $(DOCDIR)/README.html
+	mv $(DOCDIR)/javadoc $(DOCDIR)/api
 	dh_link
 	dh_compress
 	dh_fixperms




More information about the pkg-java-commits mailing list