[Git][java-team/tuxguitar][master] 8 commits: Build with the DH sequencer

Emmanuel Bourg gitlab at salsa.debian.org
Wed Sep 11 22:37:10 BST 2019



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / tuxguitar


Commits:
f37f6995 by Emmanuel Bourg at 2019-09-11T20:49:50Z
Build with the DH sequencer

- - - - -
7c3a21d7 by Emmanuel Bourg at 2019-09-11T20:50:01Z
Standards-Version updated to 4.4.0

- - - - -
56f6b81b by Emmanuel Bourg at 2019-09-11T21:03:10Z
Switch to debhelper level 11

- - - - -
97ddd78d by Emmanuel Bourg at 2019-09-11T21:03:16Z
Use salsa.debian.org Vcs-* URLs

- - - - -
9fafe252 by Emmanuel Bourg at 2019-09-11T21:03:16Z
Replaced the priority extra with optional

- - - - -
185cc0d1 by Emmanuel Bourg at 2019-09-11T21:03:16Z
Removed the Debian menu file

- - - - -
3d424627 by Emmanuel Bourg at 2019-09-11T21:27:26Z
No longer call update-{mime,desktop}-database in the maintainer scripts (Closes: #860845)

- - - - -
e279b34c by Emmanuel Bourg at 2019-09-11T21:33:34Z
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- + debian/clean
- debian/compat
- debian/control
- debian/rules
- − debian/tuxguitar.menu
- − debian/tuxguitar.postinst
- − debian/tuxguitar.postrm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+tuxguitar (1.2-24) unstable; urgency=medium
+
+  * Team upload.
+  * Build with the DH sequencer
+  * No longer call update-{mime,desktop}-database in the maintainer scripts
+    (Closes: #860845)
+  * Standards-Version updated to 4.4.0
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+  * Replaced the priority extra with optional
+  * Removed the Debian menu file
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 Sep 2019 23:33:26 +0200
+
 tuxguitar (1.2-23) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -0,0 +1,7 @@
+debian/tuxguitar.1
+TuxGuitar/build/
+TuxGuitar/share/plugins/
+TuxGuitar/tuxguitar/
+TuxGuitar*/*.jar
+*/jni/*.o
+*/jni/*.so


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-9
+11


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Philippe Coval <rzr at gna.org>,
            tony mancill <tmancill at debian.org>
 Build-Depends: ant,
-               debhelper (>= 9),
+               debhelper (>= 11),
                default-jdk,
                docbook-to-man,
                docbook-utils,
@@ -15,9 +15,9 @@ Build-Depends: ant,
                libitext-java,
                libjack-jackd2-dev | libjack-dev,
                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
+Standards-Version: 4.4.0
+Vcs-Git: https://salsa.debian.org/java-team/tuxguitar.git
+Vcs-Browser: https://salsa.debian.org/java-team/tuxguitar
 Homepage: http://www.tuxguitar.com.ar
 
 Package: tuxguitar
@@ -63,7 +63,6 @@ Depends: oss-compat,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: timidity
-Priority: extra
 Description: tuxguitar plugin for sound playback using OSS
  Use Tuxguitar along this plugin if your Sound Device is supported by OSS.
  A MIDI expander is required (Hardware or Software).
@@ -74,7 +73,6 @@ Depends: fluidsynth,
          tuxguitar (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Priority: extra
 Description: tuxguitar plugin for sound playback using fluidsynth
  Use Tuxguitar along this plugin if your audio system is configured for
  fluidsynth as MIDI expander.
@@ -85,7 +83,6 @@ Depends: tuxguitar (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: qjackctl
-Priority: extra
 Description: tuxguitar plugin for sound playback using JACKD
  Use Tuxguitar along this plugin if your Sound Device is supported by JACK.
  A MIDI expander is required (Hardware or Software).


=====================================
debian/rules
=====================================
@@ -1,78 +1,20 @@
 #! /usr/bin/make -f
-# -*- makefile -*-
-default: build
 
-#export DH_VERBOSE=1
-MAINPACKAGE?=$(shell dpkg-parsechangelog -S Source)
-PACKAGE?=tuxguitar
-JAVA_HOME=/usr/lib/jvm/default-java
-JAVA?=${JAVA_HOME}/jre/bin/java
-JAVAC?=${JAVA_HOME}/bin/javac
-export JAVAC JAVA JAVA_HOME
-DEB_DESTDIR?=${CURDIR}/debian/${MAINPACKAGE}
-DEB_DESTDIR_TMP?=${CURDIR}/debian/tmp/${MAINPACKAGE}
+export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA?=${JAVA_HOME}/bin/java
 
 # build flags for hardening
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-	dh_testdir
-#	${MAKE} clean ${MAKE}
-	docbook-to-man misc/${PACKAGE}.sgml > debian/${PACKAGE}.1
-	touch $@
+%:
+	dh $@ --no-parallel
 
-distclean: clean
+override_dh_auto_build:
+	dh_auto_build -- build
+	docbook-to-man misc/tuxguitar.sgml > debian/tuxguitar.1
 
-clean:
-	dh_testdir
-	dh_testroot
-	${MAKE} -k clean distclean $@ || echo "Ignored"
-	${RM} -f build-stamp configure-stamp
-	${RM} -f debian/${PACKAGE}.1 ./TuxGuitar/tuxguitar
-	${RM} -rf TuxGuitar/build
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	${MAKE} $@ DESTDIR=${DEB_DESTDIR}
-	${MAKE} $@-linux DESTDIR=${DEB_DESTDIR_TMP}
-	install -d ${DEB_DESTDIR}/usr/bin/
-	rm -vf ${DEB_DESTDIR}/usr/share/tuxguitar/doc/LICENSE
-	dh_install
-
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs --exclude=LICENSE
-	dh_installexamples
-	dh_install
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
-
-#eof "$Id: debian/rules $"
+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


=====================================
debian/tuxguitar.menu deleted
=====================================
@@ -1,2 +0,0 @@
-?package(tuxguitar):needs="X11" section="Applications/Sound"\
-  title="tuxguitar" command="/usr/bin/tuxguitar"


=====================================
debian/tuxguitar.postinst deleted
=====================================
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "configure" ]; then
-    if [ -x "`which update-menus 2>/dev/null`" ]; then
-	update-menus
-    fi
-    if [ -x "`which update-mime-database 2>/dev/null`" ]; then
-	update-mime-database /usr/share/mime
-    fi
-    if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
-	update-desktop-database -q
-    fi
-fi
-
-#DEBHELPER#


=====================================
debian/tuxguitar.postrm deleted
=====================================
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-
-if [ "$1" = "remove" ]; then
-	if [ -x "`which update-mime-database 2>/dev/null`" ]; then
-		update-mime-database /usr/share/mime
-	fi
-	if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
-		update-desktop-database -q
-	fi
-fi
-
-#DEBHELPER#



View it on GitLab: https://salsa.debian.org/java-team/tuxguitar/compare/7f042e93ba97762737f585cef6adb8bc27e3356f...e279b34c686b85720ee368825c82ff2c983f2fd5

-- 
View it on GitLab: https://salsa.debian.org/java-team/tuxguitar/compare/7f042e93ba97762737f585cef6adb8bc27e3356f...e279b34c686b85720ee368825c82ff2c983f2fd5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190911/392f073d/attachment.html>


More information about the pkg-java-commits mailing list