[pkg-java] r14750 - trunk/libjakarta-poi-java/debian

Torsten Werner twerner at alioth.debian.org
Wed Sep 7 19:55:48 UTC 2011


Author: twerner
Date: 2011-09-07 19:55:47 +0000 (Wed, 07 Sep 2011)
New Revision: 14750

Added:
   trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.doc-base.1
   trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.install
   trunk/libjakarta-poi-java/debian/libapache-poi-java.dirs
Removed:
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java.dirs
Modified:
   trunk/libjakarta-poi-java/debian/README.Debian
   trunk/libjakarta-poi-java/debian/changelog
   trunk/libjakarta-poi-java/debian/control
   trunk/libjakarta-poi-java/debian/rules
Log:
* Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
  Replaces, and Provides.
* Remove Java runtime from Depends.

Modified: trunk/libjakarta-poi-java/debian/README.Debian
===================================================================
--- trunk/libjakarta-poi-java/debian/README.Debian	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/README.Debian	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1,18 +1,16 @@
-libjakarta-poi-java for Debian
-------------------------------
+libapache-poi-java for Debian
+-----------------------------
 
-Jakarta POI consists of three jars in /usr/share/java:
+Apache POI consists of three jars in /usr/share/java:
 
-jakarta-poi.jar
-jakarta-poi-scratchpad.jar
-jakarta-poi-contrib.jar
+poi.jar
+poi-scratchpad.jar
+poi-contrib.jar
 
-For jakarta-poi.jar and jakarta-poi-scratchpad.jar a CLASSPATH 
-with the jar files of libcommons-logging-java, liblog4j1.2-java
-and libxalan2-java is enough.
+For poi.jar and poi-scratchpad.jar a CLASSPATH with the jar files of
+libcommons-logging-java, liblog4j1.2-java and libxalan2-java is enough.
 
-If you want to use the jakarta-poi-contrib.jar you need to 
-additionally include the jar files of libcommons-beanutils-java 
-and libcommons-lang-java into your CLASSPATH.
+If you want to use the poi-contrib.jar you need to additionally include the jar
+files of libcommons-beanutils-java and libcommons-lang-java into your CLASSPATH.
 
  -- Wolfgang Baer <WBaer at gmx.de>  Tue, 25 Oct 2005 21:12:16 +0200

