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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-11-30 22:52:59 +0000 (Sun, 30 Nov 2008)
New Revision: 7480

Added:
   trunk/java-access-bridge/debian/patches/
   trunk/java-access-bridge/debian/patches/javabridge.diff
   trunk/java-access-bridge/debian/patches/series
Removed:
   trunk/java-access-bridge/bridge/
Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/control
   trunk/java-access-bridge/debian/rules
Log:
* new upstream release
* Switch to quilt for changing upstream files.
* Bump up Standards-Version: 3.8.0 (no changes).

Modified: trunk/java-access-bridge/debian/changelog
===================================================================
--- trunk/java-access-bridge/debian/changelog	2008-11-30 10:26:50 UTC (rev 7479)
+++ trunk/java-access-bridge/debian/changelog	2008-11-30 22:52:59 UTC (rev 7480)
@@ -1,3 +1,11 @@
+java-access-bridge (1.24.0-1) experimental; urgency=low
+
+  * new upstream release
+  * Switch to quilt for changing upstream files.
+  * Bump up Standards-Version: 3.8.0 (no changes).
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 30 Nov 2008 23:52:04 +0100
+
 java-access-bridge (1.23.0-3) unstable; urgency=low
 
   * Call 'javac -source 1.5'. (Closes: #503785)

Modified: trunk/java-access-bridge/debian/control
===================================================================
--- trunk/java-access-bridge/debian/control	2008-11-30 10:26:50 UTC (rev 7479)
+++ trunk/java-access-bridge/debian/control	2008-11-30 22:52:59 UTC (rev 7480)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthias Klose <doko at ubuntu.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev
-Build-Depends-Indep: openjdk-6-jdk, gawk, pkg-config, libbonobo2-dev, libatspi-dev, at-spi,
- x11-utils
-Standards-Version: 3.7.3
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, quilt
+Build-Depends-Indep: openjdk-6-jdk, gawk, pkg-config, libbonobo2-dev, libatspi-dev,
+ at-spi, x11-utils
+Standards-Version: 3.8.0
 Homepage: http://live.gnome.org/Java%20Access%20Bridge
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/java-access-bridge
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/java-access-bridge/

Added: trunk/java-access-bridge/debian/patches/javabridge.diff
===================================================================
--- trunk/java-access-bridge/debian/patches/javabridge.diff	                        (rev 0)
+++ trunk/java-access-bridge/debian/patches/javabridge.diff	2008-11-30 22:52:59 UTC (rev 7480)
@@ -0,0 +1,25 @@
+--- java-access-bridge-1.23.0.orig/bridge/org/GNOME/Accessibility/JavaBridge.java
++++ java-access-bridge-1.23.0/bridge/org/GNOME/Accessibility/JavaBridge.java
+@@ -34,6 +34,9 @@
+ import javax.accessibility.AccessibleRole;
+ import javax.accessibility.AccessibleText;
+ import javax.accessibility.AccessibleEditableText;
++import java.security.PrivilegedAction;
++import java.security.AccessController;
++
+ 
+ public class JavaBridge {
+ 
+@@ -348,7 +351,11 @@
+ 			System.err.println ("Java Accessibility Bridge for GNOME loaded.\n");
+ 
+ 		// Not sure what kind of arguments should be sent to ORB
+-		String vm_rev = System.getProperty("java.version");
++		String vm_rev = (String) AccessController.doPrivileged(new PrivilegedAction() {
++			public java.lang.Object run() {
++				return System.getProperty("java.version");
++			}
++		});	
+ 
+ 		if (vm_rev.compareTo("1.4.0") < 0) {
+ 			System.err.println("WARNING: Java Accessibility Bridge " +

Added: trunk/java-access-bridge/debian/patches/series
===================================================================
--- trunk/java-access-bridge/debian/patches/series	                        (rev 0)
+++ trunk/java-access-bridge/debian/patches/series	2008-11-30 22:52:59 UTC (rev 7480)
@@ -0,0 +1 @@
+javabridge.diff

Modified: trunk/java-access-bridge/debian/rules
===================================================================
--- trunk/java-access-bridge/debian/rules	2008-11-30 10:26:50 UTC (rev 7479)
+++ trunk/java-access-bridge/debian/rules	2008-11-30 22:52:59 UTC (rev 7480)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 export JAVA_HOME := /usr/lib/jvm/java-6-openjdk
 export PATH      := $(JAVA_HOME)/bin:$(PATH)
@@ -14,5 +15,5 @@
 	$(RM) -r $(DEB_DESTDIR)/usr/share/jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	uscan --force-download --rename