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

Damien Raude-Morvan drazzib at alioth.debian.org
Thu Sep 1 22:25:07 UTC 2011


Author: drazzib
Date: 2011-09-01 22:25:06 +0000 (Thu, 01 Sep 2011)
New Revision: 14659

Added:
   trunk/java-access-bridge/debian/patches/
   trunk/java-access-bridge/debian/patches/series
   trunk/java-access-bridge/debian/patches/use_accesscontroller_for_javaversion.diff
   trunk/java-access-bridge/debian/source/
   trunk/java-access-bridge/debian/source/format
Removed:
   trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install
Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/control
   trunk/java-access-bridge/debian/rules
Log:

* Made the descriptions unique.
* Used ?\194?\169 instead of (C) in the copyright file.
* Remove unneeded dependency on JRE packages
  (Closes: #587566, #600664, #639952).
* Switch to dpkg-source 3.0 (quilt) format:
  - Extract d/patches/use_accesscontroller_for_javaversion.diff
* Build with openjdk-7 under kfreebsd-any:
  - d/control: B-D depends on openjdk-7 [kfreebsd-any].
  - d/rules: check DEB_HOST_ARCH to choose JAVA_HOME.
* Handle multi-arch openjdk-{6-7}:
  - d/control: Append DEB_HOST_ARCH to java-1.x.y-openjdk (Closes: #639951).
* Install in a multiarch location, still provide compatibility symlinks.
* Use an AccessController to access java.version property.
* Build-depend on libgtk2.0-dev. Closes: #556804.
* libaccess-bridge-java: Depend on -jre, not -jre-headless.
* libaccess-bridge-java-jni: Depend on libaccess-bridge-java.

Modified: trunk/java-access-bridge/debian/changelog
===================================================================
--- trunk/java-access-bridge/debian/changelog	2011-09-01 21:01:00 UTC (rev 14658)
+++ trunk/java-access-bridge/debian/changelog	2011-09-01 22:25:06 UTC (rev 14659)
@@ -1,18 +1,57 @@
-java-access-bridge (1.26.2-2) unstable; urgency=low
+java-access-bridge (1.26.2-7) UNRELEASED; urgency=low
 
   * Team upload.
-  * Remove unneeded dependency on JRE packages.
-    (Closes: #587566, #600664)
-  * Bumped Standards-Versions to 3.9.2 - no changes required.
+  
+  [ Niels Thykier ]
   * Bumped debhelper compat to 8.
-  * Added B-D on libgtk2.0-dev to make it build.
+  * Made the descriptions unique.
+  * Used © instead of (C) in the copyright file.
   * Used the public Vcs-Svn link that does not require an alioth
     account.
-  * Used © instead of (C) in the copyright file.
-  * Made the descriptions unique.
+  * Remove unneeded dependency on JRE packages
+    (Closes: #587566, #600664, #639952).
 
- -- Niels Thykier <niels at thykier.net>  Fri, 29 Jul 2011 19:19:07 +0200
+  [ Damien Raude-Morvan ]
+  * Switch to dpkg-source 3.0 (quilt) format:
+    - Extract d/patches/use_accesscontroller_for_javaversion.diff
+  * Build with openjdk-7 under kfreebsd-any:
+    - d/control: B-D depends on openjdk-7 [kfreebsd-any].
+    - d/rules: check DEB_HOST_ARCH to choose JAVA_HOME.
+  * Handle multi-arch openjdk-{6-7}:
+    - d/control: Append DEB_HOST_ARCH to java-1.x.y-openjdk (Closes: #639951).
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Sep 2011 00:03:48 +0200
+
+java-access-bridge (1.26.2-6) unstable; urgency=low
+
+  * Install in a multiarch location, still provide compatibility symlinks.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 27 Aug 2011 14:14:34 +0200
+
+java-access-bridge (1.26.2-5) unstable; urgency=low
+
+  * Use an AccessController to access java.version property.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 16 Jul 2010 13:55:00 +0200
+
+java-access-bridge (1.26.2-4) unstable; urgency=low
+
+  * Build-depend on libgtk2.0-dev. Closes: #556804.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 08 Jan 2010 01:42:13 +0100
+
+java-access-bridge (1.26.2-3) unstable; urgency=low
+
+  * libaccess-bridge-java: Depend on -jre, not -jre-headless.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 06 Oct 2009 19:23:22 +0200
+
+java-access-bridge (1.26.2-2) unstable; urgency=low
+
+  * libaccess-bridge-java-jni: Depend on libaccess-bridge-java.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 04 Oct 2009 22:10:36 +0200
+
 java-access-bridge (1.26.2-1) unstable; urgency=low
 
   * new upstream version

Modified: trunk/java-access-bridge/debian/control
===================================================================
--- trunk/java-access-bridge/debian/control	2011-09-01 21:01:00 UTC (rev 14658)
+++ trunk/java-access-bridge/debian/control	2011-09-01 22:25:06 UTC (rev 14659)
@@ -3,7 +3,19 @@
 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 (>= 8), autotools-dev, openjdk-6-jdk, gawk, pkg-config, libbonobo2-dev, libatspi-dev, at-spi (>= 1.8), x11-utils, libgtk2.0-dev
+Build-Depends: at-spi (>= 1.8),
+               autotools-dev,
+               cdbs,
+               debhelper (>= 8),
+               gawk,
+               libatspi-dev,
+               libbonobo2-dev,
+               libgtk2.0-dev,
+               openjdk-6-jdk [linux-any],
+               openjdk-7-jdk [kfreebsd-any],
+               pkg-config,
+               x11-utils
+Build-Conflicts: dh-buildinfo
 Standards-Version: 3.9.2
 Homepage: http://live.gnome.org/Java%20Access%20Bridge
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/java-access-bridge
@@ -14,7 +26,7 @@
 Depends: ${misc:Depends}
 Recommends: libaccess-bridge-java-jni
 Description: Java Access Bridge for GNOME
- This module contains the Java Access Bridge for GNOME, 
+ This module contains the Java Access Bridge for GNOME,
  which connects the built-in accessibility support in
  Java Swing apps to the GNOME Accessibility framework,
  specifically the Assistive Technology Service Provider
@@ -22,13 +34,14 @@
 
 Package: libaccess-bridge-java-jni
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libaccess-bridge-java (>= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Java Access Bridge for GNOME (jni bindings)
- This module contains the Java Access Bridge for GNOME, 
+ This module contains the Java Access Bridge for GNOME,
  which connects the built-in accessibility support in
  Java Swing apps to the GNOME Accessibility framework,
  specifically the Assistive Technology Service Provider
  Interface (AT-SPI).
  .
  This package contains the JNI bindings.
-

Deleted: trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install
===================================================================
--- trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install	2011-09-01 21:01:00 UTC (rev 14658)
+++ trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install	2011-09-01 22:25:06 UTC (rev 14659)
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libjava-access-bridge-jni.so* usr/lib/jni/

Added: trunk/java-access-bridge/debian/patches/series
===================================================================
--- trunk/java-access-bridge/debian/patches/series	                        (rev 0)
+++ trunk/java-access-bridge/debian/patches/series	2011-09-01 22:25:06 UTC (rev 14659)
@@ -0,0 +1 @@
+use_accesscontroller_for_javaversion.diff

Added: trunk/java-access-bridge/debian/patches/use_accesscontroller_for_javaversion.diff
===================================================================
--- trunk/java-access-bridge/debian/patches/use_accesscontroller_for_javaversion.diff	                        (rev 0)
+++ trunk/java-access-bridge/debian/patches/use_accesscontroller_for_javaversion.diff	2011-09-01 22:25:06 UTC (rev 14659)
@@ -0,0 +1,27 @@
+Index: b/bridge/org/GNOME/Accessibility/JavaBridge.java
+===================================================================
+--- a/bridge/org/GNOME/Accessibility/JavaBridge.java
++++ b/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 {
+ 
+@@ -389,7 +392,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 " +

Modified: trunk/java-access-bridge/debian/rules
===================================================================
--- trunk/java-access-bridge/debian/rules	2011-09-01 21:01:00 UTC (rev 14658)
+++ trunk/java-access-bridge/debian/rules	2011-09-01 22:25:06 UTC (rev 14659)
@@ -3,11 +3,38 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-export JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Use openjdk-7 by default under kfreebsd
+ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
+  export JAVA_HOME := /usr/lib/jvm/java-1.7.0-openjdk-$(DEB_HOST_ARCH)
+else
+  export JAVA_HOME := /usr/lib/jvm/java-1.6.0-openjdk-$(DEB_HOST_ARCH)
+endif
+
 export PATH      := $(JAVA_HOME)/bin:$(PATH)
 
 DEB_MAKE_BUILD_TARGET := "JAVAC=$(JAVA_HOME)/bin/javac -source 1.5"
 
+common-install-prehook-arch::
+	echo 'debian/tmp/usr/lib/libjava-access-bridge-jni.so* usr/lib/$(DEB_HOST_MULTIARCH)/jni/' \
+	    > debian/libaccess-bridge-java-jni.install
+	echo \
+	  usr/lib/$(DEB_HOST_MULTIARCH)/jni/libjava-access-bridge-jni.so.0 \
+	  usr/lib/jni/libjava-access-bridge-jni.so.0 \
+	  usr/lib/jni/libjava-access-bridge-jni.so.0 \
+	  usr/lib/jni/libjava-access-bridge-jni.so \
+	    > debian/libaccess-bridge-java-jni.links
+
+binary-post-install/libaccess-bridge-java-jni::
+	cd debian/libaccess-bridge-java-jni/usr/share/doc/libaccess-bridge-java-jni \
+	  && rm -f NEWS* README* changelog AUTHORS
+
+clean::
+	rm -f debian/libaccess-bridge-java-jni.install
+	rm -f debian/libaccess-bridge-java-jni.links
+
 get-orig-source:
 	uscan --force-download --rename
 

Added: trunk/java-access-bridge/debian/source/format
===================================================================
--- trunk/java-access-bridge/debian/source/format	                        (rev 0)
+++ trunk/java-access-bridge/debian/source/format	2011-09-01 22:25:06 UTC (rev 14659)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the pkg-java-commits mailing list