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

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-01 22:59:01 +0000 (Thu, 01 Sep 2011)
New Revision: 14660

Modified:
   trunk/java-access-bridge/debian/changelog
   trunk/java-access-bridge/debian/control
   trunk/java-access-bridge/debian/rules
Log:
Drop the compat symlinks in /usr/lib/jni, so that the package can be 
Multi-Arch: same.

Modified: trunk/java-access-bridge/debian/changelog
===================================================================
--- trunk/java-access-bridge/debian/changelog	2011-09-01 22:25:06 UTC (rev 14659)
+++ trunk/java-access-bridge/debian/changelog	2011-09-01 22:59:01 UTC (rev 14660)
@@ -19,8 +19,10 @@
     - 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).
+  * Drop the compat symlinks in /usr/lib/jni, so that the package can be 
+    Multi-Arch: same.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Sep 2011 00:03:48 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 02 Sep 2011 00:58:20 +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-01 22:25:06 UTC (rev 14659)
+++ trunk/java-access-bridge/debian/control	2011-09-01 22:59:01 UTC (rev 14660)
@@ -34,9 +34,11 @@
 
 Package: libaccess-bridge-java-jni
 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

Modified: trunk/java-access-bridge/debian/rules
===================================================================
--- trunk/java-access-bridge/debian/rules	2011-09-01 22:25:06 UTC (rev 14659)
+++ trunk/java-access-bridge/debian/rules	2011-09-01 22:59:01 UTC (rev 14660)
@@ -20,12 +20,6 @@
 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 \
@@ -33,7 +27,6 @@
 
 clean::
 	rm -f debian/libaccess-bridge-java-jni.install
-	rm -f debian/libaccess-bridge-java-jni.links
 
 get-orig-source:
 	uscan --force-download --rename