r2400 - in trunk/xml-im-exporter/xml-im-exporter: debian doc lib

Tue Sep 12 10:34:07 UTC 2006

Author: marcusb-guest
Date: 2006-09-12 10:34:06 +0000 (Tue, 12 Sep 2006)
New Revision: 2400

Added:
   trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.doc-base
   trunk/xml-im-exporter/xml-im-exporter/doc/javadoc/
   trunk/xml-im-exporter/xml-im-exporter/lib/extern/
   trunk/xml-im-exporter/xml-im-exporter/lib/xml-im-exporter1.1.jar
   trunk/xml-im-exporter/xml-im-exporter/lib/xml-im-exporter1_0.jar
Removed:
   trunk/xml-im-exporter/xml-im-exporter/debian/README.Debian
   trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base
   trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.docs
Modified:
   trunk/xml-im-exporter/xml-im-exporter/debian/control
   trunk/xml-im-exporter/xml-im-exporter/debian/copyright
   trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.docs
   trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.install
   trunk/xml-im-exporter/xml-im-exporter/debian/rules
Log:
Merged debian branch (r2399).


Deleted: trunk/xml-im-exporter/xml-im-exporter/debian/README.Debian
===================================================================

--- trunk/xml-im-exporter/xml-im-exporter/debian/README.Debian	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/README.Debian	2006-09-12 10:34:06 UTC (rev 2400)
@@ -1,12 +0,0 @@
-XML Im-/Exporter for Debian
-===========================
-
-The Debian source package differs from the original source in that the
-following parts have been removed:
-
- - precompiled jar files
- - Javascript documentation
-
-All of these are regenerated during the build process.
-
- -- Marcus Better <marcus at better.se>, Tue,  5 Sep 2006 21:36:01 +0200

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/control
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/control	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/control	2006-09-12 10:34:06 UTC (rev 2400)
@@ -10,19 +10,10 @@
 Package: libxml-im-exporter-java
 Architecture: all
 Depends: classpath-common | java1-runtime | java2-runtime
-Suggests: libxml-im-exporter-java-doc
+Suggests: libxml-im-exporter-java-doc, classpath-doc
 Description: Java library for handling XML documents
  XML Im-/Exporter is a low level library to assist in the process of
  importing and exporting XML in Java programs. It is designed with
  performance and simplicity in mind.
  .
  Homepage: http://xml-im-exporter.sourceforge.net
-
-Package: libxml-im-exporter-java-doc
-Section: doc
-Architecture: all
-Suggests: libxml-im-exporter-java, classpath-doc
-Description: API documentation for libxml-im-exporter-java
- XML Im-/Exporter is a low level library to assist in the process of
- importing and exporting XML in Java programs. This package contains
- the JavaDoc API documentation.

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/copyright
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/copyright	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/copyright	2006-09-12 10:34:06 UTC (rev 2400)
@@ -39,18 +39,5 @@
 <marcus at better.se>, and is licensed under the GNU Lesser General
 Public License version 2.1.
 
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License version 2.1.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 On Debian systems, the complete text of the GNU Lesser General Public
 License can be found in `/usr/share/common-licenses/LGPL-2.1'.

Deleted: trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.doc-base	2006-09-12 10:34:06 UTC (rev 2400)
@@ -1,8 +0,0 @@
-Document: xml-im-exporter-doc
-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-doc/api/index.html
-Files: /usr/share/doc/libxml-im-exporter-java-doc/api/*

Deleted: trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.docs
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.docs	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java-doc.docs	2006-09-12 10:34:06 UTC (rev 2400)
@@ -1 +0,0 @@
-build/javadoc

Copied: trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.doc-base (from rev 2399, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base)
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.doc-base	                        (rev 0)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.doc-base	2006-09-12 10:34:06 UTC (rev 2400)
@@ -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/*

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.docs
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.docs	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.docs	2006-09-12 10:34:06 UTC (rev 2400)
@@ -1 +1,2 @@
 doc/index.html
+build/javadoc

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.install
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.install	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/libxml-im-exporter-java.install	2006-09-12 10:34:06 UTC (rev 2400)
@@ -1 +1 @@
-lib/xml-im-exporter1.1.jar	/usr/share/java
+build/lib/xml-im-exporter1.1.jar	/usr/share/java

Modified: trunk/xml-im-exporter/xml-im-exporter/debian/rules
===================================================================
--- trunk/xml-im-exporter/xml-im-exporter/debian/rules	2006-09-12 10:32:59 UTC (rev 2399)
+++ trunk/xml-im-exporter/xml-im-exporter/debian/rules	2006-09-12 10:34:06 UTC (rev 2400)
@@ -21,21 +21,22 @@
 PKGNAME		:= libxml-im-exporter-java
 INSTALLDIR	:= $(CURDIR)/debian/$(PKGNAME)
 
-configure: configure-stamp
-configure-stamp:
+test: test-stamp
+test-stamp:
 	dh_testdir
-	touch configure-stamp
+	$(ANT_INVOKE) test
+	touch test-stamp
 
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp:
 	dh_testdir
-	$(ANT_INVOKE) jar javadocs test
+	$(ANT_INVOKE) jar javadocs
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp
 	dh_clean
 	$(ANT_INVOKE) scrub
 
@@ -44,21 +45,18 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+
+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)-doc/usr/share/doc/$(PKGNAME)-doc/javadoc \
-	   $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/api
-	dh_installexamples
-	dh_installman
+	mv $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/javadoc \
+	   $(INSTALLDIR)/usr/share/doc/$(PKGNAME)/api
 	dh_link
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -66,8 +64,7 @@
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-dependent files here.
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install test

Copied: trunk/xml-im-exporter/xml-im-exporter/doc/javadoc (from rev 2399, branches/xml-im-exporter/feature/debian/doc/javadoc)

Copied: trunk/xml-im-exporter/xml-im-exporter/lib/extern (from rev 2399, branches/xml-im-exporter/feature/debian/lib/extern)

Copied: trunk/xml-im-exporter/xml-im-exporter/lib/xml-im-exporter1.1.jar (from rev 2399, branches/xml-im-exporter/feature/debian/lib/xml-im-exporter1.1.jar)
===================================================================
(Binary files differ)

Copied: trunk/xml-im-exporter/xml-im-exporter/lib/xml-im-exporter1_0.jar (from rev 2399, branches/xml-im-exporter/feature/debian/lib/xml-im-exporter1_0.jar)
===================================================================
(Binary files differ)


