Package: jajuk
Version: 1:1.9.6-1
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 default java implementation:
    - d/control: Switch BD from openjdk-6-jdk -> default-jdk, make
      default-jre the primary dependency for runtime.
    - d/rules: Prefer default-java for JAVA_HOME.

This ensures that the package builds and runs with the default java
implementation provided by the distro (this has changed in Ubuntu quantal
to openjdk-7).

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-7-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)

iQIcBAEBCAAGBQJQGUcoAAoJEL/srsug59jD14gP/RKcn7x+1X9Kkj7XWW2m4VZN
r83DQckYPCXrFLkXrLyktGcBmKPTqvlz50hzgrPeYSXyEchpxz/kqrffMWgyxkSK
vcunimoVOT0DQ8bZ5qjMBiUr8aYASjzzb+dgal2L0uuGovC9B8AmO4MCg+oDx/VU
+6I5eZmbNnjOZ+VwabKiODt8JtdSU0EDCV3slm3ry3T52BMOmt2bLFfjQWbX+obd
jK35axRuf7bsr76KeU8uhPa+FwlPU0A0dZINsThF2i06r7e3xnTkWOwEKsMNlEIe
KtfnunKCgczUCATyh/dshCy4SQ54dRxEHwpFWZmN8ztNJOVQj2YQCX3tnGgSLlwD
zsJVnilj9pzyidnN6FxkLQT3GaybYKHa9G8nY4E1Cw00W97n13eUAM5uY53av6Sj
qgVmmvZSwHZU3eIw8Q2dcY/vp56Ob7u4TenZw5uAuyRUYuqILGPnYEZIrj5V2Yta
+e3RnQqYexuzDaICUwQqut6QC/oEdzrCMIPLLrfjbQh2Nl67P7w/JOIBihQRGaMd
Syifx0+cTrLRuIUaYbDuHQOoBo2nkKafQcXoxOboMWrj15xnwjRjWorqAfNsuQtY
PQJPe2IHtZ2Aloz1pGP2Yky4B7N1xo/4buedm/3olo4fpMRhfDXoRw1c/rtoLh8t
EHSKQKDkE/+2hgQEsYx3
=lniE
-----END PGP SIGNATURE-----
diff -Nru jajuk-1.9.6/debian/changelog jajuk-1.9.6/debian/changelog
diff -Nru jajuk-1.9.6/debian/control jajuk-1.9.6/debian/control
--- jajuk-1.9.6/debian/control	2012-02-22 22:12:52.000000000 +0000
+++ jajuk-1.9.6/debian/control	2012-08-01 16:09:35.000000000 +0100
@@ -39,7 +39,7 @@
                      libvorbisspi-java,
                      libxstream-java,
                      mplayer,
-                     openjdk-6-jdk,
+                     default-jdk,
                      substance (>= 5.2)
 Standards-Version: 3.9.2
 Homepage: http://jajuk.info/
@@ -84,7 +84,7 @@
          libvorbisspi-java,
          libxstream-java,
          mplayer,
-         openjdk-6-jre | java6-runtime | java7-runtime,
+         default-jre | java6-runtime | java7-runtime,
          substance (>= 5.2),
          ${misc:Depends}
 Description: advanced jukebox and music organizer
diff -Nru jajuk-1.9.6/debian/rules jajuk-1.9.6/debian/rules
--- jajuk-1.9.6/debian/rules	2012-02-20 23:25:00.000000000 +0000
+++ jajuk-1.9.6/debian/rules	2012-08-01 16:06:15.000000000 +0100
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
+JAVA_HOME := $(firstword $(wildcard /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
 DEB_ANT_BUILDFILE	:= src/scripts/build.xml
 DEB_ANT_BUILD_TARGET	:= package_jar
 DEB_JARS := animation basicplayer cobra commons-codec commons-collections3 commons-httpclient commons-logging entagged-tageditor jaudiotagger jcommon jfreechart jl jmactritonusspi jogg jorbis jspeex log4j-1.2 mp3spi substance swingx tritonus_share vldocking vorbisspi jna dbus miglayout jhlabs-filters lastfm commons-lang commons-io xstream simple-validation guava
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to