From 8492e0ab3d78033d971683f588f06b01954dbcf4 Mon Sep 17 00:00:00 2001
From: Stan Ioan-Eugen <stan.ieugen@gmail.com>
Date: Sun, 10 Apr 2011 20:30:08 +0000
Subject: [PATCH] closes bug 620045, moved to quilt, first upload
---
debian/changelog | 18 ++++++++++++++++
debian/control | 2 +-
debian/patches/javaDocLink.diff | 10 +++++++++
debian/patches/series | 1 +
debian/poms/jfreechart.pom | 37 +++++++++++++++++++++++++++++++++
debian/rules | 12 +++++++++++
debian/source/format | 1 +
7 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/javaDocLink.diff
create mode 100644 debian/patches/series
create mode 100644 debian/poms/jfreechart.pom
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index cce5d87..a88f0d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@gmail.com> Sun, 10 Apr 2011 23:24:56 +0300
+
libjfreechart-java (1.0.13-3) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index 6bcc49f..a98dc7b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Christian Bayle <bayle@debian.org>, Michael Koch <konqueror@gmx.de>,
Vincent Fourmond <fourmond@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
diff --git a/debian/patches/javaDocLink.diff b/debian/patches/javaDocLink.diff
new file mode 100644
index 0000000..28b2fa6
--- /dev/null
+++ b/debian/patches/javaDocLink.diff
@@ -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/**"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..90225b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+javaDocLink.diff
diff --git a/debian/poms/jfreechart.pom b/debian/poms/jfreechart.pom
new file mode 100644
index 0000000..008b756
--- /dev/null
+++ b/debian/poms/jfreechart.pom
@@ -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@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>
diff --git a/debian/rules b/debian/rules
index 5eec630..b42d234 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ JAVA_HOME := /usr/lib/jvm/default-java
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 @@ install/libjfreechart-java::
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
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
GitLab