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

[Marcus Better]

Author: marcusb-guest
Date: 2006-09-12 10:04:45 +0000 (Tue, 12 Sep 2006)
New Revision: 2391

Added:
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base
Removed:
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.doc-base
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.docs
Modified:
   branches/xml-im-exporter/feature/debian/debian/control
   branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs
Log:
Merge javadocs into main package, remove -doc package.


Modified: branches/xml-im-exporter/feature/debian/debian/control
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/control	2006-09-12 10:00:55 UTC (rev 2390)
+++ branches/xml-im-exporter/feature/debian/debian/control	2006-09-12 10:04:45 UTC (rev 2391)
@@ -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.

Deleted: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.doc-base
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.doc-base	2006-09-12 10:00:55 UTC (rev 2390)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.doc-base	2006-09-12 10:04:45 UTC (rev 2391)
@@ -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: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.docs
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.docs	2006-09-12 10:00:55 UTC (rev 2390)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.docs	2006-09-12 10:04:45 UTC (rev 2391)
@@ -1 +0,0 @@
-build/javadoc

Copied: branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base (from rev 2388, branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java-doc.doc-base)
===================================================================
--- branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base	                        (rev 0)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.doc-base	2006-09-12 10:04:45 UTC (rev 2391)
@@ -0,0 +1,8 @@
+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/*

Modified: 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-12 10:00:55 UTC (rev 2390)
+++ branches/xml-im-exporter/feature/debian/debian/libxml-im-exporter-java.docs	2006-09-12 10:04:45 UTC (rev 2391)
@@ -1 +1,2 @@
 doc/index.html
+build/javadoc