[libjfreechart-java] 04/05: Transition to libswt-gtk-4-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjfreechart-java.

commit 9ee8811480c5654dd0649f7b2cf8bf96c0981c92
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 4 14:17:43 2016 +0200

    Transition to libswt-gtk-4-java
---
 debian/changelog                     | 1 +
 debian/control                       | 4 ++--
 debian/patches/fixBuildSwtPaths.diff | 2 +-
 debian/rules                         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 62dc779..fec0d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libjfreechart-java (1.0.13-8.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
   * No longer build the experimental jar (never used)
+  * Transition to libswt-gtk-4-java
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
   * Use XZ compression for the upstream tarball
diff --git a/debian/control b/debian/control
index 06979e7..fec812f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends-Indep: ant,
                      javahelper (>= 0.32),
                      libjcommon-java (>= 1.0.6),
                      libservlet3.1-java,
-                     libswt-gtk-3-java
+                     libswt-gtk-4-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjfreechart-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjfreechart-java.git
@@ -49,7 +49,7 @@ Description: Chart library for Java - documentation
 Package: libjfreechart-swt-java
 Architecture: all
 Depends: libjfreechart-java (= ${binary:Version}),
-         libswt-gtk-3-java,
+         libswt-gtk-4-java,
          ${misc:Depends}
 Description: Chart library for Java (SWT support)
  JFreeChart is a free Java class library for generating charts.
diff --git a/debian/patches/fixBuildSwtPaths.diff b/debian/patches/fixBuildSwtPaths.diff
index f8e689a..76bde4a 100644
--- a/debian/patches/fixBuildSwtPaths.diff
+++ b/debian/patches/fixBuildSwtPaths.diff
@@ -19,7 +19,7 @@ index 5d6153d..1a329dc 100644
          <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"/>
++        <property name="swt.jar" value="/usr/share/java/swt4.jar"/>
          <path id="build.classpath">
              <pathelement location="${jcommon.jar}"/>
              <pathelement location="${jfreechart.jar}"/>
diff --git a/debian/rules b/debian/rules
index 30777dd..69f1178 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ install/lib$(PACKAGE)-java::
 	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" \
+	jh_manifest -c "jcommon.jar jfreechart-$(DEB_UPSTREAM_VERSION).jar swt4.jar" \
 		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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjfreechart-java.git