[gdal] 13/15: Install JNI libraries in /usr/lib/jni instead of /usr/lib.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch experimental
in repository gdal.

commit 0dad2774e226201d24808cff16706e6eee01d5c6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 3 13:59:37 2014 +0200

    Install JNI libraries in /usr/lib/jni instead of /usr/lib.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cd8c31c..a4daa6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ gdal (1.11.0+dfsg-1) UNRELEASED; urgency=low
     ogrsxfdatasource.cpp.
   * Add patch to fix 'recommended' typo.
   * Update typo patches.
+  * Install JNI libraries in /usr/lib/jni instead of /usr/lib.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 30 Apr 2014 20:10:05 +0200
 
diff --git a/debian/rules b/debian/rules
index ed603fb..275e5c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -164,7 +164,7 @@ override_dh_auto_install:
 	# java stuff
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/java $(CURDIR)/debian/tmp/usr/lib/jni
 	install -o root -g root -m 644 $(CURDIR)/swig/java/gdal.jar $(CURDIR)/debian/tmp/usr/share/java/.
-	install -o root -g root -m 644 $(CURDIR)/swig/java/*jni.so* $(CURDIR)/debian/tmp/usr/lib/jni
+	install -o root -g root -m 644 $(CURDIR)/debian/tmp/usr/lib/*jni.so* $(CURDIR)/debian/tmp/usr/lib/jni
 
 	# removing useless autogenerated man pages
 	rm -f $(CURDIR)/debian/tmp/usr/share/man/man1/_*_apps_.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git