Modified: trunk/libjakarta-poi-java/debian/changelog
===================================================================
--- trunk/libjakarta-poi-java/debian/changelog	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/changelog	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1,3 +1,11 @@
+libapache-poi-java (3.6+dfsg-2) unstable; urgency=low
+
+  * Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
+    Replaces, and Provides.
+  * Remove Java runtime from Depends.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 07 Sep 2011 21:37:25 +0200
+
 libjakarta-poi-java (3.6+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libjakarta-poi-java/debian/control
===================================================================
--- trunk/libjakarta-poi-java/debian/control	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/control	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1,18 +1,21 @@
-Source: libjakarta-poi-java
+Source: libapache-poi-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, quilt, maven-repo-helper
 Standards-Version: 3.8.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjakarta-poi-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjakarta-poi-java/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-poi-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-poi-java/
 Homepage: http://poi.apache.org
 
-Package: libjakarta-poi-java
+Package: libapache-poi-java
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, ${misc:Depends}
-Suggests: java-virtual-machine, libjakarta-poi-java-doc
+Depends: libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, ${misc:Depends}
+Suggests: libapache-poi-java-doc
+Conflicts: libjakarta-poi-java
+Replaces: libjakarta-poi-java
+Provides: libjakarta-poi-java
 Description: Poor Obfuscation Implementation
  The POI project consists of APIs for manipulating various file formats 
  based upon Microsoft's OLE 2 Compound Document format using pure Java.
@@ -20,11 +23,14 @@
  OLE 2 Compound Document Format based files include
  most Microsoft Office files such as XLS and DOC. 
 
-Package: libjakarta-poi-java-doc
+Package: libapache-poi-java-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libjakarta-poi-java
+Suggests: libapache-poi-java
+Conflicts: libjakarta-poi-java-doc
+Replaces: libjakarta-poi-java-doc
+Provides: libjakarta-poi-java-doc
 Description: Poor Obfuscation Implementation Documentation
  The POI project consists of APIs for manipulating various file formats 
  based upon Microsoft's OLE 2 Compound Document format using pure Java.

Copied: trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.doc-base.1 (from rev 14749, trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1)
===================================================================
--- trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.doc-base.1	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.doc-base.1	2011-09-07 19:55:47 UTC (rev 14750)
@@ -0,0 +1,12 @@
+Document: libapache-poi-java-doc1
+Title: Programmer API for the Poor Obfuscation Implementation
+Author: The Apache POI Development Team
+Abstract: This is the programmer API of libapache-poi-java, a library classes
+ for manipulating various file formats based upon Microsoft's OLE 2 Compound 
+ Document format using pure Java. This includes Microsoft Office files such 
+ as XLS and DOC.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libapache-poi-java/api/index.html
+Files: /usr/share/doc/libapache-poi-java/api/*.html

Copied: trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.install (from rev 14749, trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install)
===================================================================
--- trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.install	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/libapache-poi-java-doc.install	2011-09-07 19:55:47 UTC (rev 14750)
@@ -0,0 +1 @@
+build/tmp/site/build/site/apidocs/* /usr/share/doc/libapache-poi-java/api/

Copied: trunk/libjakarta-poi-java/debian/libapache-poi-java.dirs (from rev 14749, trunk/libjakarta-poi-java/debian/libjakarta-poi-java.dirs)
===================================================================
--- trunk/libjakarta-poi-java/debian/libapache-poi-java.dirs	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/libapache-poi-java.dirs	2011-09-07 19:55:47 UTC (rev 14750)
@@ -0,0 +1 @@
+usr/share/java

Deleted: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1,12 +0,0 @@
-Document: libjakarta-poi-java-doc1
-Title: Programmer API for the Poor Obfuscation Implementation
-Author: The Apache Jakarta POI Development Team
-Abstract: This is the programmer API of libjakarta-poi-java, a library classes
- for manipulating various file formats based upon Microsoft's OLE 2 Compound 
- Document format using pure Java. This includes Microsoft Office files such 
- as XLS and DOC.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjakarta-poi-java/api/index.html
-Files: /usr/share/doc/libjakarta-poi-java/api/*.html

Deleted: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1 +0,0 @@
-build/tmp/site/build/site/apidocs/* /usr/share/doc/libjakarta-poi-java/api/

Deleted: trunk/libjakarta-poi-java/debian/libjakarta-poi-java.dirs
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java.dirs	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java.dirs	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1 +0,0 @@
-usr/share/java

Modified: trunk/libjakarta-poi-java/debian/rules
===================================================================
--- trunk/libjakarta-poi-java/debian/rules	2011-09-07 17:13:55 UTC (rev 14749)
+++ trunk/libjakarta-poi-java/debian/rules	2011-09-07 19:55:47 UTC (rev 14750)
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# debian/rules file for jakarta-poi (uses cdbs)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
@@ -7,7 +6,7 @@
 
 VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
 
-PACKAGE := jakarta-poi
+PACKAGE := apache-poi
 MAVEN_DIST := build/dist
 POM_DIR := $(MAVEN_DIST)
 JAR_DIR := $(MAVEN_DIST)
@@ -29,9 +28,9 @@
 	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-$(VERSION).pom
 	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-contrib-$(VERSION).pom
 	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-scratchpad-$(VERSION).pom
-	mh_installjar -plib$(PACKAGE)-java -njakarta-poi -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -njakarta-contrib-poi -l $(POM_DIR)/poi-contrib-$(VERSION).pom $(JAR_DIR)/poi-contrib-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -njakarta-scratchpad-poi -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-contrib-$(VERSION).pom $(JAR_DIR)/poi-contrib-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar
 
 get-orig-source:
 	debian/orig-tar.sh --upstream-version $(VERSION)




More information about the pkg-java-commits mailing list