[pkg-java] r13518 - in trunk/libjfreechart-java/debian: . patches poms source

Sun Apr 10 20:30:19 UTC 2011

Author: ieugen-guest
Date: 2011-04-10 20:30:08 +0000 (Sun, 10 Apr 2011)
New Revision: 13518

Added:
   trunk/libjfreechart-java/debian/patches/
   trunk/libjfreechart-java/debian/patches/javaDocLink.diff
   trunk/libjfreechart-java/debian/patches/series
   trunk/libjfreechart-java/debian/poms/
   trunk/libjfreechart-java/debian/poms/jfreechart.pom
   trunk/libjfreechart-java/debian/source/
   trunk/libjfreechart-java/debian/source/format
Modified:
   trunk/libjfreechart-java/debian/changelog
   trunk/libjfreechart-java/debian/control
   trunk/libjfreechart-java/debian/rules
Log:
closes bug 620045, moved to quilt, first upload


Modified: trunk/libjfreechart-java/debian/changelog
===================================================================

--- trunk/libjfreechart-java/debian/changelog	2011-04-10 19:19:48 UTC (rev 13517)
+++ trunk/libjfreechart-java/debian/changelog	2011-04-10 20:30:08 UTC (rev 13518)
@@ -1,3 +1,21 @@
+libjfreechart-java (1.0.13-4) unstable; urgency=low
+
+  * Team upload.
+  * Fix "Package does not install maven artifacts" - applyed the patch sent
+    (Closes: #620045):
+    - debian/control: Depends on maven-repo-helper
+    - debian/poms/jfreechart.pom: added file
+    - debian/rules: 
+       + added PACKAGE and MAVEN_REPO
+       + added binary-post-install rule to install poms and jars
+       + added get-orig-pom rule to download pom files from debian/poms
+  * debian/source/format: added file (switch to quilt)
+  * debian/patches/series: added file
+  * debian/patches/javaDocLink.diff: patch for ant/build.xml to link package
+  javadoc to system javadoc
+
+ -- Ioan Eugen STAN <stan.ieugen at gmail.com>  Sun, 10 Apr 2011 23:24:56 +0300
+
 libjfreechart-java (1.0.13-3) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control	2011-04-10 19:19:48 UTC (rev 13517)
+++ trunk/libjfreechart-java/debian/control	2011-04-10 20:30:08 UTC (rev 13518)
@@ -7,7 +7,7 @@
  Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: default-jdk, ant, libjcommon-java (>= 1.0.6), libservlet2.5-java,
- javahelper (>= 0.32)
+ javahelper (>= 0.32), maven-repo-helper
 Standards-Version: 3.8.3
 Homepage: http://www.jfree.org/jfreechart/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjfreechart-java-java

Added: trunk/libjfreechart-java/debian/patches/javaDocLink.diff
===================================================================
--- trunk/libjfreechart-java/debian/patches/javaDocLink.diff	                        (rev 0)
+++ trunk/libjfreechart-java/debian/patches/javaDocLink.diff	2011-04-10 20:30:08 UTC (rev 13518)
@@ -0,0 +1,10 @@
+--- a/ant/build.xml
++++ b/ant/build.xml
+@@ -149,6 +149,7 @@
+                  use="yes"
+                  linksource="yes"
+                  splitindex="yes">
++	    <link href="/usr/share/doc/default-jdk-doc/api/" />
+             <classpath refid="build.classpath" />
+             <packageset dir="${basedir}/source" defaultexcludes="yes">
+                 <include name="org/jfree/**"/>

Added: trunk/libjfreechart-java/debian/patches/series
===================================================================
--- trunk/libjfreechart-java/debian/patches/series	                        (rev 0)
+++ trunk/libjfreechart-java/debian/patches/series	2011-04-10 20:30:08 UTC (rev 13518)
@@ -0,0 +1 @@
+javaDocLink.diff

Added: trunk/libjfreechart-java/debian/poms/jfreechart.pom
===================================================================
--- trunk/libjfreechart-java/debian/poms/jfreechart.pom	                        (rev 0)
+++ trunk/libjfreechart-java/debian/poms/jfreechart.pom	2011-04-10 20:30:08 UTC (rev 13518)
@@ -0,0 +1,37 @@
+<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>jfreechart</artifactId>
+    <name>jfreechart</name>
+    <version>1.0.13</version>
+    <url>http://www.jfree.org/jfreechart/</url>
+    <organization>
+        <name>JFree.org</name>
+        <url>http://www.jfree.org/</url>
+    </organization>
+    <inceptionYear>2001</inceptionYear>
+    <description>
+        JFreeChart is a class library, written in Java, for generating charts. Utilising the Java2D APIs, it currently
+        supports bar charts, pie charts, line charts, XY-plots and time series plots.
+    </description>
+    <scm>
+        <connection>scm:cvs:pserver:anonymous at jfreechart.cvs.sourceforge.net:/cvsroot/jfreechart:jfreechart</connection>
+        <url>http://jfreechart.cvs.sourceforge.net/jfreechart/jfreechart/</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>
+
+    <dependencies>
+        <dependency>
+            <groupId>jfree</groupId>
+            <artifactId>jcommon</artifactId>
+            <version>1.0.16</version>
+        </dependency>
+    </dependencies>
+</project>

Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules	2011-04-10 19:19:48 UTC (rev 13517)
+++ trunk/libjfreechart-java/debian/rules	2011-04-10 20:30:08 UTC (rev 13518)
@@ -9,6 +9,8 @@
 DEB_JARS := jcommon servlet-api-2.5
 DEB_ANT_BUILDFILE := ant/build.xml
 DEB_ANT_BUILD_TARGET := compile compile-experimental javadoc
+PACKAGE := jfreechart
+MAVEN_REPO := http://repo1.maven.org/maven2
 
 clean::
 	-rm -rf build
@@ -23,5 +25,15 @@
 	dh_link usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jfreechart.jar
 	dh_link usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar usr/share/java/jfreechart-experimental.jar
 
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom lib/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
+
 get-orig-source:
 	-uscan --upstream-version 0 --rename
+
+get-orig-pom:
+	mkdir -p debian/poms
+	wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+        $(MAVEN_REPO)/jfree/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+

Added: trunk/libjfreechart-java/debian/source/format
===================================================================
--- trunk/libjfreechart-java/debian/source/format	                        (rev 0)
+++ trunk/libjfreechart-java/debian/source/format	2011-04-10 20:30:08 UTC (rev 13518)
@@ -0,0 +1 @@
+3.0 (quilt)


