Your message dated Wed, 8 Nov 2006 19:56:34 +0100
with message-id <[EMAIL PROTECTED]>
and subject line Bug#397640: Acknowledgement (jikes-contrib: diff for NMU
version 0.11)
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: jikes-contrib
Version: 0.10
Severity: normal
Tags: patch
Hi,
The following is the diff for my jikes-contrib 0.11 NMU.
diff -Nru /tmp/WXteXkAdxP/jikes-contrib-0.10/debian/changelog
/tmp/Dt2MfXYvSB/jikes-contrib-0.11/debian/changelog
--- /tmp/WXteXkAdxP/jikes-contrib-0.10/debian/changelog 2006-09-03
03:38:08.000000000 +0200
+++ /tmp/Dt2MfXYvSB/jikes-contrib-0.11/debian/changelog 2006-11-08
18:57:58.000000000 +0100
@@ -1,3 +1,16 @@
+jikes-contrib (0.11) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Permit Sun Java(TM) from non-free.
+ - Swap the version / path_type to permit looping on sun-java*-bin
+ locations as well; makes more sense anyway.
+ - Test for /usr/lib/jvm/java-${version}.*-sun-${version}.*/jre/lib in the
+ loop as well.
+ - Update error message for a missing rt.jar.
+ - Allow sun-java5-bin in Depends as well.
+
+ -- Loic Minier <[EMAIL PROTECTED]> Wed, 8 Nov 2006 18:56:38 +0100
+
jikes-contrib (0.10) unstable; urgency=low
* Corrected location of java rt.jar for the latest sun-j2sdk1.5
diff -Nru /tmp/WXteXkAdxP/jikes-contrib-0.10/debian/control
/tmp/Dt2MfXYvSB/jikes-contrib-0.11/debian/control
--- /tmp/WXteXkAdxP/jikes-contrib-0.10/debian/control 2006-09-03
03:15:27.000000000 +0200
+++ /tmp/Dt2MfXYvSB/jikes-contrib-0.11/debian/control 2006-11-08
18:54:47.000000000 +0100
@@ -7,7 +7,7 @@
Package: jikes-sun
Architecture: all
-Depends: jikes, j2re1.3 (>=1.3.1) | j2sdk1.3 (>= 1.3.1) | j2re1.4 |
sun-j2re1.4 (>>1.4.2) | sun-j2re1.5 | sun-j2sdk1.5
+Depends: jikes, j2re1.3 (>=1.3.1) | j2sdk1.3 (>= 1.3.1) | j2re1.4 |
sun-j2re1.4 (>>1.4.2) | sun-j2re1.5 | sun-j2sdk1.5 | sun-java5-bin
Recommends: java-package
Provides: java-compiler
Description: Wrapper for jikes using Sun Java classes
diff -Nru /tmp/WXteXkAdxP/jikes-contrib-0.10/src/jikes-sun
/tmp/Dt2MfXYvSB/jikes-contrib-0.11/src/jikes-sun
--- /tmp/WXteXkAdxP/jikes-contrib-0.10/src/jikes-sun 2006-09-03
03:37:17.000000000 +0200
+++ /tmp/Dt2MfXYvSB/jikes-contrib-0.11/src/jikes-sun 2006-11-08
18:54:30.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh -e
-for path_type in re sdk; do
- for version in 1.6 1.5 1.4; do
+for version in 1.6 1.5 1.4; do
+ for path_type in re sdk; do
if [ -e /usr/lib/j2${path_type}${version}-sun/jre/lib/rt.jar ];
then
JPATH=/usr/lib/j2${path_type}${version}-sun/jre/lib
break 2
@@ -10,6 +10,11 @@
break 2
fi
done
+ # Sun Java(TM) from non-free (in sun-java*-bin)
+ if [ -e /usr/lib/jvm/java-${version}.*-sun-${version}.*/jre/lib/rt.jar
]; then
+ JPATH=/usr/lib/jvm/java-${version}.*-sun-${version}.*/jre/lib
+ break
+ fi
done
if [ "x$JPATH" = "x" ]; then
@@ -29,7 +34,7 @@
# Print error
echo
-echo "----- Cannot find SUN Java (created with java-package) "
+echo "----- Cannot find SUN Java (created with java-package or from non-free) "
echo "----- or Blackdown files. Please file a bug against jikes-sun"
echo
exit 1
--- End Message ---
--- Begin Message ---
Sorry for this spurious bug, it was sent due to a change in the
behavior of nmudiff (#397641).
(Closing.)
--
Loïc Minier <[EMAIL PROTECTED]>
--- End Message ---
