[pkg-java] r14679 - trunk/java-access-bridge/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-02 22:19:32 +0000 (Fri, 02 Sep 2011)
New Revision: 14679

Added:
   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:
* Add myself as Uploaders.
  - d/control: Append DEB_HOST_ARCH to java-1.x.y-openjdk
    (Closes: #639951).
* For Multi-Arch add versionned B-D on cdbs (>= 0.4.93)
  and debhelper (>= 8.1.3).
* Use DEB_CONFIGURE_EXTRA_FLAGS to install to the multi-arch directory instead
  of moving files around.

Modified: trunk/java-access-bridge/debian/changelog
===================================================================
--- trunk/java-access-bridge/debian/changelog	2011-09-02 21:26:07 UTC (rev 14678)
+++ trunk/java-access-bridge/debian/changelog	2011-09-02 22:19:32 UTC (rev 14679)
@@ -1,7 +1,5 @@
-java-access-bridge (1.26.2-7) UNRELEASED; urgency=low
+java-access-bridge (1.26.2-7) unstable; urgency=low
 
-  * Team upload.
-  
   [ Niels Thykier ]
   * Bumped debhelper compat to 8.
   * Made the descriptions unique.
@@ -12,17 +10,23 @@
     (Closes: #587566, #600664, #639952).
 
   [ Damien Raude-Morvan ]
+  * Add myself as Uploaders.
   * 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).
+    - d/control: Append DEB_HOST_ARCH to java-1.x.y-openjdk
+      (Closes: #639951).
   * Drop the compat symlinks in /usr/lib/jni, so that the package can be 
     Multi-Arch: same.
+  * For Multi-Arch add versionned B-D on cdbs (>= 0.4.93)
+    and debhelper (>= 8.1.3).
+  * Use DEB_CONFIGURE_EXTRA_FLAGS to install to the multi-arch directory instead
+    of moving files around.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Sep 2011 00:58:20 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 03 Sep 2011 00:04:13 +0200
 
 java-access-bridge (1.26.2-6) unstable; urgency=low
 

Modified: trunk/java-access-bridge/debian/control
===================================================================
--- trunk/java-access-bridge/debian/control	2011-09-02 21:26:07 UTC (rev 14678)
+++ trunk/java-access-bridge/debian/control	2011-09-02 22:19:32 UTC (rev 14679)
@@ -2,11 +2,13 @@
 Section: java
 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>
+Uploaders: Matthias Klose <doko at ubuntu.com>,
+           Torsten Werner <twerner at debian.org>,
+           Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: at-spi (>= 1.8),
                autotools-dev,
-               cdbs,
-               debhelper (>= 8),
+               cdbs (>= 0.4.93),
+               debhelper (>= 8.1.3),
                gawk,
                libatspi-dev,
                libbonobo2-dev,
@@ -33,12 +35,12 @@
  Interface (AT-SPI).
 
 Package: libaccess-bridge-java-jni
+Multi-Arch: same
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libaccess-bridge-java (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Multi-Arch: same
 Description: Java Access Bridge for GNOME (jni bindings)
  This module contains the Java Access Bridge for GNOME,
  which connects the built-in accessibility support in

Added: trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install
===================================================================
--- trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install	                        (rev 0)
+++ trunk/java-access-bridge/debian/libaccess-bridge-java-jni.install	2011-09-02 22:19:32 UTC (rev 14679)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/jni/libjava-access-bridge-jni.so*

Modified: trunk/java-access-bridge/debian/rules
===================================================================
--- trunk/java-access-bridge/debian/rules	2011-09-02 21:26:07 UTC (rev 14678)
+++ trunk/java-access-bridge/debian/rules	2011-09-02 22:19:32 UTC (rev 14679)
@@ -3,9 +3,6 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-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)
@@ -16,18 +13,12 @@
 export PATH      := $(JAVA_HOME)/bin:$(PATH)
 
 DEB_MAKE_BUILD_TARGET := "JAVAC=$(JAVA_HOME)/bin/javac -source 1.5"
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/jni/
 
-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
-
 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
-
 get-orig-source:
 	uscan --force-download --rename