This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tuxguitar.
commit 619551ac53e595a8e65329160474c5ae0793a958 Author: Emmanuel Bourg <ebo...@apache.org> Date: Thu Oct 19 22:42:52 2017 +0200 Transition to SWT 4 --- debian/changelog | 1 + debian/control | 8 ++++---- debian/patches/01-tuxguitar-rzr.patch | 9 ++------- debian/patches/06-swt4.patch | 11 +++++++++++ debian/patches/series | 1 + 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 97c4340..b642486 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ tuxguitar (1.2-23) UNRELEASED; urgency=medium * Team upload. + * Transition to SWT 4 * Simplified the patches -- Emmanuel Bourg <ebo...@apache.org> Thu, 19 Oct 2017 22:02:45 +0200 diff --git a/debian/control b/debian/control index 07c1254..28e63bf 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: ant, libfluidsynth-dev, libitext-java, libjack-jackd2-dev | libjack-dev, - libswt-gtk-3-java + libswt-gtk-4-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/tuxguitar.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tuxguitar.git @@ -26,9 +26,9 @@ Depends: default-jre | java2-runtime, file, libitext-java, libjs-jquery, - libswt-cairo-gtk-3-jni, - libswt-gtk-3-java, - libswt-webkit-gtk-3-jni, + libswt-cairo-gtk-4-jni, + libswt-gtk-4-java, + libswt-webkit-gtk-4-jni, ${misc:Depends} Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version}) diff --git a/debian/patches/01-tuxguitar-rzr.patch b/debian/patches/01-tuxguitar-rzr.patch index 56b20a5..79b0e85 100644 --- a/debian/patches/01-tuxguitar-rzr.patch +++ b/debian/patches/01-tuxguitar-rzr.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/Makefile -@@ -0,0 +1,263 @@ +@@ -0,0 +1,258 @@ +#! /usr/bin/make -f +# -*- makefile -*- +#ident "$Id: Makefile,v 1.19 2008/04/17 20:06:22 rzr Exp $" @@ -18,12 +18,7 @@ +ITEXT_JAR?=/usr/share/java/itext.jar + +SWT_JAR?=$(shell echo ` \ -+ ( t=/usr/share/java/swt.jar && test -r "$$t" && echo $$t ) \ -+ || ( t=/usr/lib/java/swt.jar && test -r "$$t" && echo $$t ) \ -+ || ( t=/usr/lib/java/swt-gtk-3.6.2.jar && test -r "$$t" && echo $$t ) \ -+ || ( t=/usr/lib/java/swt-gtk-3.5.1.jar && test -r "$$t" && echo $$t ) \ -+ || ( t=/usr/lib/java/swt-gtk-3.5.jar && test -r "$$t" && echo $$t ) \ -+ || ( t=/etc/alternatives/swt.jar && test -r "$$t" && echo $$t ) \ ++ ( t=/usr/share/java/swt4.jar && test -r "$$t" && echo $$t ) \ +` ) +SWT_PATH?=${SWT_JAR} + diff --git a/debian/patches/06-swt4.patch b/debian/patches/06-swt4.patch new file mode 100644 index 0000000..6cb7cd5 --- /dev/null +++ b/debian/patches/06-swt4.patch @@ -0,0 +1,11 @@ +--- a/misc/tuxguitar.sh ++++ b/misc/tuxguitar.sh +@@ -27,6 +27,8 @@ + [ -r "$t" ] && f="$t" + t="/usr/lib/java/swt3.2-gtk.jar" + [ -r "$t" ] && f="$t" ++ t="/usr/share/java/swt4.jar" ++ [ -r "$t" ] && f="$t" + file -L "$f" >/dev/null 2>&1 || f="" + echo "$f" + } diff --git a/debian/patches/series b/debian/patches/series index ea47148..e3dee38 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 03-CVE-2010-3385.patch 04-hardening-cppflags.patch 05-drop_xulrunner.patch +06-swt4.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tuxguitar.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits