Author: varun-guest
Date: 2007-10-22 06:41:38 +0000 (Mon, 22 Oct 2007)
New Revision: 4437
Added:
trunk/libtritonus-java/
trunk/libtritonus-java/debian/
trunk/libtritonus-java/debian/README.Debian
trunk/libtritonus-java/debian/changelog
trunk/libtritonus-java/debian/compat
trunk/libtritonus-java/debian/control
trunk/libtritonus-java/debian/copyright
trunk/libtritonus-java/debian/docs
trunk/libtritonus-java/debian/javah
trunk/libtritonus-java/debian/libtritonus-bin.install
trunk/libtritonus-java/debian/libtritonus-java.install
trunk/libtritonus-java/debian/orig-tar.sh
trunk/libtritonus-java/debian/patches/
trunk/libtritonus-java/debian/patches/Makefile.diff
trunk/libtritonus-java/debian/patches/alsa.diff
trunk/libtritonus-java/debian/patches/autoconf.diff
trunk/libtritonus-java/debian/patches/build.diff
trunk/libtritonus-java/debian/patches/configure.diff
trunk/libtritonus-java/debian/patches/cooked_ioctl.diff
trunk/libtritonus-java/debian/patches/dfsg.diff
trunk/libtritonus-java/debian/patches/pvorbis.diff
trunk/libtritonus-java/debian/patches/series
trunk/libtritonus-java/debian/rules
Log:
* Move libtritonus-java package to pkg-java svn.
Added: trunk/libtritonus-java/debian/README.Debian
===================================================================
--- trunk/libtritonus-java/debian/README.Debian (rev 0)
+++ trunk/libtritonus-java/debian/README.Debian 2007-10-22 06:41:38 UTC (rev
4437)
@@ -0,0 +1,6 @@
+The JNI shared libraries for tritonus can be found in /usr/lib/tritonus. Please
+make sure the property java.library.path contains that path. That can be done
+by calling your jvm like
+
+java -Djava.library.path=/usr/lib/tritonus ...
+
Added: trunk/libtritonus-java/debian/changelog
===================================================================
--- trunk/libtritonus-java/debian/changelog (rev 0)
+++ trunk/libtritonus-java/debian/changelog 2007-10-22 06:41:38 UTC (rev
4437)
@@ -0,0 +1,36 @@
+libtritonus-java (20070428-4) unstable; urgency=low
+
+ * Move package to pkg-java svn.
+ * Switch to java-gcj-compat from kaffe
+ * debian/control:
+ + Set Priority to optional from extra.
+ + Set Maintainer to Debian Java Maintainers and add myself to Uploaders.
+ + Add Vcs-{Svn, Browser} Headers.
+ * Update debian/patches/build.diff to use ecj instead of ecj-bootstrap
(Closes: #447458)
+ * Remove debian/patches/64_bit.diff - not required.
+
+ -- Varun Hiremath <[EMAIL PROTECTED]> Mon, 22 Oct 2007 12:17:35 +0530
+
+libtritonus-java (20070428-3) unstable; urgency=low
+
+ [ Varun Hiremath ]
+ * Add patches/64_bit.diff which might help to build on 64 bit architectures.
+
+ [ Torsten Werner ]
+ * Disable -Werror.
+ * Enable -fPIC for fluidsynth.
+
+ -- Torsten Werner <[EMAIL PROTECTED]> Tue, 10 Jul 2007 22:08:18 +0200
+
+libtritonus-java (20070428-2) unstable; urgency=low
+
+ * Move the architecture dependent files into a separate package
+ 'libtritonus-bin' because they are not needed by everyone.
+
+ -- Torsten Werner <[EMAIL PROTECTED]> Fri, 1 Jun 2007 22:56:01 +0200
+
+libtritonus-java (20070428-1) unstable; urgency=low
+
+ * Initial release (Closes: #421642)
+
+ -- Torsten Werner <[EMAIL PROTECTED]> Mon, 30 Apr 2007 21:16:24 +0200
Added: trunk/libtritonus-java/debian/compat
===================================================================
--- trunk/libtritonus-java/debian/compat (rev 0)
+++ trunk/libtritonus-java/debian/compat 2007-10-22 06:41:38 UTC (rev
4437)
@@ -0,0 +1 @@
+5
Added: trunk/libtritonus-java/debian/control
===================================================================
--- trunk/libtritonus-java/debian/control (rev 0)
+++ trunk/libtritonus-java/debian/control 2007-10-22 06:41:38 UTC (rev
4437)
@@ -0,0 +1,30 @@
+Source: libtritonus-java
+Section: libs
+Priority: optional
+Maintainer: Debian Java maintainers <[EMAIL PROTECTED]>
+Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL
PROTECTED]>
+Build-Depends: cdbs, debhelper (>= 5), ant, autoconf, libasound2-dev |
libasound-dev, libcdparanoia0-dev, libesd0-dev,
+ libfluidsynth-dev, libjlayer-java, libogg-dev, libvorbis-dev,
libtritonus-java, java-gcj-compat-dev, ecj, quilt
+Standards-Version: 3.7.2
+Homepage: http://tritonus.org/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libtritonus-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libtritonus-java
+
+Package: libtritonus-java
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libtritonus-bin
+Description: implementation of the Java Sound API
+ Tritonus is a clean room open source implementation of the Java Sound
+ 1.0 API for Linux.
+ .
+ This package ships the required jar files.
+
+Package: libtritonus-bin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: implementation of the Java Sound API
+ Tritonus is a clean room open source implementation of the Java Sound
+ 1.0 API for Linux.
+ .
+ This package ships the optional jni shared libraries.
Added: trunk/libtritonus-java/debian/copyright
===================================================================
--- trunk/libtritonus-java/debian/copyright (rev 0)
+++ trunk/libtritonus-java/debian/copyright 2007-10-22 06:41:38 UTC (rev
4437)
@@ -0,0 +1,55 @@
+This package was debianized by Varun Hiremath <[EMAIL PROTECTED]> on
+Mon, 23 Apr 2007 08:12:15 +0530.
+
+It was downloaded from http://tritonus.org/download.html
+
+Upstream Author:
+Matthias Pfisterer <[EMAIL PROTECTED]>
+Florian Bomers <[EMAIL PROTECTED]>
+
+Copyright:
+(C) 1999 JCraft Inc.
+(C) 1999,2000 Matthias Pfisterer <[EMAIL PROTECTED]>
+(C) 1999,2000 Florian Bomers <[EMAIL PROTECTED]>
+(C) 1993,1994 Tobias Bading <[EMAIL PROTECTED]>
+(C) 1998 Steven Pickles <[EMAIL PROTECTED]>
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+The files src/classes/org/tritonus/lowlevel/dsp/Complex.java and
+src/classes/org/tritonus/lowlevel/dsp/Sfun.java are Copyright:
+(C) 1997 - 1998 by Visual Numerics, Inc. All rights reserved.
+
+License (BSD):
+
+ Permission to use, copy, modify, and distribute this software is freely
+ granted by Visual Numerics, Inc., provided that the copyright notice
+ above and the following warranty disclaimer are preserved in human
+ readable form.
+
+ Because this software is licenses free of charge, it is provided
+ "AS IS", with NO WARRANTY. TO THE EXTENT PERMITTED BY LAW, VNI
+ DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ TO ITS PERFORMANCE, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ VNI WILL NOT BE LIABLE FOR ANY DAMAGES WHATSOEVER ARISING OUT OF THE USE
+ OF OR INABILITY TO USE THIS SOFTWARE, INCLUDING BUT NOT LIMITED TO DIRECT,
+ INDIRECT, SPECIAL, CONSEQUENTIAL, PUNITIVE, AND EXEMPLARY DAMAGES, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+The Debian packaging is (C) 2007, Varun Hiremath <[EMAIL PROTECTED]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: trunk/libtritonus-java/debian/docs
===================================================================
--- trunk/libtritonus-java/debian/docs (rev 0)
+++ trunk/libtritonus-java/debian/docs 2007-10-22 06:41:38 UTC (rev 4437)
@@ -0,0 +1,2 @@
+NEWS
+README*
Added: trunk/libtritonus-java/debian/javah
===================================================================
--- trunk/libtritonus-java/debian/javah (rev 0)
+++ trunk/libtritonus-java/debian/javah 2007-10-22 06:41:38 UTC (rev 4437)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for FILE in /usr/share/java/tritonus_*-*.jar
+do
+ CLASSPATH="$FILE:$CLASSPATH"
+done
+
+exec $JAVA_HOME/bin/javah -classpath $CLASSPATH "$@"
+
Property changes on: trunk/libtritonus-java/debian/javah
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/libtritonus-java/debian/libtritonus-bin.install
===================================================================
--- trunk/libtritonus-java/debian/libtritonus-bin.install
(rev 0)
+++ trunk/libtritonus-java/debian/libtritonus-bin.install 2007-10-22
06:41:38 UTC (rev 4437)
@@ -0,0 +1 @@
+src/lib/*/lib*.so* /usr/lib/tritonus/
Added: trunk/libtritonus-java/debian/libtritonus-java.install
===================================================================
--- trunk/libtritonus-java/debian/libtritonus-java.install
(rev 0)
+++ trunk/libtritonus-java/debian/libtritonus-java.install 2007-10-22
06:41:38 UTC (rev 4437)
@@ -0,0 +1 @@
+dist/*.jar /usr/share/java/
Added: trunk/libtritonus-java/debian/orig-tar.sh
===================================================================
--- trunk/libtritonus-java/debian/orig-tar.sh (rev 0)
+++ trunk/libtritonus-java/debian/orig-tar.sh 2007-10-22 06:41:38 UTC (rev
4437)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+DATE=$1
+DIR=libtritonus-java-$DATE
+TAR=../libtritonus-java_$DATE.orig.tar.gz
+CVSROOT=:pserver:[EMAIL PROTECTED]:/cvsroot/tritonus
+
+if ! fgrep -q tritonus ~/.cvspass; then
+ cvs -d$CVSROOT login
+fi
+cvs -z9 -d$CVSROOT export -D $DATE -d $DIR tritonus
+tar -c -z -f $TAR $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
Added: trunk/libtritonus-java/debian/patches/Makefile.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/Makefile.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/Makefile.diff 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,183 @@
+Index: libtritonus-java-20070428/src/lib/fluidsynth/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/fluidsynth/Makefile.in
2006-02-11 21:49:29.000000000 +0100
++++ libtritonus-java-20070428/src/lib/fluidsynth/Makefile.in 2007-07-10
22:07:45.000000000 +0200
+@@ -9,8 +9,8 @@
+ JAVAEXTLIBPATH=$(JAVADIR)/$(REL_JAVAEXTLIBPATH)
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+-CC=libtool --mode=compile @CC@
+-CPPFLAGS=-g -Wall -Werror -I"$(JAVADIR)/include"
-I"$(JAVADIR)/include/$(OSNAME)" #-fPIC -D_REENTRANT #-pedantic
[EMAIL PROTECTED]@
++CPPFLAGS=-g -Wall -I"$(JAVADIR)/include" -I"$(JAVADIR)/include/$(OSNAME)"
-fPIC -D_REENTRANT #-pedantic
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -65,9 +65,9 @@
+ all: $(LIBDEST)
+
+ $(LIBDEST): $(OBJ)
+- libtool --mode=link gcc -g -O -o $(LIBBASENAME).la $(LTOBJ) \
++## libtool --mode=link gcc -g -O -o $(LIBBASENAME).la $(LTOBJ) \
+ -rpath /usr/lib $(LIBS)
+-## $(CC) -nostartfiles -shared -Wl,-soname,$(LIBBASENAME).so.1 -o
$(LIBDEST) $(OBJ) -L/usr/lib $(LIBS)
++ $(CC) -nostartfiles -shared -Wl,-soname,$(LIBBASENAME).so.1 -o
$(LIBDEST) $(OBJ) -L/usr/lib $(LIBS)
+ ##
+ ## use this for testing with a custom version of libfluidsynth
+ ##
+@@ -79,7 +79,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+@@ -119,4 +119,4 @@
+ .PHONY: clean
+ clean:
+ rm -rf $(LIBDEST) $(JNIHEADERS) *.o *~
+- libtool --mode=clean $(RM_F) $(LTOBJ) $(LIBBASENAME).la
+\ No newline at end of file
++ libtool --mode=clean $(RM_F) $(LTOBJ) $(LIBBASENAME).la
+Index: libtritonus-java-20070428/src/lib/cooked_ioctl/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/cooked_ioctl/Makefile.in
2002-09-28 10:06:13.000000000 +0200
++++ libtritonus-java-20070428/src/lib/cooked_ioctl/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -10,6 +10,7 @@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
[EMAIL PROTECTED]@ -x c
+ CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC
-D_REENTRANT #-pedantic
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -33,11 +34,10 @@
+ JNIOBJ=\
+ org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.o
+
+-OBJ=$(JNIOBJ) \
+- handlers.o
++OBJ=$(JNIOBJ)
+
+ JNIHEADERS:=\
+- org_tritonus_lowlevel_cdda_cooked_0005fioctl_CookedIoctl.h
++ org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.h
+
+ JNICLASSFILES=\
+ CookedIoctl.class
+@@ -60,7 +60,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+Index: libtritonus-java-20070428/src/lib/cdparanoia/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/cdparanoia/Makefile.in
2002-12-15 12:12:06.000000000 +0100
++++ libtritonus-java-20070428/src/lib/cdparanoia/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -54,7 +54,7 @@
+ all: $(LIBDEST)
+
+ $(LIBDEST): $(OBJ)
+- $(CC) -shared -Wl,-soname,$(LIBBASENAME).so.1
-Wl,-rpath,/home/matthias/java/tritonus/src/lib/common -o $(LIBDEST) $(OBJ)
$(LIBS)
++ $(CC) -shared -Wl,-soname,$(LIBBASENAME).so.1 -o $(LIBDEST) $(OBJ)
$(LIBS)
+ $(RM_F) $(LIBBASENAME).so.1
+ $(LN_S) $(LIBBASENAME).so.1.0 $(LIBBASENAME).so.1
+ $(RM_F) $(LIBBASENAME).so
+@@ -62,7 +62,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+Index: libtritonus-java-20070428/src/lib/alsa/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/alsa/Makefile.in 2003-11-08
20:50:38.000000000 +0100
++++ libtritonus-java-20070428/src/lib/alsa/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -10,7 +10,7 @@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+-CPPFLAGS=-g -Wall -Werror -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME)
-fPIC -D_REENTRANT #-pedantic
++CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC
-D_REENTRANT #-pedantic
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -128,7 +128,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+Index: libtritonus-java-20070428/src/lib/esd/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/esd/Makefile.in 2002-12-14
18:27:21.000000000 +0100
++++ libtritonus-java-20070428/src/lib/esd/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -10,7 +10,7 @@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+-CPPFLAGS=-g -Wall -Werror -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME)
-fPIC -D_REENTRANT #-pedantic
++CPPFLAGS=-g -Wall -I$(JAVADIR)/include -I$(JAVADIR)/include/$(OSNAME) -fPIC
-D_REENTRANT #-pedantic
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -63,7 +63,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+Index: libtritonus-java-20070428/src/lib/lame/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/lame/Makefile.in 2002-09-28
10:06:13.000000000 +0200
++++ libtritonus-java-20070428/src/lib/lame/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -66,7 +66,7 @@
+
+ $(JNIOBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ @$(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+Index: libtritonus-java-20070428/src/lib/pvorbis/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/pvorbis/Makefile.in 2005-02-05
22:07:35.000000000 +0100
++++ libtritonus-java-20070428/src/lib/pvorbis/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -99,7 +99,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
+Index: libtritonus-java-20070428/src/lib/vorbis/Makefile.in
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/vorbis/Makefile.in 2004-01-05
12:15:36.000000000 +0100
++++ libtritonus-java-20070428/src/lib/vorbis/Makefile.in 2007-07-10
22:07:30.000000000 +0200
+@@ -85,7 +85,7 @@
+
+ $(OBJ): $(JNIHEADERS)
+
+-$(JNIHEADERS): $(JNICLASSFILES)
++$(JNIHEADERS):
+ $(RM_F) $(JNIHEADERS)
+ $(JAVAH) -d . $(JNICLASSES)
+
Added: trunk/libtritonus-java/debian/patches/alsa.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/alsa.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/alsa.diff 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,15 @@
+Index: libtritonus-java-20070428/src/lib/alsa/constants_check.h
+===================================================================
+--- libtritonus-java-20070428.orig/src/lib/alsa/constants_check.h
2007-04-29 11:22:52.000000000 +0200
++++ libtritonus-java-20070428/src/lib/alsa/constants_check.h 2007-04-29
11:22:58.000000000 +0200
+@@ -136,8 +136,9 @@
+ assert(SND_SEQ_PRIORITY_HIGH ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_HIGH);
+ assert(SND_SEQ_PRIORITY_MASK ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_PRIORITY_MASK);
+ assert(SND_SEQ_CLIENT_SYSTEM ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_SYSTEM);
++/* does not work with current libasound2:
+ assert(SND_SEQ_CLIENT_DUMMY ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_DUMMY);
+- assert(SND_SEQ_CLIENT_OSS ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_OSS);
++ assert(SND_SEQ_CLIENT_OSS ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_CLIENT_OSS);*/
+ /* assert(SND_SEQ_FILTER_BROADCAST ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BROADCAST); */
+ /* assert(SND_SEQ_FILTER_MULTICAST ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_MULTICAST); */
+ /* assert(SND_SEQ_FILTER_BOUNCE ==
org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_FILTER_BOUNCE); */
Added: trunk/libtritonus-java/debian/patches/autoconf.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/autoconf.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/autoconf.diff 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,19 @@
+Index: libtritonus-java-20070428/configure.in
+===================================================================
+--- libtritonus-java-20070428.orig/configure.in 2006-02-12
09:56:32.000000000 +0100
++++ libtritonus-java-20070428/configure.in 2007-06-01 20:13:20.000000000
+0200
+@@ -68,9 +68,12 @@
+
+
+ # need to convert targets for 1.1? (legacy)
+-AC_SUBST(JAVAH)
++AC_ARG_VAR(JAVAH,
++ [how to call javah; defaults to 'javah -force -classpath $(OBJDIR)'])
++if [ -z "$JAVAH" ]; then
++ JAVAH='javah -force -classpath $(OBJDIR)'
++fi
+ AC_SUBST(CONVERTTARGETS)
+-JAVAH='javah -force -classpath $(OBJDIR)'
+ CONVERTTARGETS=
+
+ dnl case "$JAVA_VERSION" in
Added: trunk/libtritonus-java/debian/patches/build.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/build.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/build.diff 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,62 @@
+Index: libtritonus-java-20070428/build-common.xml
+===================================================================
+--- libtritonus-java-20070428.orig/build-common.xml 2007-04-30
17:55:50.000000000 +0200
++++ libtritonus-java-20070428/build-common.xml 2007-04-30 17:56:27.000000000
+0200
+@@ -373,6 +373,8 @@
+ depend="yes"
+ debug="${debug}"
+ destdir="${build}"
++ fork="yes"
++ executable="/usr/bin/ecj"
+ includes="org/tritonus/saol/"
+ excludes="org/tritonus/whatever" />
+ </target>
+Index: libtritonus-java-20070428/build.xml
+===================================================================
+--- libtritonus-java-20070428.orig/build.xml 2007-04-30 17:56:35.000000000
+0200
++++ libtritonus-java-20070428/build.xml 2007-04-30 17:57:04.000000000
+0200
+@@ -16,6 +16,8 @@
+ <target name="compile" depends="prepare">
+ <javac srcdir="${src}"
+ debug="${debug}"
++ fork="yes"
++ executable="/usr/bin/ecj"
+ source="${source}"
+ destdir="${build}"
+ sourcepath="${src.classes}">
+@@ -32,6 +34,8 @@
+ </javac>
+ <javac srcdir="${src.classes}"
+ debug="${debug}"
++ fork="yes"
++ executable="/usr/bin/ecj"
+ source="${source}"
+ destdir="${build}" >
+ <compilerarg compiler="kjc" value="-generic"/>
+@@ -53,6 +57,8 @@
+ if="javalayer-present">
+ <javac srcdir="${src}"
+ debug="${debug}"
++ fork="yes"
++ executable="/usr/bin/ecj"
+ source="${source}"
+ destdir="${build}" >
+ <compilerarg value="-Xlint:unchecked"/>
+@@ -66,6 +72,8 @@
+ if="jorbis-present">
+ <javac srcdir="${src.classes}"
+ debug="${debug}"
++ fork="yes"
++ executable="/usr/bin/ecj"
+ source="${source}"
+ destdir="${build}" >
+ <compilerarg value="-Xlint:unchecked"/>
+@@ -79,6 +87,8 @@
+ if="midishare-present">
+ <javac srcdir="${src}"
+ debug="${debug}"
++ fork="yes"
++ executable="/usr/bin/ecj"
+ source="${source}"
+ destdir="${build}" >
+ <compilerarg value="-Xlint:unchecked"/>
Added: trunk/libtritonus-java/debian/patches/configure.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/configure.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/configure.diff 2007-10-22
06:41:38 UTC (rev 4437)
@@ -0,0 +1,50 @@
+Index: libtritonus-java-20070428/configure.in
+===================================================================
+--- libtritonus-java-20070428.orig/configure.in 2006-02-12
09:56:32.000000000 +0100
++++ libtritonus-java-20070428/configure.in 2007-04-30 18:02:18.000000000
+0200
+@@ -29,36 +29,6 @@
+ AC_MSG_RESULT($JAVA_VERSION)
+
+ JDK_OK=yes
+-case $JAVA_VERSION in
+- 1.6* )
+- ;;
+- 1.5* )
+- ;;
+- 1.4* )
+- JDK_OK=no
+- ;;
+- 1.3* )
+- #bug in jar -i ...
+- #JAR_INDEX=jar_index
+- JDK_OK=no
+- ;;
+- 1.2* )
+- JDK_OK=no
+- ;;
+- 1.1* )
+- JDK_OK=no
+- ;;
+- 1.0* )
+- JDK_OK=no
+- ;;
+- *)
+- echo "No JDK Version detected. "
+- echo "Please make sure a J2SDK is in your CLASSPATH."
+- echo "For more information read the file INSTALL"
+- JDK_OK=no
+- ;;
+-esac
+-# fini
+
+ # We only support 1.5 or higher now
+ if test $JDK_OK != "yes" ; then
+@@ -116,8 +86,6 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+-AC_DISABLE_STATIC
+-AC_PROG_LIBTOOL
+
+ AC_SUBST(SUBDIRS)
+ dnl Checks for libraries.
Added: trunk/libtritonus-java/debian/patches/cooked_ioctl.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/cooked_ioctl.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/cooked_ioctl.diff 2007-10-22
06:41:38 UTC (rev 4437)
@@ -0,0 +1,110 @@
+Index:
libtritonus-java-20070428/src/lib/cooked_ioctl/org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.cc
+===================================================================
+---
libtritonus-java-20070428.orig/src/lib/cooked_ioctl/org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.cc
2007-04-29 13:11:17.000000000 +0200
++++
libtritonus-java-20070428/src/lib/cooked_ioctl/org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.cc
2007-04-29 13:26:32.000000000 +0200
+@@ -10,15 +10,15 @@
+ #include <sys/ioctl.h>
+
+ #include "../common/common.h"
+-#include "../common/HandleFieldHandler.hh"
+-#include "org_tritonus_lowlevel_cdda_cooked_0005fioctl_CookedIoctl.h"
++#include "../common/HandleFieldHandler.h"
++#include "org_tritonus_lowlevel_cdda_cooked_ioctl_CookedIoctl.h"
+
+
+
+ static int DEBUG = 0;
+ static FILE* debug_file = NULL;
+
+-static HandleFieldHandler<int> handler;
++HandleFieldHandlerDeclaration(handler,int);
+
+
+
+@@ -42,7 +42,7 @@
+ {
+ return -errno;
+ }
+- handler.setHandle(env, obj, cdrom_fd);
++ setHandle(env, obj, cdrom_fd);
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_open(): end\n"); }
+ return 0;
+ }
+@@ -61,7 +61,7 @@
+ int fd;
+
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_close(): begin\n"); }
+- fd = handler.getHandle(env, obj);
++ fd = getHandle(env, obj);
+ close(fd);
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_close(): end\n"); }
+ }
+@@ -89,14 +89,14 @@
+ int i;
+
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_readTOC():
begin\n"); }
+- cdrom_fd = handler.getHandle(env, obj);
++ cdrom_fd = getHandle(env, obj);
+ nReturn = ioctl(cdrom_fd, CDROMREADTOCHDR, &toc_hdr);
+ if (nReturn < 0)
+ {
+ throwRuntimeException(env, "CookedIoctl: read TOC header ioctl
failed");
+ }
+ checkArrayLength(env, anValues, 2);
+- pnValues = env->GetIntArrayElements(anValues, NULL);
++ pnValues = (*env)->GetIntArrayElements(env, anValues, NULL);
+ if (pnValues == NULL)
+ {
+ throwRuntimeException(env, "GetIntArrayElements failed");
+@@ -105,16 +105,16 @@
+ pnValues[1] = toc_hdr.cdth_trk1;
+ nFirstTrack = toc_hdr.cdth_trk0;
+ nLastTrack = toc_hdr.cdth_trk1;
+- env->ReleaseIntArrayElements(anValues, pnValues, 0);
++ (*env)->ReleaseIntArrayElements(env, anValues, pnValues, 0);
+
+ checkArrayLength(env, anStartFrame, 100);
+- pnStartFrame = env->GetIntArrayElements(anStartFrame, NULL);
++ pnStartFrame = (*env)->GetIntArrayElements(env, anStartFrame, NULL);
+ if (pnStartFrame == NULL)
+ {
+ throwRuntimeException(env, "GetIntArrayElements failed");
+ }
+ checkArrayLength(env, anType, 100);
+- pnType = env->GetIntArrayElements(anType, NULL);
++ pnType = (*env)->GetIntArrayElements(env, anType, NULL);
+ if (pnType == NULL)
+ {
+ throwRuntimeException(env, "GetIntArrayElements failed");
+@@ -143,8 +143,8 @@
+ pnStartFrame[nLastTrack - nFirstTrack + 1] = toc_entry.cdte_addr.lba;
+ pnType[nLastTrack - nFirstTrack + 1] =
toc_entry.cdte_ctrl&CDROM_DATA_TRACK;
+
+- env->ReleaseIntArrayElements(anStartFrame, pnStartFrame, 0);
+- env->ReleaseIntArrayElements(anType, pnType, 0);
++ (*env)->ReleaseIntArrayElements(env, anStartFrame, pnStartFrame, 0);
++ (*env)->ReleaseIntArrayElements(env, anType, pnType, 0);
+
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_readTOC(): end\n"); }
+ return 0;
+@@ -167,9 +167,9 @@
+ jbyte* pbData;
+
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_readFrame():
begin\n"); }
+- cdrom_fd = handler.getHandle(env, obj);
++ cdrom_fd = getHandle(env, obj);
+ checkArrayLength(env, abData, CD_FRAMESIZE_RAW * nCount);
+- pbData = env->GetByteArrayElements(abData, NULL);
++ pbData = (*env)->GetByteArrayElements(env, abData, NULL);
+ if (pbData == NULL)
+ {
+ throwRuntimeException(env, "GetIntArrayElements failed");
+@@ -183,7 +183,7 @@
+ {
+ throwRuntimeException(env, "CookedIoctl: read raw ioctl
failed");
+ }
+- env->ReleaseByteArrayElements(abData, pbData, 0);
++ (*env)->ReleaseByteArrayElements(env, abData, pbData, 0);
+ if (DEBUG) { fprintf(debug_file,
"Java_org_tritonus_lowlevel_cdda_cooked_1ioctl_CookedIoctl_readFrame():
end\n"); }
+ return 0;
+ }
Added: trunk/libtritonus-java/debian/patches/dfsg.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/dfsg.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/dfsg.diff 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,91 @@
+Index:
libtritonus-java-20070428/src/classes/org/tritonus/midi/device/java/JavaSequencer.java
+===================================================================
+---
libtritonus-java-20070428.orig/src/classes/org/tritonus/midi/device/java/JavaSequencer.java
2007-04-30 18:45:40.000000000 +0200
++++
libtritonus-java-20070428/src/classes/org/tritonus/midi/device/java/JavaSequencer.java
2007-04-30 18:46:12.000000000 +0200
+@@ -99,15 +99,7 @@
+ Arrays.asList(MASTER_SYNC_MODES),
+ Arrays.asList(SLAVE_SYNC_MODES));
+ if (TDebug.TraceSequencer) {
TDebug.out("JavaSequencer.<init>(): begin"); }
+- String strVersion = System.getProperty("java.version");
+- if (strVersion.indexOf("1.4.2") != -1)
+- {
+- setClock(new SunMiscPerfClock());
+- }
+- else
+- {
+- setClock(new SystemCurrentTimeMillisClock());
+- }
++ setClock(new SystemCurrentTimeMillisClock());
+ String strOS = System.getProperty("os.name");
+ if (strOS.equals("Linux"))
+ {
+Index:
libtritonus-java-20070428/src/classes/org/tritonus/midi/device/java/SunMiscPerfClock.java
+===================================================================
+---
libtritonus-java-20070428.orig/src/classes/org/tritonus/midi/device/java/SunMiscPerfClock.java
2007-04-30 18:46:17.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,65 +0,0 @@
+-/*
+- * SunMiscPerfClock.java
+- *
+- * This file is part of Tritonus: http://www.tritonus.org/
+- */
+-
+-/*
+- * Copyright (c) 2003 by Matthias Pfisterer
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU Library General Public License as published
+- * by the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Library General Public License for more details.
+- *
+- * You should have received a copy of the GNU Library General Public
+- * License along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-/*
+-|<--- this code is formatted to fit into 80 columns
--->|
+-*/
+-
+-package org.tritonus.midi.device.java;
+-
+-import sun.misc.Perf;
+-
+-
+-/** Sequencer clock based on sun.misc.Perf.
+- Sun JDK 1.4.2 or later is required to compile this class.
+- */
+-public class SunMiscPerfClock
+-implements JavaSequencer.Clock
+-{
+- private Perf m_perf;
+- private long m_lTicksPerSecond;
+-
+-
+- public SunMiscPerfClock()
+- {
+- m_perf = Perf.getPerf(); // may throw SecurityException
+- m_lTicksPerSecond = m_perf.highResFrequency();
+- }
+-
+-
+- /** Retrieve system time in microseconds.
+- This method retrieves the time by calling
+- [EMAIL PROTECTED] sun.misc.Perf}.
+-
+- @return the system time in microseconds
+- */
+- public long getMicroseconds()
+- {
+- return (m_perf.highResCounter() * 1000000) / m_lTicksPerSecond;
+- }
+-}
+-
+-
+-
+-/*** SunMiscPerfClock.java ***/
Added: trunk/libtritonus-java/debian/patches/pvorbis.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/pvorbis.diff
(rev 0)
+++ trunk/libtritonus-java/debian/patches/pvorbis.diff 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,13 @@
+Index:
libtritonus-java-20070428/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Buffer.c
+===================================================================
+---
libtritonus-java-20070428.orig/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Buffer.c
2007-04-29 16:01:32.000000000 +0200
++++
libtritonus-java-20070428/src/lib/pvorbis/org_tritonus_lowlevel_pogg_Buffer.c
2007-04-29 16:01:40.000000000 +0200
+@@ -25,7 +25,7 @@
+ */
+
+ #include "common.h"
+-#include "org_tritonus_lowlevel_pogg_StreamState.h"
++#include "org_tritonus_lowlevel_pogg_Buffer.h"
+
+ HandleFieldHandlerDeclaration(handler, oggpack_buffer*)
+
Added: trunk/libtritonus-java/debian/patches/series
===================================================================
--- trunk/libtritonus-java/debian/patches/series
(rev 0)
+++ trunk/libtritonus-java/debian/patches/series 2007-10-22 06:41:38 UTC
(rev 4437)
@@ -0,0 +1,9 @@
+autoconf.diff
+build.diff
+configure.diff
+Makefile.diff
+alsa.diff
+cooked_ioctl.diff
+pvorbis.diff
+dfsg.diff
+64_bit.diff
Added: trunk/libtritonus-java/debian/rules
===================================================================
--- trunk/libtritonus-java/debian/rules (rev 0)
+++ trunk/libtritonus-java/debian/rules 2007-10-22 06:41:38 UTC (rev 4437)
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -Xtritonus
+
+export JAVA_HOME = /usr/lib/jvm/java-gcj
+
+JAVA := $(JAVA_HOME)/bin/java
+JAVAH := $(CURDIR)/debian/javah
+EXTENSIONS := alsa cdparanoia cooked_ioctl esd fluidsynth pvorbis vorbis
+
+# We don't build the lame extension because lame is not part of Debian:
+#EXTENSIONS := alsa cdparanoia cooked_ioctl esd fluidsynth lame pvorbis vorbis
+
+post-patches:: debian/stamp-configure
+debian/stamp-configure:
+ autoconf
+ chmod +x $(JAVAH)
+ ./configure --prefix=$(JAVA_HOME) JAVA=$(JAVA) JAVAH=$(JAVAH)
+ touch $@
+
+common-binary-indep:: debian/stamp-binary-indep
+debian/stamp-binary-indep:
+ ant -f build-dtd.xml
+ CLASSPATH=/usr/share/java/jl.jar ant
+ touch $@
+
+common-binary-arch:: debian/stamp-binary-arch
+debian/stamp-binary-arch:
+ set -e && \
+ for EXT in $(EXTENSIONS); do \
+ $(MAKE) -C src/lib/$$EXT; \
+ done
+ touch $@
+
+install/libtritonus-java:: debian/stamp-binary-indep
+ set -e && \
+ for JAR in dist/*.jar; do \
+ BASE=$$(basename $$JAR); \
+ dh_link /usr/share/java/$$BASE /usr/share/java/$${BASE%-*}.jar; \
+ done
+
+clean::
+ $(RM) debian/stamp-*
+
+get-orig-source:
+ sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
Property changes on: trunk/libtritonus-java/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
