Package: jsymphonic
Version: 0.3.0.Ode.To.Freedom+svn387-7
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Transition package to use default java implementation:
- d/control: Switch dependencies from openjdk-6-* to default-*.
- d/rules: Set JAVA_HOME to /usr/lib/jvm/default-java.
- d/build.xml: Set source/target = 1.5 to ensure backwards compatible
bytecode is built.
Ubuntu is transitioning from openjdk-6 to openjdk-7 as default java; this patch
eases the transition and ensures that the code built by the package is backwards
compatible with java 1.5+. Note that this transition is not a wheezy release
goal.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers quantal-updates
APT policy: (500, 'quantal-updates'), (500, 'quantal-security'), (500,
'quantal')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5.0-8-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJQH5boAAoJEL/srsug59jD6OkQAMUzaSnW/hMDQzKC4k6+IiRa
jw9fbYge+EAUf/wtI2BjlWJr55zG2J64QjBQ5iHtiiwR+hfiAoy+VfGIw+dcRhPw
zhRP6PRFXLKdJe5x3hBOZOXXd8Fk6OA5zLXA1GtMKgrLVb6mHO8DSjG+7nGKbbEH
POgBFnttz3mDKJBOWJ95C8TT/rFTCbTbFLDCaGkhP7zCnnTtDVUTs8rAywPRJw6H
4hCt2SMp+cqlEn96ur/leCTs+jLDluI1HlOPa8z128SH4B7mjUnguLMbfjYGZ2wU
Di6tvWBda82RV5+pP1fvja7bAZzTv+SaqtQ+/4NzEkR3ZQD4Rrm2z2E1tALyxVm5
CR+CzzV7j3J8WnZesP9b5f/p+6saWnEWz0dSiBIDx4YT8mOB4dUXehBeNaOJTLJ+
/fw9mW6okRlkADTojtBm9dTHuiy2eMdB2h1xpCH+Og0V2MMFuPA6tIwC2X6/wxT4
HHF4btz4S42v/WIyRhI3dtu8NbCR8uNmcR92onXAzox2WVOy4Yq8f2BNf2bp2qAO
UmUuGeWdUzKnM/fF6za8CasUSCTmKamYFBFPilOpbjGmcJVI+/2+3Dr+hG+k+NJT
04Yk90H0HrhxvOoz/gK/MD2uQWCrpZ1QhoYMdn44YEz8FRQzWw3y94Iil8MT08vT
Lx8fTHiKTPzNGvvSen3d
=Mqns
-----END PGP SIGNATURE-----
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml
--- jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml 2011-04-04 21:00:51.000000000 +0100
+++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/build.xml 2012-08-06 10:48:05.000000000 +0100
@@ -33,7 +33,8 @@
</target>
<target name="compile" depends="init">
- <javac srcdir="${srcdir}" destdir="${builddir}" encoding="UTF-8" />
+ <javac srcdir="${srcdir}" destdir="${builddir}" encoding="UTF-8"
+ source="1.5" target="1.5" />
</target>
<target name="build" depends="compile,languages,resources">
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/changelog jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/changelog
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control
--- jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control 2011-06-04 19:31:56.000000000 +0100
+++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/control 2012-08-06 11:02:06.000000000 +0100
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Vincent Fourmond <fourm...@debian.org>
Build-Depends: cdbs, debhelper (>= 7), ant, javahelper (>= 0.36)
-Build-Depends-Indep: openjdk-6-jdk, libswing-layout-java
+Build-Depends-Indep: default-jdk, libswing-layout-java
Standards-Version: 3.9.2
Homepage: http://sourceforge.net/projects/symphonic/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jsymphonic
@@ -13,7 +13,7 @@
Package: jsymphonic
Architecture: all
-Depends: openjdk-6-jre | java6-runtime, java-wrappers (>= 0.1.22),
+Depends: default-jre | java6-runtime, java-wrappers (>= 0.1.22),
${misc:Depends}, ${java:Depends}
Recommends: ffmpeg
Suggests: pmount
@@ -24,4 +24,4 @@
.
This program provides functionalities similar to the proprietary
Windows-only SonicStage software given by Sony to interact with
- the players.
\ No newline at end of file
+ the players.
diff -Nru jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules
--- jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules 2011-09-29 20:15:04.000000000 +0100
+++ jsymphonic-0.3.0.Ode.To.Freedom+svn387/debian/rules 2012-08-06 10:47:40.000000000 +0100
@@ -12,7 +12,7 @@
include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk-$(shell dpkg-architecture -qDEB_HOST_ARCH)
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
DEB_ANT_COMPILER := modern
DEB_BUILDDIR := .
