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

[Jakub Adam]

Author: xhaakon-guest
Date: 2012-10-07 12:42:45 +0000 (Sun, 07 Oct 2012)
New Revision: 16314

Added:
   trunk/libjfreechart-java/debian/patches/fixBuildSwtPaths.diff
Modified:
   trunk/libjfreechart-java/debian/changelog
   trunk/libjfreechart-java/debian/control
   trunk/libjfreechart-java/debian/patches/series
   trunk/libjfreechart-java/debian/rules
Log:
Build libjfreechart-swt-java binary package

Modified: trunk/libjfreechart-java/debian/changelog
===================================================================
--- trunk/libjfreechart-java/debian/changelog	2012-10-06 23:50:50 UTC (rev 16313)
+++ trunk/libjfreechart-java/debian/changelog	2012-10-07 12:42:45 UTC (rev 16314)
@@ -2,6 +2,7 @@
 
   * Fix Vcs-* fields of d/control.
   * Removed Michael Koch from Uploaders (Closes: #654077).
+  * Build libjfreechart-swt-java binary package.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 07 Oct 2012 01:24:51 +0200
 

Modified: trunk/libjfreechart-java/debian/control
===================================================================
--- trunk/libjfreechart-java/debian/control	2012-10-06 23:50:50 UTC (rev 16313)
+++ trunk/libjfreechart-java/debian/control	2012-10-07 12:42:45 UTC (rev 16314)
@@ -6,7 +6,7 @@
  Kumar Appaiah <akumar at ee.iitm.ac.in>, Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper
 Build-Depends-Indep: default-jdk, ant, libjcommon-java (>= 1.0.6), libservlet2.5-java,
- javahelper (>= 0.32)
+ javahelper (>= 0.32), bnd, libswt-gtk-3-java
 Standards-Version: 3.9.2
 Homepage: http://www.jfree.org/jfreechart/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjfreechart-java
@@ -38,3 +38,11 @@
  JFreeChart is a free Java class library for generating charts.
  .
  This package provides the javadoc documentation.
+
+Package: libjfreechart-swt-java
+Architecture: all
+Depends: libjfreechart-java (= ${binary:Version}), libswt-gtk-3-java, ${misc:Depends}
+Description: Chart library for Java (SWT support)
+ JFreeChart is a free Java class library for generating charts.
+ .
+ This package allows one to use JFreeChart in SWT applications.

Added: trunk/libjfreechart-java/debian/patches/fixBuildSwtPaths.diff
===================================================================
--- trunk/libjfreechart-java/debian/patches/fixBuildSwtPaths.diff	                        (rev 0)
+++ trunk/libjfreechart-java/debian/patches/fixBuildSwtPaths.diff	2012-10-07 12:42:45 UTC (rev 16314)
@@ -0,0 +1,25 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 7 Oct 2012 13:55:21 +0200
+Subject: fixBuildSwtPaths
+
+---
+ ant/build-swt.xml |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ant/build-swt.xml b/ant/build-swt.xml
+index 5d6153d..1a329dc 100644
+--- a/ant/build-swt.xml
++++ b/ant/build-swt.xml
+@@ -8,10 +8,10 @@
+         <property name="jcommon.name" value="jcommon" />
+         <property name="jcommon.version" value="1.0.16" />
+         <property name="builddir" value="${basedir}/build" />
+-        <property name="jcommon.jar" value="${basedir}/lib/${jcommon.name}-${jcommon.version}.jar"/>
++        <property name="jcommon.jar" value="/usr/share/java/${jcommon.name}.jar"/>
+         <property name="jfreechart.jar" value="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
+     	<!-- Edit the next line to link to the swt library you want, see README file in the swt folder -->
+-        <property name="swt.jar" value="/home/dgilbert/swt-3.4-gtk-linux-x86/swt.jar"/>
++        <property name="swt.jar" value="/usr/share/java/swt.jar"/>
+         <path id="build.classpath">
+             <pathelement location="${jcommon.jar}"/>
+             <pathelement location="${jfreechart.jar}"/>

Modified: trunk/libjfreechart-java/debian/patches/series
===================================================================
--- trunk/libjfreechart-java/debian/patches/series	2012-10-06 23:50:50 UTC (rev 16313)
+++ trunk/libjfreechart-java/debian/patches/series	2012-10-07 12:42:45 UTC (rev 16314)
@@ -1 +1,2 @@
 javaDocLink.diff
+fixBuildSwtPaths.diff

Modified: trunk/libjfreechart-java/debian/rules
===================================================================
--- trunk/libjfreechart-java/debian/rules	2012-10-06 23:50:50 UTC (rev 16313)
+++ trunk/libjfreechart-java/debian/rules	2012-10-07 12:42:45 UTC (rev 16314)
@@ -16,8 +16,11 @@
 	mh_clean
 	-rm -rf build
 	-rm -rf javadoc
-	-rm -f lib/jfreechart-$(DEB_UPSTREAM_VERSION)*.jar
+	-rm -f lib/jfreechart-$(DEB_UPSTREAM_VERSION)*.jar lib/swtgraphics2d.jar
 
+common-build-indep::
+	ant -f ant/build-swt.xml
+
 install/lib$(PACKAGE)-java::
 	jh_manifest -c jcommon.jar lib/jfreechart-$(DEB_UPSTREAM_VERSION).jar \
 		lib/jfreechart-$(DEB_UPSTREAM_VERSION)-experimental.jar
@@ -26,6 +29,12 @@
 	mh_installpoms -plib$(PACKAGE)-java
 	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom lib/$(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
+	dh_install -plib$(PACKAGE)-swt-java lib/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:
 	-uscan --upstream-version 0 --rename