[pkg-java] r6112 - in trunk/libtritonus-java/debian: . patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-04-07 07:58:58 +0000 (Mon, 07 Apr 2008)
New Revision: 6112

Added:
   trunk/libtritonus-java/debian/patches/alsa-1.0.16.diff
Modified:
   trunk/libtritonus-java/debian/changelog
   trunk/libtritonus-java/debian/control
   trunk/libtritonus-java/debian/patches/series
Log:
libtritonus-java (20070428-6) unstable; urgency=low

  * Added patch to compile with alsa 1.0.16 and up. Closes: #470330
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Mon, 07 Apr 2008 09:58:19 +0200



Modified: trunk/libtritonus-java/debian/changelog
===================================================================
--- trunk/libtritonus-java/debian/changelog	2008-04-06 23:01:39 UTC (rev 6111)
+++ trunk/libtritonus-java/debian/changelog	2008-04-07 07:58:58 UTC (rev 6112)
@@ -1,3 +1,10 @@
+libtritonus-java (20070428-6) unstable; urgency=low
+
+  * Added patch to compile with alsa 1.0.16 and up. Closes: #470330
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Mon, 07 Apr 2008 09:58:19 +0200
+
 libtritonus-java (20070428-5) unstable; urgency=low
 
   * Remove obsolete patch build.diff.

Modified: trunk/libtritonus-java/debian/control
===================================================================
--- trunk/libtritonus-java/debian/control	2008-04-06 23:01:39 UTC (rev 6111)
+++ trunk/libtritonus-java/debian/control	2008-04-07 07:58:58 UTC (rev 6112)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
+Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
 Build-Depends: cdbs, debhelper (>= 5), ant, autoconf,
  libasound2-dev | libasound-dev, libcdparanoia0-dev, libesd0-dev,
  libfluidsynth-dev, libjlayer-java, libogg-dev, libvorbis-dev,

Added: trunk/libtritonus-java/debian/patches/alsa-1.0.16.diff
===================================================================
--- trunk/libtritonus-java/debian/patches/alsa-1.0.16.diff	                        (rev 0)
+++ trunk/libtritonus-java/debian/patches/alsa-1.0.16.diff	2008-04-07 07:58:58 UTC (rev 6112)
@@ -0,0 +1,35 @@
+diff -urd libtritonus-java-20070428.orig/src/lib/alsa/constants_check.h libtritonus-java-20070428/src/lib/alsa/constants_check.h
+--- libtritonus-java-20070428.orig/src/lib/alsa/constants_check.h	2002-08-03 07:56:35.000000000 +0200
++++ libtritonus-java-20070428/src/lib/alsa/constants_check.h	2008-04-06 15:29:08.000000000 +0200
+@@ -70,6 +70,7 @@
+ 	assert(SND_SEQ_EVENT_PORT_CHANGE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_PORT_CHANGE);
+ 	assert(SND_SEQ_EVENT_PORT_SUBSCRIBED == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_PORT_SUBSCRIBED);
+ 	assert(SND_SEQ_EVENT_PORT_UNSUBSCRIBED == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_PORT_UNSUBSCRIBED);
++/* removed since libasound2 1.0.16
+ 	assert(SND_SEQ_EVENT_SAMPLE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE);
+ 	assert(SND_SEQ_EVENT_SAMPLE_CLUSTER == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_CLUSTER);
+ 	assert(SND_SEQ_EVENT_SAMPLE_START == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_START);
+@@ -79,6 +80,7 @@
+ 	assert(SND_SEQ_EVENT_SAMPLE_LOOP == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_LOOP);
+ 	assert(SND_SEQ_EVENT_SAMPLE_POSITION == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_POSITION);
+ 	assert(SND_SEQ_EVENT_SAMPLE_PRIVATE1 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SAMPLE_PRIVATE1);
++*/
+ 	assert(SND_SEQ_EVENT_USR0 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR0);
+ 	assert(SND_SEQ_EVENT_USR1 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR1);
+ 	assert(SND_SEQ_EVENT_USR2 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR2);
+@@ -89,6 +91,7 @@
+ 	assert(SND_SEQ_EVENT_USR7 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR7);
+ 	assert(SND_SEQ_EVENT_USR8 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR8);
+ 	assert(SND_SEQ_EVENT_USR9 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR9);
++/* removed since libasound2 1.0.16
+ 	assert(SND_SEQ_EVENT_INSTR_BEGIN == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_BEGIN);
+ 	assert(SND_SEQ_EVENT_INSTR_END == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_END);
+ 	assert(SND_SEQ_EVENT_INSTR_INFO == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_INFO);
+@@ -108,6 +111,7 @@
+ 	assert(SND_SEQ_EVENT_INSTR_CLUSTER_GET == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CLUSTER_GET);
+ 	assert(SND_SEQ_EVENT_INSTR_CLUSTER_RESULT == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CLUSTER_RESULT);
+ 	assert(SND_SEQ_EVENT_INSTR_CHANGE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_INSTR_CHANGE);
++*/
+ 	assert(SND_SEQ_EVENT_SYSEX == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_SYSEX);
+ 	assert(SND_SEQ_EVENT_BOUNCE == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_BOUNCE);
+ 	assert(SND_SEQ_EVENT_USR_VAR0 == org_tritonus_lowlevel_alsa_AlsaSeq_SND_SEQ_EVENT_USR_VAR0);

Modified: trunk/libtritonus-java/debian/patches/series
===================================================================
--- trunk/libtritonus-java/debian/patches/series	2008-04-06 23:01:39 UTC (rev 6111)
+++ trunk/libtritonus-java/debian/patches/series	2008-04-07 07:58:58 UTC (rev 6112)
@@ -5,3 +5,4 @@
 cooked_ioctl.diff
 pvorbis.diff
 dfsg.diff
+alsa-1.0.16.diff