[snappy-java] 01/03: libsnappy-jni can now be built independently of libsnappy-java (Closes: #780316)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository snappy-java.

commit 45fe7dce776b19e36f06c9c99cc0f57e5207dd0d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 12 16:27:22 2015 +0100

    libsnappy-jni can now be built independently of libsnappy-java (Closes: #780316)
---
 debian/changelog | 8 ++++++++
 debian/rules     | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04ff188..05d87b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+snappy-java (1.1.1.6-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * libsnappy-jni can now be built independently of libsnappy-java
+    (Closes: #780316)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 12 Mar 2015 16:08:22 +0100
+
 snappy-java (1.1.1.6-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index fc49ae9..1d1b0a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,9 @@ override_dh_auto_configure:
 	sed -i 's/%VERSION%/$(DEB_UPSTREAM_VERSION)/g' pom.xml
 	dh_auto_configure
 
-override_dh_auto_build:
-	dh_auto_build
-
+override_dh_auto_build-arch:
 	# Build the JNI bindings
+	mkdir -p target
 	gcc $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
 	    -I$(JAVA_HOME)/include/ \
 	    -I$(JAVA_HOME)/include/linux \
@@ -26,9 +25,11 @@ override_dh_auto_build:
 	    -o target/libsnappyjava.so \
 	    src/main/java/org/xerial/snappy/SnappyNative.cpp
 
-override_dh_auto_install:
+override_dh_auto_install-indep:
 	dh_auto_install
 	dh_installchangelogs -plibsnappy-java Milestone.md
+
+override_dh_auto_install-arch:
 	dh_install -plibsnappy-jni target/*.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
 
 override_dh_auto_clean:

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