[pkg-java] r18912 - in trunk/libjfreechart-java/debian: . patches

Tue Nov 17 19:16:57 UTC 2015

Author: apo-guest
Date: 2015-11-17 19:16:57 +0000 (Tue, 17 Nov 2015)
New Revision: 18912

Added:
   trunk/libjfreechart-java/debian/patches/unmappable-character.patch
Modified:
   trunk/libjfreechart-java/debian/changelog
   trunk/libjfreechart-java/debian/control
   trunk/libjfreechart-java/debian/patches/series
   trunk/libjfreechart-java/debian/rules
Log:
Release 1.0.13-8



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

--- trunk/libjfreechart-java/debian/changelog	2015-11-17 17:42:52 UTC (rev 18911)
+++ trunk/libjfreechart-java/debian/changelog	2015-11-17 19:16:57 UTC (rev 18912)
@@ -1,3 +1,16 @@
+libjfreechart-java (1.0.13-8) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to bnd 2.1.0. Fix obsolete bnd parameter syntax in
+    debian/rules.
+  * Vcs-Browser: Use https.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Add unmappable-character.patch. The JavaDocs were completely missing from
+    the package. This patch resolves the javadoc errors. Changing the
+    file.encoding did not work.
+
+ -- Markus Koschany <apo at debian.org>  Tue, 17 Nov 2015 19:00:20 +0100
+
 libjfreechart-java (1.0.13-7) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control	2015-11-17 17:42:52 UTC (rev 18911)
+++ trunk/libjfreechart-java/debian/control	2015-11-17 19:16:57 UTC (rev 18912)
@@ -8,15 +8,15 @@
            Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: cdbs, debhelper (>= 9), maven-repo-helper
 Build-Depends-Indep: ant,
-                     bnd,
+                     bnd (>= 2.1.0),
                      default-jdk,
                      javahelper (>= 0.32),
                      libjcommon-java (>= 1.0.6),
                      libservlet3.1-java,
                      libswt-gtk-3-java
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjfreechart-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjfreechart-java
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libjfreechart-java
 Homepage: http://www.jfree.org/jfreechart/
 
 Package: libjfreechart-java

Modified: trunk/libjfreechart-java/debian/patches/series
===================================================================
--- trunk/libjfreechart-java/debian/patches/series	2015-11-17 17:42:52 UTC (rev 18911)
+++ trunk/libjfreechart-java/debian/patches/series	2015-11-17 19:16:57 UTC (rev 18912)
@@ -1,2 +1,3 @@
 javaDocLink.diff
 fixBuildSwtPaths.diff
+unmappable-character.patch

Added: trunk/libjfreechart-java/debian/patches/unmappable-character.patch
===================================================================
--- trunk/libjfreechart-java/debian/patches/unmappable-character.patch	                        (rev 0)
+++ trunk/libjfreechart-java/debian/patches/unmappable-character.patch	2015-11-17 19:16:57 UTC (rev 18912)
@@ -0,0 +1,39 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 17 Nov 2015 20:02:56 +0100
+Subject: unmappable character
+
+Fixes several javadoc errors and ensures that the documentation is actually
+created and installed into the -doc package.
+
+Forwarded: no
+---
+ source/org/jfree/chart/axis/Axis.java                    | 2 +-
+ swt/org/jfree/experimental/chart/swt/ChartComposite.java | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/org/jfree/chart/axis/Axis.java b/source/org/jfree/chart/axis/Axis.java
+index 3a9c1b8..10473f7 100644
+--- a/source/org/jfree/chart/axis/Axis.java
++++ b/source/org/jfree/chart/axis/Axis.java
+@@ -1072,7 +1072,7 @@ public abstract class Axis implements Cloneable, Serializable {
+             PlotRenderingInfo plotState){
+ 
+ 		if (plotState == null || plotState.getOwner() == null) {
+-            return;  // no need to create entity if we can´t save it anyways...
++            return;  // no need to create entity if we can't save it anyways...
+         }
+ 		Rectangle2D hotspot = null;
+ 		if (edge.equals(RectangleEdge.TOP)){
+diff --git a/swt/org/jfree/experimental/chart/swt/ChartComposite.java b/swt/org/jfree/experimental/chart/swt/ChartComposite.java
+index 329e151..240a141 100644
+--- a/swt/org/jfree/experimental/chart/swt/ChartComposite.java
++++ b/swt/org/jfree/experimental/chart/swt/ChartComposite.java
+@@ -52,7 +52,7 @@
+  * 19-May-2007 : Corrected bug with scaling when the drawing region is larger
+  *               than maximum draw width/height (HP);
+  * 23-May-2007 : Added some dispose call to free SWT resources, patch sent by
+- *               Cédric Chabanois (CC);
++ *               Cedric Chabanois (CC);
+  * 06-Jun-2007 : Fixed minor issues with tooltips. bug reported and fix
+  *               proposed by Christoph Beck, bug 1726404 (HP);
+  * 22-Oct-2007 : Added addChartMouseListener and removeChartMouseListener

Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules	2015-11-17 17:42:52 UTC (rev 18911)
+++ trunk/libjfreechart-java/debian/rules	2015-11-17 19:16:57 UTC (rev 18912)
@@ -17,6 +17,7 @@
 	-rm -rf build
 	-rm -rf javadoc
 	-rm -f lib/jfreechart-$(DEB_UPSTREAM_VERSION)*.jar lib/swtgraphics2d.jar
+	-rm -f debian/*.jar
 
 common-build-indep::
 	ant -f ant/build-swt.xml
@@ -24,21 +25,21 @@
 install/lib$(PACKAGE)-java::
 	jh_manifest -c jcommon.jar lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
 		lib/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar
-	bnd wrap -properties debian/jfreechart.bnd -output lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
+	bnd wrap --properties debian/jfreechart.bnd --output debian/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
 		lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar
-	bnd wrap -properties debian/jfreechart-experimental.bnd -output lib/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar \
+	bnd wrap --properties debian/jfreechart-experimental.bnd --output debian/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar \
 		lib/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar
-	dh_install lib/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar /usr/share/java
+	dh_install debian/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar /usr/share/java
 	dh_link /usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar /usr/share/java/jfreechart-experimental.jar
 	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom lib/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
+	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom debian/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
 
 install/lib$(PACKAGE)-swt-java::
 	jh_manifest -c "jcommon.jar jfreechart-$(DEB_UPSTREAM_VERSION).jar swt.jar" \
 		lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
-	bnd wrap -properties debian/jfreechart-swt.bnd -output lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar \
+	bnd wrap --properties debian/jfreechart-swt.bnd --output debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar \
 		lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar
-	dh_install -plib$(PACKAGE)-swt-java lib/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java
+	dh_install -plib$(PACKAGE)-swt-java debian/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java
 	dh_link -plib$(PACKAGE)-swt-java /usr/share/java/jfreechart-$(DEB_UPSTREAM_VERSION)-swt.jar /usr/share/java/jfreechart-swt.jar
 
 get-orig-source:


