[pkg-java] r13592 - trunk/libjcommon-java/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Apr 25 13:35:22 UTC 2011 

Author: drazzib
Date: 2011-04-25 13:35:15 +0000 (Mon, 25 Apr 2011)
New Revision: 13592

Added:
   trunk/libjcommon-java/debian/libjcommon-java-doc.doc-base
Removed:
   trunk/libjcommon-java/debian/libcommon-java-doc.doc-base
   trunk/libjcommon-java/debian/rules.orig
Modified:
   trunk/libjcommon-java/debian/changelog
   trunk/libjcommon-java/debian/control
   trunk/libjcommon-java/debian/rules
Log:
  Java FAQ 4.4.4).
* Update to Standards-Version 3.9.2.
* Remove Arnaud Vandyck from Uploaders.
* Drop Depends on JRE since it's a library (as per Debian Java
  Policy).
* Build-Depends on libservlet2.5-java instead of libservlet2.4-java.
* Rename d/libcommon-java-doc.doc-base to d/libjcommon-java-doc.doc-base
  to correctly register documentation.

Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog	2011-04-25 13:33:01 UTC (rev 13591)
+++ trunk/libjcommon-java/debian/changelog	2011-04-25 13:35:15 UTC (rev 13592)
@@ -1,23 +1,30 @@
-libjcommon-java (1.0.16-3) unstable; urgency=low
+libjcommon-java (1.0.16-2) unstable; urgency=low
 
   * Team upload.
+
+  [ Ioan Eugen STAN ]
   * Fix "Package does not install maven artifacts" (Closes: #620046)
   * Enabled maven artifact deployment:
     - debian/control: Build-Depends added maven-repo-helper
     - debian/rules: install maven artifacts
     - debian/poms/jcommon.pom: localised pom for maven
   * debian/patches/javaDocLink: links the package to system doc (Debian
-    Java FAQ 4.4.4)
+    Java FAQ 4.4.4).
 
- -- Ioan Eugen STAN <stan.ieugen at gmail.com>  Mon, 11 Apr 2011 00:15:12 +0300
+  [ Torsten Werner ]
+  * Remove last patch because it is not needed.
 
-libjcommon-java (1.0.16-2) unstable; urgency=low
+  [ Damien Raude-Morvan ]
+  * Update to Standards-Version 3.9.2.
+  * Remove Arnaud Vandyck from Uploaders.
+  * Drop Depends on JRE since it's a library (as per Debian Java
+    Policy).
+  * Build-Depends on libservlet2.5-java instead of libservlet2.4-java.
+  * Rename d/libcommon-java-doc.doc-base to d/libjcommon-java-doc.doc-base
+    to correctly register documentation.
 
-  UNRELEASED
-  * Remove last patch because it is not needed.
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 25 Apr 2011 15:18:34 +0200
 
- -- Torsten Werner <twerner at debian.org>  Tue, 23 Mar 2010 20:58:59 +0100
-
 libjcommon-java (1.0.16-1) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control	2011-04-25 13:33:01 UTC (rev 13591)
+++ trunk/libjcommon-java/debian/control	2011-04-25 13:35:15 UTC (rev 13592)
@@ -2,17 +2,17 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Rene Engelhard <rene at debian.org>
+Uploaders: Christian Bayle <bayle at debian.org>, Michael Koch <konqueror at gmx.de>, Rene Engelhard <rene at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper
-Build-Depends-Indep: default-jdk, ant, libservlet2.4-java, junit
-Standards-Version: 3.8.4
+Build-Depends-Indep: default-jdk, ant, libservlet2.5-java, junit
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjcommon-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjcommon-java/
 Homepage: http://www.jfree.org/jcommon/
 
 Package: libjcommon-java
 Architecture: all
-Depends: default-jre | java1-runtime | java2-runtime, ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: java-virtual-machine, libjcommon-java-doc
 Description: General Purpose library for Java
  JCommon is a free general purpose Java class library that is used in

