[pkg-java] r10702 - trunk/tuxguitar/debian

Michael Koch mkoch at alioth.debian.org
Tue Sep 29 07:41:10 UTC 2009 

Author: mkoch
Date: 2009-09-29 07:41:10 +0000 (Tue, 29 Sep 2009)
New Revision: 10702

Modified:
   trunk/tuxguitar/debian/README.Debian
   trunk/tuxguitar/debian/changelog
   trunk/tuxguitar/debian/control
   trunk/tuxguitar/debian/copyright
   trunk/tuxguitar/debian/rules
   trunk/tuxguitar/debian/tuxguitar.install
   trunk/tuxguitar/debian/tuxguitar.postinst
   trunk/tuxguitar/debian/tuxguitar.postrm
Log:
tuxguitar (1.1-1) unstable; urgency=low

  * New Upstream Release (Closes: #489859) (LP: #366476)
  * Merged patch : tuxguitar_1.0.dak-1ubuntu1.patch
  * debian/README.txt
    - suggests to install tuxguitar-jsa

 -- Philippe Coval <rzr at gna.org>  Sat, 25 Apr 2009 19:49:27 +0200

tuxguitar (1.0.dak-1ubuntu1) jaunty; urgency=low

  * Merge from debian unstable.
  * debian/control
    - Replace build dependency openjdk-6-jdk with default-jdk.
    - Remove unnecessary build dependencies gcj, java-gcj-compat-dev,
      sun-java5-jdk, icedtea-java7-jdk, libswt3.2-gtk-java.
    - Replace runtime dependency openjdk-6-jre with default-jre.
    - Remove unnecessary runtime java-gcj-compat, sun-java6-jre, sun-java5-jre,
      libswt3.2-gtk-java. Replaced java-virtual-machine with java2-runtime.
      (LP: #250137)
  * debian/rules
    - Set JAVA_HOME to the value corresponding to default-jdk.
  * misc/tuxguitar.sh
    - Ubuntu specific change for correct path of xulrunner-1.9 installation.

 -- Onkar Shinde <onkarshinde at ubuntu.com>  Tue, 13 Jan 2009 00:52:49 +0530

tuxguitar (1.0.dak-1) unstable; urgency=low

  [ Philippe Coval ]
  * debian/control ; debian/rules :
    - set to main since openjdk supports sound (Closes: #505612)	
    - uses ${shlibs:Depends} vs hardcoded libs (Closes: #506883)
    - depends on at least xulrunner for browsing doc (Closes: #493557)

  [ Ben Hutchings ]
  * Move virtual packages to end of dependency alternations
  * Move OpenJDK dependencies to start of dependency alternations
  * Replace recommendation of Sun JVM with OpenJDK
  * Fix "2<" to "2>" in postinst and postrm
  * Avoid adding current directory to LD_LIBRARY_PATH

 -- Ben Hutchings <ben at decadent.org.uk>  Wed, 10 Dec 2008 03:15:10 +0000

tuxguitar (1.0-1ubuntu1) intrepid; urgency=low

  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
    (meta-package) must alternatively Depend/Recommend/Suggest abrowser
    - update debian/control

 -- Alexander Sack <asac at ubuntu.com>  Mon, 22 Sep 2008 03:34:37 +0200



Modified: trunk/tuxguitar/debian/README.Debian
===================================================================
--- trunk/tuxguitar/debian/README.Debian	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/README.Debian	2009-09-29 07:41:10 UTC (rev 10702)
@@ -4,10 +4,16 @@
 The package has been splited into several part, the core is still tuxguitar
 but the sound plugins are optional.
 
-Sun Java 6 is recommanded JVM (because of the JSA plugin), but other ones may 
-be supported too.
+I suggest you to install tuxguitar-jsa (note that it depends OpenJDK)
+and does work on most systems (including pulseaudio). Tested settings are : 
 
+  Sound / Midi Sequencer : TuxGuitar Sequencer
+  MIDI Port : Gervill
+
+
 Note that, other JSA Sound banks can be downloaded at :
   http://java.sun.com/products/java-media/sound/soundbanks.html
 
+TuxGuitar-gervill sound plugin is not compiled yet since it depends on non free jvm
+
  -- Philippe Coval <rzr at users.sf.net>  Fri, 07 Mar 2008 21:16:53 +0100

Modified: trunk/tuxguitar/debian/changelog
===================================================================
--- trunk/tuxguitar/debian/changelog	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/changelog	2009-09-29 07:41:10 UTC (rev 10702)
@@ -1,3 +1,55 @@
+tuxguitar (1.1-1) unstable; urgency=low
+
+  * New Upstream Release (Closes: #489859) (LP: #366476)
+  * Merged patch : tuxguitar_1.0.dak-1ubuntu1.patch
+  * debian/README.txt
+    - suggests to install tuxguitar-jsa
+
+ -- Philippe Coval <rzr at gna.org>  Sat, 25 Apr 2009 19:49:27 +0200
+
+tuxguitar (1.0.dak-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable.
+  * debian/control
+    - Replace build dependency openjdk-6-jdk with default-jdk.
+    - Remove unnecessary build dependencies gcj, java-gcj-compat-dev,
+      sun-java5-jdk, icedtea-java7-jdk, libswt3.2-gtk-java.
+    - Replace runtime dependency openjdk-6-jre with default-jre.
+    - Remove unnecessary runtime java-gcj-compat, sun-java6-jre, sun-java5-jre,
+      libswt3.2-gtk-java. Replaced java-virtual-machine with java2-runtime.
+      (LP: #250137)
+  * debian/rules
+    - Set JAVA_HOME to the value corresponding to default-jdk.
+  * misc/tuxguitar.sh
+    - Ubuntu specific change for correct path of xulrunner-1.9 installation.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Tue, 13 Jan 2009 00:52:49 +0530
+
+tuxguitar (1.0.dak-1) unstable; urgency=low
+
+  [ Philippe Coval ]
+  * debian/control ; debian/rules :
+    - set to main since openjdk supports sound (Closes: #505612)	
+    - uses ${shlibs:Depends} vs hardcoded libs (Closes: #506883)
+    - depends on at least xulrunner for browsing doc (Closes: #493557)
+
+  [ Ben Hutchings ]
+  * Move virtual packages to end of dependency alternations
+  * Move OpenJDK dependencies to start of dependency alternations
+  * Replace recommendation of Sun JVM with OpenJDK
+  * Fix "2<" to "2>" in postinst and postrm
+  * Avoid adding current directory to LD_LIBRARY_PATH
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 10 Dec 2008 03:15:10 +0000
+
+tuxguitar (1.0-1ubuntu1) intrepid; urgency=low
+
+  * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
+    (meta-package) must alternatively Depend/Recommend/Suggest abrowser
+    - update debian/control
+
+ -- Alexander Sack <asac at ubuntu.com>  Mon, 22 Sep 2008 03:34:37 +0200
+
 tuxguitar (1.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #481728) also (LP: #176979, #212207)
@@ -124,4 +176,3 @@
   * Initial release (Closes: #374287) 
 
  -- Philippe Coval <rzr at users.sf.net>  Sat, 17 Jun 2006 13:19:36 +0200
-

Modified: trunk/tuxguitar/debian/control
===================================================================
--- trunk/tuxguitar/debian/control	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/control	2009-09-29 07:41:10 UTC (rev 10702)
@@ -1,19 +1,19 @@
 Source: tuxguitar
-Section: contrib/sound
+Section: sound
 Priority: optional
-Maintainer: Philippe Coval <rzr at users.sf.net>
+Maintainer: Philippe Coval <rzr at gna.org>
 Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 5.0.0), docbook-to-man , docbook-utils, ant, java-gcj-compat-dev | java-compiler | sun-java6-jdk | sun-java5-jdk | openjdk-6-jdk | icedtea-java7-jdk , gcj, java-gcj-compat-dev, libswt3.2-gtk-java, libitext-java, libasound2-dev, libfluidsynth-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5.0.0), docbook-to-man, docbook-utils, ant, default-jdk | java2-compiler, libswt-gtk-3.4-java, libitext-java, libasound2-dev, libfluidsynth-dev
+Standards-Version: 3.8.1
 Homepage: http://www.tuxguitar.com.ar
-XS-Vcs-svn: https://tuxguitar.svn.sourceforge.net/svnroot/tuxguitar/trunk
+XS-Vcs-svn: svn://tuxguitar.svn.sourceforge.net/svnroot/tuxguitar/trunk
 XS-Vcs-Browser: https://tuxguitar.svn.sourceforge.net/svnroot/tuxguitar/trunk
 
 Package: tuxguitar
 Architecture: all
-Section: contrib/sound
-Depends: java-gcj-compat | sun-java6-jre | sun-java5-jre | java-virtual-machine , libswt3.2-gtk-java, libitext-java
-Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version}), iceweasel | firefox
+Section: sound
+Depends: default-jre | java2-runtime, libitext-java, libswt-gtk-3.4-java, libswt-cairo-gtk-3.4-jni , libswt-mozilla-gtk-3.4-jni, xulrunner-1.9
+Recommends: tuxguitar-alsa (= ${source:Version}), tuxguitar-oss (= ${source:Version})
 Suggests: tuxguitar-jsa (= ${source:Version}), lilypond
 Description: Multitrack guitar tablature editor and player (gp3 to gp5)
  TuxGuitar is a multitrack Guitar tablature editor and player.
@@ -21,25 +21,25 @@
 
 Package: tuxguitar-jsa
 Architecture: all
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), sun-java6-jre | sun-java5-jre
+Section: sound
+Depends: tuxguitar (= ${source:Version}), default-jre | sun-java6-jre | sun-java5-jre
 Description: tuxguitar plugin for sound playback using Java Sound API
  Use Tuxguitar along this plugin if unsure, other sounds can be used too.
 
 Package: tuxguitar-alsa
 Architecture: any
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), libasound2, libc6
-Suggests: timidity, fluidsynth
+Section: sound
+Depends: ${shlibs:Depends}, tuxguitar (= ${source:Version})
+Suggests: timidity
 Description: tuxguitar plugin for sound playback using ALSA
  Use Tuxguitar along this plugin if your Sound Device is supported by ALSA.
  A MIDI expander is required (Hardware or Software).
 
 Package: tuxguitar-oss
 Architecture: any
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), oss-compat, libc6
-Suggests: timidity, fluidsynth
+Section: sound
+Depends: ${shlibs:Depends}, tuxguitar (= ${source:Version}), oss-compat
+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.
@@ -47,9 +47,10 @@
 
 Package: tuxguitar-fluidsynth
 Architecture: any
-Section: contrib/sound
-Depends: tuxguitar (= ${source:Version}), oss-compat, libc6, fluidsynth
+Section: sound
+Depends: ${shlibs:Depends}, tuxguitar (= ${source:Version}), fluidsynth
 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.
+

Modified: trunk/tuxguitar/debian/copyright
===================================================================
--- trunk/tuxguitar/debian/copyright	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/copyright	2009-09-29 07:41:10 UTC (rev 10702)
@@ -13,8 +13,8 @@
   the GNU Lesser General Public License.
 
   On Debian systems, the complete text of the GNU Lesser General Public
-  License can be found in the file `/usr/share/common-licenses/LGPL'.
+  License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
 
 
 The Debian packaging is (C) 2006, Philippe Coval <rzr at users.sf.net> and
-is licensed under the LGPL, see `/usr/share/common-licenses/LGPL'.
+is licensed under the LGPL-2.1, see `/usr/share/common-licenses/LGPL-2.1'.

Modified: trunk/tuxguitar/debian/rules
===================================================================
--- trunk/tuxguitar/debian/rules	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/rules	2009-09-29 07:41:10 UTC (rev 10702)
@@ -4,13 +4,7 @@
 MAINPACKAGE?=$(shell dpkg-parsechangelog | sed -n 's/Source: \(.*\)/\1/p')
 PACKAGE?=tuxguitar
 
-JAVA_HOME?=$(shell echo ` \
-    ( t=/usr/lib/jvm/java-6-openjdk && test -x "$$t/bin/javac" && echo $$t ) \
- || ( t=/usr/lib/jvm/java-gcj && test -x "$$t/bin/javac" && echo $$t ) \
- || ( t=/usr/lib/jvm/java-6-sun && test -x "$$t/bin/javac" && echo $$t ) \
- || ( t=/usr/lib/jvm/java-1.5.0-sun && test -x "$$t/bin/javac" && echo $$t ) \
- || ( t=/usr/lib/jvm/java-1.4.2-gcj-4.1-1.4.2.0 && test -x "$$t/bin/javac" && echo $$t ) \
-` )
+JAVA_HOME=/usr/lib/jvm/default-java
 
 JAVA?=${JAVA_HOME}/jre/bin/java
 JAVAC?=${JAVA_HOME}/bin/javac
@@ -62,6 +56,7 @@
 #	dh_link
 	dh_compress
 	dh_fixperms
+	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums

Modified: trunk/tuxguitar/debian/tuxguitar.install
===================================================================
--- trunk/tuxguitar/debian/tuxguitar.install	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/tuxguitar.install	2009-09-29 07:41:10 UTC (rev 10702)
@@ -1,15 +1,18 @@
-TuxGuitar/tuxguitar.jar usr/share/tuxguitar/
-TuxGuitar/share/plugins/tuxguitar-gtp.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-midi.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-ptb.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-ascii.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-musicxml.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-tef.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-compat.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-lilypond.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-pdf.jar usr/share/tuxguitar/plugins/
-TuxGuitar/share/plugins/tuxguitar-tray.jar usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar.jar  usr/share/tuxguitar/
 
+./TuxGuitar/share/plugins/tuxguitar-ascii.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-compat.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-converter.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-gtp.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-lilypond.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-midi.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-musicxml.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-pdf.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-ptb.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-tef.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-tray.jar  usr/share/tuxguitar/plugins/
+./TuxGuitar/share/plugins/tuxguitar-tuner.jar  usr/share/tuxguitar/plugins/
+
 ./misc/tuxguitar.xpm usr/share/pixmaps/
 ./misc/tuxguitar.desktop usr/share/applications/
 ./misc/tuxguitar.xml usr/share/mime/packages/

Modified: trunk/tuxguitar/debian/tuxguitar.postinst
===================================================================
--- trunk/tuxguitar/debian/tuxguitar.postinst	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/tuxguitar.postinst	2009-09-29 07:41:10 UTC (rev 10702)
@@ -5,10 +5,10 @@
     if [ -x "`which update-menus 2>/dev/null`" ]; then
 	update-menus
     fi
-    if [ -x "`which update-mime-database 2</dev/null`" ]; 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
+    if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
 	update-desktop-database -q
     fi
 fi

Modified: trunk/tuxguitar/debian/tuxguitar.postrm
===================================================================
--- trunk/tuxguitar/debian/tuxguitar.postrm	2009-09-29 07:40:00 UTC (rev 10701)
+++ trunk/tuxguitar/debian/tuxguitar.postrm	2009-09-29 07:41:10 UTC (rev 10702)
@@ -4,10 +4,10 @@
 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
+	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
+	if [ -x "`which update-desktop-database 2>/dev/null`" ]; then
 		update-desktop-database -q
 	fi
 fi

More information about the pkg-java-commits mailing list