debian/changelog

+tuxguitar (1.2-25) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Sebastien Bacher ]
+  * debian/patches/07-git_new_libfluidsynth.patch:
+    - backport an upstream commit to build with the new libfluidsynth
+      (Closes: #946848)
+
+  [ gregor herrmann ]
+  * Declare compliance with Debian Policy 4.4.1.
+  * Remove dpkg-dev from Build-Depends.
+    dpkg-dev is build-essential, and the previously required version is
+    satisfied even in oldoldstable.
+  * Bump debhelper-compat to 12.
+  * debian/watch: use uscan version 4.
+  * Use secure URI in debian/watch.
+  * Set bindnow linker flag in debian/rules.
+  * Use HTTPS for two URLs in debian/copyright.
+  * Update years of packaging copyright.
+  * Don't install anything into /usr/share/tuxguitar/doc.
+  * Fix day-of-week for changelog entries 1.1-1ubuntu1, 0.9.99~1.0rc3-1.
+
+ -- gregor herrmann <gregoa@debian.org>  Mon, 16 Dec 2019 20:27:02 +0100
+
 tuxguitar (1.2-24) unstable; urgency=medium
 
   * Team upload.
@@ -274,7 +299,7 @@ tuxguitar (1.1-1ubuntu1) karmic; urgency=low
   * Changed maintainer to MOTU developers
   * Depend on xulrunner 1.9.1 instead of 1.9 (LP: #424727)
 
- -- Teemu Heinämäki <teemu.heinamaki@gmail.com>  Wed, 5 Sep 2009 11:39:51 +0300
+ -- Teemu Heinämäki <teemu.heinamaki@gmail.com>  Sat, 05 Sep 2009 11:39:51 +0300
 
 tuxguitar (1.1-1) unstable; urgency=low
 
@@ -347,7 +372,7 @@ tuxguitar (0.9.99~1.0rc3-1) unstable; urgency=low
   * Updated startup script from upstream
   * debian/control now build with gcj by default not openjdk (Closes: #474410)
 
- -- Philippe Coval <rzr@users.sf.net>  Sat, 01 May 2008 12:16:00 +0200
+ -- Philippe Coval <rzr@users.sf.net>  Thu, 01 May 2008 12:16:00 +0200
 
 tuxguitar (0.9.99~1.0rc2-2) unstable; urgency=low
 

debian/compat

-11

debian/control

 Source: tuxguitar
-Section: sound
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Philippe Coval <rzr@gna.org>,
            tony mancill <tmancill@debian.org>
+Section: sound
+Priority: optional
 Build-Depends: ant,
-               debhelper (>= 11),
+               debhelper-compat (= 12),
                default-jdk,
                docbook-to-man,
                docbook-utils,
-               dpkg-dev (>= 1.17.0~),
                libasound2-dev | liboss4-salsa-dev,
                libfluidsynth-dev,
                libitext-java,
                libjack-jackd2-dev | libjack-dev,
                libswt-gtk-4-java
-Standards-Version: 4.4.0
-Vcs-Git: https://salsa.debian.org/java-team/tuxguitar.git
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/java-team/tuxguitar
+Vcs-Git: https://salsa.debian.org/java-team/tuxguitar.git
 Homepage: http://www.tuxguitar.com.ar
 
 Package: tuxguitar

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: TuxGuitar
-Source: http://tuxguitar.herac.com.ar/
+Source: https://tuxguitar.herac.com.ar/
 
 Files: *
 Copyright: 2005-2009 Julian Casadesus <akdmia@users.sourceforge.net>
@@ -9,7 +9,7 @@ License: LGPL-2.1+
 Files: debian/*
 Copyright: 2006-2012 Philippe Coval <rzr@users.sf.net>
            2010-2014 tony mancill <tmancill@debian.org>
-           2011-2015 gregor herrmann <gregoa@debian.org>
+           2011-2019 gregor herrmann <gregoa@debian.org>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/patches/07-git_new_libfluidsynth.patch

+Description: build with the new libfluidsynth
+Origin: upstream, r1800
+Bug-Debian: https://bugs.debian.org/946848
+Last-Update: 2019-12-16
+
+--- a/TuxGuitar-fluidsynth/jni/GNUmakefile
++++ b/TuxGuitar-fluidsynth/jni/GNUmakefile
+@@ -1,4 +1,4 @@
+-CFLAGS?=-I$(shell gcj -print-file-name=include/)
++CFLAGS?=-I../../build-scripts/native-modules/common-include
+ CFLAGS+=-fPIC
+ LDFLAGS?=
+ LDLIBS?=-lfluidsynth
+--- a/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
++++ b/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
+@@ -4,6 +4,9 @@
+ #include <fluidsynth.h>
+ #include "org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h"
+ 
++#define FLUID_VERSION_GEN(major, minor, micro) ((major << 16) | (minor << 8) | (micro))
++#define FLUID_VERSION FLUID_VERSION_GEN(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO)
++
+ typedef struct{
+ 	fluid_settings_t* settings;
+ 	fluid_synth_t* synth;
+@@ -217,7 +220,7 @@
+ 			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum(handle->settings,(char *)jkey, &value );
++			fluid_settings_getnum(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
+@@ -236,7 +239,7 @@
+ 			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint(handle->settings,(char *)jkey, &value );
++			fluid_settings_getint(handle->settings, (char *)jkey, &value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+@@ -256,7 +259,8 @@
+ 			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getstr(handle->settings,(char *)jkey, &value );
++			fluid_settings_dupstr(handle->settings, (char *)jkey, &value);
++
+ 			jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -273,11 +277,16 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(D)V");
+ 		if (mid != 0){
++			double value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			double value = fluid_settings_getnum_default(handle->settings,(char *)jkey);
+-			
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getnum_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getnum_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+-			(*env)->CallVoidMethod( env, ref , mid , (jdouble)value );
++			(*env)->CallVoidMethod( env, ref , mid , (jdouble) value );
+ 		}
+ 	}
+ }
+@@ -290,9 +299,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(I)V");
+ 		if (mid != 0){
++			int value = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			int value = fluid_settings_getint_default(handle->settings,(char *)jkey);
+ 			
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getint_default(handle->settings, (char *)jkey, &value);
++#else
++			value = fluid_settings_getint_default(handle->settings, (char *)jkey);
++#endif
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, ref , mid , (jint)value );
+ 		}
+@@ -307,8 +321,14 @@
+ 		jclass cl = (*env)->GetObjectClass(env, ref);
+ 		jmethodID mid = (*env)->GetMethodID(env, cl, "setValue", "(Ljava/lang/String;)V");
+ 		if (mid != 0){
++			char *value = NULL;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+-			char *value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++
++#if FLUID_VERSION >= FLUID_VERSION_GEN(2,0,0)
++			fluid_settings_getstr_default(handle->settings,(char *)jkey, &value);
++#else
++			value = fluid_settings_getstr_default(handle->settings,(char *)jkey);
++#endif
+ 			jstring jvalue = (*env)->NewStringUTF(env, value);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+@@ -331,7 +351,7 @@
+ 			double maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getnum_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jdouble)minimum );
+@@ -354,7 +374,7 @@
+ 			int maximum = 0;
+ 			const jbyte *jkey = (*env)->GetStringUTFChars(env, key, NULL);
+ 			
+-			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum );
++			fluid_settings_getint_range(handle->settings,(char *)jkey, &minimum , &maximum);
+ 			
+ 			(*env)->ReleaseStringUTFChars(env, key, jkey);
+ 			(*env)->CallVoidMethod( env, minimumRef , midMin , (jint)minimum );

debian/patches/series

@@ -4,3 +4,4 @@
 04-hardening-cppflags.patch
 05-drop_xulrunner.patch
 06-swt4.patch
+07-git_new_libfluidsynth.patch

debian/rules

@@ -6,6 +6,7 @@ export JAVA?=${JAVA_HOME}/bin/java
 # build flags for hardening
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
 %:
 	dh $@ --no-parallel
@@ -17,4 +18,4 @@ override_dh_auto_build:
 override_dh_auto_install:
 	${MAKE} install       DESTDIR=${CURDIR}/debian/tuxguitar
 	${MAKE} install-linux DESTDIR=${CURDIR}/debian/tmp/tuxguitar
-	rm -vf ${CURDIR}/debian/tuxguitar/usr/share/tuxguitar/doc/LICENSE
+	$(RM) -rv ${CURDIR}/debian/tuxguitar/usr/share/tuxguitar/doc

debian/watch

-version=3
-http://sf.net/tuxguitar/tuxguitar-(.*)-src.tar.gz
+version=4
+https://sf.net/tuxguitar/tuxguitar-@ANY_VERSION@-src@ARCHIVE_EXT@