Deleted: trunk/libjcommon-java/debian/libcommon-java-doc.doc-base
===================================================================
--- trunk/libjcommon-java/debian/libcommon-java-doc.doc-base	2011-04-25 13:33:01 UTC (rev 13591)
+++ trunk/libjcommon-java/debian/libcommon-java-doc.doc-base	2011-04-25 13:35:15 UTC (rev 13592)
@@ -1,11 +0,0 @@
-Document: libjcommon-java-doc
-Title: Programmer API for the JCommon
-Author: David Gilbert (david.gilbert at object-refinery.com)
-Abstract: This is the programmer API of JCommon is a free general purpose 
- Java class library that is used in several projects including JFreeChart
- and JFreeReport.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjcommon-java-doc/javadoc/index.html
-Files: /usr/share/doc/libjcommon-java-doc/javadoc/*.html

Copied: trunk/libjcommon-java/debian/libjcommon-java-doc.doc-base (from rev 13573, trunk/libjcommon-java/debian/libcommon-java-doc.doc-base)
===================================================================
--- trunk/libjcommon-java/debian/libjcommon-java-doc.doc-base	                        (rev 0)
+++ trunk/libjcommon-java/debian/libjcommon-java-doc.doc-base	2011-04-25 13:35:15 UTC (rev 13592)
@@ -0,0 +1,11 @@
+Document: libjcommon-java-doc
+Title: Programmer API for the JCommon
+Author: David Gilbert (david.gilbert at object-refinery.com)
+Abstract: This is the programmer API of JCommon is a free general purpose 
+ Java class library that is used in several projects including JFreeChart
+ and JFreeReport.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjcommon-java-doc/javadoc/index.html
+Files: /usr/share/doc/libjcommon-java-doc/javadoc/*.html

Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules	2011-04-25 13:33:01 UTC (rev 13591)
+++ trunk/libjcommon-java/debian/rules	2011-04-25 13:35:15 UTC (rev 13592)
@@ -10,7 +10,7 @@
 
 DEB_JARS := \
 	junit \
-	servlet-api-2.4
+	servlet-api-2.5
 
 DEB_ANT_BUILDFILE := ant/build.xml
 DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
@@ -19,6 +19,7 @@
 MAVEN_REPO := http://repository.jboss.org/maven2
 
 clean::
+	mh_clean
 	rm -rf build
 	rm -rf javadoc
 	rm -f $(LIBRARY_PACKAGE)-$(API_VERSION).jar 
@@ -26,10 +27,8 @@
 	rm -f lib/junit.jar lib/jcommon-$(API_VERSION)-junit.jar
 
 install/lib$(LIBRARY_PACKAGE)-java:: 
-	install -m 644 -D $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
-	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
-	install -m 644 -D $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
-	ln -s $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml.jar
+	dh_install -plib$(LIBRARY_PACKAGE)-java $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar /usr/share/java/
+	dh_link -plib$(LIBRARY_PACKAGE)-java /usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar /usr/share/java/$(LIBRARY_PACKAGE)-xml.jar
 	mh_installpoms -plib$(LIBRARY_PACKAGE)-java
 	mh_installjar -plib$(LIBRARY_PACKAGE)-java -l debian/poms/$(LIBRARY_PACKAGE).pom $(LIBRARY_PACKAGE)-$(API_VERSION).jar 
 

Deleted: trunk/libjcommon-java/debian/rules.orig
===================================================================
--- trunk/libjcommon-java/debian/rules.orig	2011-04-25 13:33:01 UTC (rev 13591)
+++ trunk/libjcommon-java/debian/rules.orig	2011-04-25 13:35:15 UTC (rev 13592)
@@ -1,32 +0,0 @@
-#!/usr/bin/make -f
-
-# Add here any variable or target overrides you need
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME       := /usr/lib/jvm/default-java
-LIBRARY_PACKAGE := jcommon
-API_VERSION     := $(DEB_UPSTREAM_VERSION)
-
-DEB_JARS := \
-	junit \
-	servlet-api-2.4
-
-DEB_ANT_BUILDFILE := ant/build.xml
-DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
-# FIXME: how to run this?
-DEB_ANT_CHECK_TARGET := compile-junit-tests
-
-clean::
-	rm -rf build
-	rm -rf javadoc
-	rm -f $(LIBRARY_PACKAGE)-$(API_VERSION).jar 
-	rm -f $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
-	rm -f lib/junit.jar lib/jcommon-$(API_VERSION)-junit.jar
-
-install/lib$(LIBRARY_PACKAGE)-java:: 
-	install -m 644 -D $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar
-	ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
-	install -m 644 -D $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
-	ln -s $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml.jar
-

More information about the pkg-java-commits mailing list