[pkg-java] r7177 - in trunk/java-access-bridge/debian: . patches

[doko at alioth.debian.org]

Author: doko
Date: 2008-10-20 11:56:58 +0000 (Mon, 20 Oct 2008)
New Revision: 7177

Added:
   trunk/java-access-bridge/debian/patches/
   trunk/java-access-bridge/debian/patches/source-1.5.diff
Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/control
Log:
  * New upstream release (documentation changes only).
  * Compile java files with -source 1.5.



Modified: trunk/java-access-bridge/debian/changelog
===================================================================
--- trunk/java-access-bridge/debian/changelog	2008-10-20 11:39:01 UTC (rev 7176)
+++ trunk/java-access-bridge/debian/changelog	2008-10-20 11:56:58 UTC (rev 7177)
@@ -1,3 +1,10 @@
+java-access-bridge (1.24.0-1) UNRELEASED; urgency=low
+
+  * New upstream release (documentation changes only).
+  * Compile java files with -source 1.5.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 20 Oct 2008 13:50:26 +0200
+
 java-access-bridge (1.23.0-2) unstable; urgency=low
 
   * Apply openjdk-java-access-bridge-tck, taken from Fedora.

Modified: trunk/java-access-bridge/debian/control
===================================================================
--- trunk/java-access-bridge/debian/control	2008-10-20 11:39:01 UTC (rev 7176)
+++ trunk/java-access-bridge/debian/control	2008-10-20 11:56:58 UTC (rev 7177)
@@ -13,7 +13,7 @@
 
 Package: libaccess-bridge-java
 Architecture: all
-Depends: openjdk-6-jre | cacao-oj6-jre | java5-runtime-headless
+Depends: default-jre (>= 1.5) | openjdk-6-jre | cacao-oj6-jre
 Description: Java Access Bridge for GNOME
  This module contains the Java Access Bridge for GNOME, 
  which connects the built-in accessibility support in

Added: trunk/java-access-bridge/debian/patches/source-1.5.diff
===================================================================
--- trunk/java-access-bridge/debian/patches/source-1.5.diff	                        (rev 0)
+++ trunk/java-access-bridge/debian/patches/source-1.5.diff	2008-10-20 11:56:58 UTC (rev 7177)
@@ -0,0 +1,39 @@
+diff -u java-access-bridge-1.24.0/debian/changelog java-access-bridge-1.24.0/debian/changelog
+--- java-access-bridge-1.24.0/debian/changelog
++++ java-access-bridge-1.24.0/debian/changelog
+@@ -1,3 +1,9 @@
++java-access-bridge (1.24.0-0ubuntu2) intrepid; urgency=low
++
++  * Compile java files with -source 1.5.
++
++ -- Matthias Klose <doko at ubuntu.com>  Mon, 20 Oct 2008 13:45:59 +0200
++
+ java-access-bridge (1.24.0-0ubuntu1) intrepid; urgency=low
+ 
+   * New upstream release (documentation changes only).
+only in patch2:
+unchanged:
+--- java-access-bridge-1.24.0.orig/configure.in
++++ java-access-bridge-1.24.0/configure.in
+@@ -45,7 +45,7 @@
+ fi    
+ 
+ if test "x$JAVA_HOME" != "x" ; then
+-  AC_CHECK_FILE("$JAVA_HOME/bin/javac", JAVAC="$JAVA_HOME/bin/javac",
++  AC_CHECK_FILE("$JAVA_HOME/bin/javac", JAVAC="$JAVA_HOME/bin/javac -source 1.5",
+ 	AC_MSG_ERROR([$JAVA_ERROR_MESSAGE]))
+ else
+   AC_CHECK_PROG(JAVAC, javac, javac, no)
+only in patch2:
+unchanged:
+--- java-access-bridge-1.24.0.orig/configure
++++ java-access-bridge-1.24.0/configure
+@@ -2289,7 +2289,7 @@
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_File'}'` = yes; then
+-  JAVAC="$JAVA_HOME/bin/javac"
++  JAVAC="$JAVA_HOME/bin/javac -source 1.5"
+ else
+   { { echo "$as_me:$LINENO: error: $JAVA_ERROR_MESSAGE" >&5
+ echo "$as_me: error: $JAVA_ERROR_MESSAGE" >&2;}