[netty-tcnative] 04/06: Updated the paths in debian/rules according to the code reorganization

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository netty-tcnative.

commit 4bc098445ed0d98f9ed08e827a231b9837f4c410
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 25 00:31:31 2016 +0100

    Updated the paths in debian/rules according to the code reorganization
---
 debian/changelog |  1 +
 debian/rules     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e8727a..d2e03e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ netty-tcnative (1.1.33.Fork14-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Ignore the new *-static modules and build only openssl-dynamic
+    - Updated the paths in debian/rules according to the code reorganization
   * Fixed the build failure when building the architecture dependent package
     only (Closes: #815649)
 
diff --git a/debian/rules b/debian/rules
index 5447df1..bf6157b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,17 +6,17 @@ export DEB_BUILD_HARDENING=1
 	dh $@ --buildsystem=maven
 
 override_dh_auto_build-arch:
-	mkdir -p target/native-build/src
-	cp -Rvp src/main/native-package/* target/native-build/
-	cp -Rvp src/main/c/* target/native-build/src/
-	cp -Rvp debian/native-build/* target/native-build/
-	cd target/native-build/ ; autoreconf --force --install -I m4 ; ./configure ; make
+	mkdir -p openssl-dynamic/target/native-build/src
+	cp -Rvp openssl-dynamic/src/main/native-package/* openssl-dynamic/target/native-build/
+	cp -Rvp openssl-dynamic/src/main/c/* openssl-dynamic/target/native-build/src/
+	cp -Rvp debian/native-build/* openssl-dynamic/target/native-build/
+	cd openssl-dynamic/target/native-build/ ; autoreconf --force --install -I m4 ; ./configure ; make
 
 override_dh_auto_test-arch:
 
 override_dh_auto_install-arch:
-	mv target/native-build/.libs/libnetty-tcnative- at VERSION@.so target/native-build/.libs/libnetty-tcnative.so
-	dh_install -p libnetty-tcnative-jni target/native-build/.libs/libnetty-tcnative.so usr/lib/${DEB_HOST_MULTIARCH}/jni
+	mv openssl-dynamic/target/native-build/.libs/libnetty-tcnative- at VERSION@.so openssl-dynamic/target/native-build/.libs/libnetty-tcnative.so
+	dh_install -p libnetty-tcnative-jni openssl-dynamic/target/native-build/.libs/libnetty-tcnative.so usr/lib/${DEB_HOST_MULTIARCH}/jni
 
 get-orig-source:
 	uscan --download-current-version --force-download --no-symlink

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