[pkg-java] r13521 - in trunk/libjcommon-java/debian: . patches poms
stan ioan-eugen
ieugen-guest at alioth.debian.org
Sun Apr 10 21:20:36 UTC 2011
Author: ieugen-guest
Date: 2011-04-10 21:20:32 +0000 (Sun, 10 Apr 2011)
New Revision: 13521
Added:
trunk/libjcommon-java/debian/libjcommon-java.poms
trunk/libjcommon-java/debian/patches/
trunk/libjcommon-java/debian/patches/javaDocLink
trunk/libjcommon-java/debian/patches/series
trunk/libjcommon-java/debian/poms/
trunk/libjcommon-java/debian/poms/jcommon.pom
trunk/libjcommon-java/debian/rules.orig
Modified:
trunk/libjcommon-java/debian/changelog
trunk/libjcommon-java/debian/control
trunk/libjcommon-java/debian/rules
Log:
closes bug 620046 (maven artifact). Patch for linking JavaDoc to system doc.
Modified: trunk/libjcommon-java/debian/changelog
===================================================================
--- trunk/libjcommon-java/debian/changelog 2011-04-10 20:47:09 UTC (rev 13520)
+++ trunk/libjcommon-java/debian/changelog 2011-04-10 21:20:32 UTC (rev 13521)
@@ -1,3 +1,16 @@
+libjcommon-java (1.0.16-3) unstable; urgency=low
+
+ * Team upload.
+ * 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)
+
+ -- Ioan Eugen STAN <stan.ieugen at gmail.com> Mon, 11 Apr 2011 00:15:12 +0300
+
libjcommon-java (1.0.16-2) unstable; urgency=low
UNRELEASED
Modified: trunk/libjcommon-java/debian/control
===================================================================
--- trunk/libjcommon-java/debian/control 2011-04-10 20:47:09 UTC (rev 13520)
+++ trunk/libjcommon-java/debian/control 2011-04-10 21:20:32 UTC (rev 13521)
@@ -3,7 +3,7 @@
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>
-Build-Depends: debhelper (>= 5), cdbs
+Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper
Build-Depends-Indep: default-jdk, ant, libservlet2.4-java, junit
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjcommon-java
Added: trunk/libjcommon-java/debian/libjcommon-java.poms
===================================================================
--- trunk/libjcommon-java/debian/libjcommon-java.poms (rev 0)
+++ trunk/libjcommon-java/debian/libjcommon-java.poms 2011-04-10 21:20:32 UTC (rev 13521)
@@ -0,0 +1 @@
+debian/poms/jcommon.pom
Added: trunk/libjcommon-java/debian/patches/javaDocLink
===================================================================
--- trunk/libjcommon-java/debian/patches/javaDocLink (rev 0)
+++ trunk/libjcommon-java/debian/patches/javaDocLink 2011-04-10 21:20:32 UTC (rev 13521)
@@ -0,0 +1,10 @@
+--- a/ant/build.xml
++++ b/ant/build.xml
+@@ -166,6 +166,7 @@
+ windowtitle="JCommon Class Library (version ${jcommon.version})"
+ overview="source/overview.html"
+ linksource="true">
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
+ <classpath refid="build-xml.classpath"/>
+ <packageset dir="source" defaultexcludes="yes">
+ <include name="org/jfree"/>
Added: trunk/libjcommon-java/debian/patches/series
===================================================================
--- trunk/libjcommon-java/debian/patches/series (rev 0)
+++ trunk/libjcommon-java/debian/patches/series 2011-04-10 21:20:32 UTC (rev 13521)
@@ -0,0 +1 @@
+javaDocLink
Added: trunk/libjcommon-java/debian/poms/jcommon.pom
===================================================================
--- trunk/libjcommon-java/debian/poms/jcommon.pom (rev 0)
+++ trunk/libjcommon-java/debian/poms/jcommon.pom 2011-04-10 21:20:32 UTC (rev 13521)
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ <name>jcommon</name>
+ <version>1.0.16</version>
+ <organization>
+ <name>JFree.org</name>
+ <url>http://www.jfree.org/</url>
+ </organization>
+ <inceptionYear>2001</inceptionYear>
+ <description>
+ JCommon is a free general purpose Java class library that is used in several projects at www.jfree.org,
+ including JFreeChart and JFreeReport.
+ </description>
+ <url>http://www.jfree.org/jcommon/</url>
+ <scm>
+ <connection>scm:cvs:pserver:anonymous at jfreechart.cvs.sourceforge.net:/cvsroot/jfreechart:jcommon</connection>
+ <url>http://jfreechart.cvs.sourceforge.net/jfreechart/jcommon/</url>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public Licence</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
Modified: trunk/libjcommon-java/debian/rules
===================================================================
--- trunk/libjcommon-java/debian/rules 2011-04-10 20:47:09 UTC (rev 13520)
+++ trunk/libjcommon-java/debian/rules 2011-04-10 21:20:32 UTC (rev 13521)
@@ -16,6 +16,7 @@
DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
# FIXME: how to run this?
DEB_ANT_CHECK_TARGET := compile-junit-tests
+MAVEN_REPO := http://repository.jboss.org/maven2
clean::
rm -rf build
@@ -29,4 +30,11 @@
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
+ mh_installpoms -plib$(LIBRARY_PACKAGE)-java
+ mh_installjar -plib$(LIBRARY_PACKAGE)-java -l debian/poms/$(LIBRARY_PACKAGE).pom $(LIBRARY_PACKAGE)-$(API_VERSION).jar
+get-orig-pom:
+ mkdir -p debian/poms
+ wget -U NoSuchBrowser/1.0 -O debian/poms/$(LIBRARY_PACKAGE).pom \
+ $(MAVEN_REPO)/jfree/$(LIBRARY_PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+
Added: trunk/libjcommon-java/debian/rules.orig
===================================================================
--- trunk/libjcommon-java/debian/rules.orig (rev 0)
+++ trunk/libjcommon-java/debian/rules.orig 2011-04-10 21:20:32 UTC (rev 13521)
@@ -0,0 +1,32 @@
+#!/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
+
Property changes on: trunk/libjcommon-java/debian/rules.orig
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list