[netty-tcnative-1.1] 01/02: Cloned the package as netty-tcnative-1.1
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jun 21 09:57:16 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository netty-tcnative-1.1.
commit a953b24663e674fb14f91a8b3a12acc6a2f288f6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 21 11:53:47 2017 +0200
Cloned the package as netty-tcnative-1.1
---
debian/changelog | 3 ++-
debian/control | 12 ++++++------
...-tcnative-java.poms => libnetty-tcnative-1.1-java.poms} | 2 +-
debian/maven.rules | 2 +-
debian/patches/01-change-library-name.patch | 14 ++++++++++++++
debian/patches/series | 1 +
debian/rules | 12 ++++++++++--
debian/watch | 3 ++-
8 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6d90db0..f0c5f8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-netty-tcnative (1.1.33.Fork26-2) UNRELEASED; urgency=medium
+netty-tcnative-1.1 (1.1.33.Fork26-2) UNRELEASED; urgency=medium
* Team upload.
+ * Cloned the package as netty-tcnative-1.1
* Removed the unused lintian overrides
-- Emmanuel Bourg <ebourg at apache.org> Wed, 21 Jun 2017 11:05:00 +0200
diff --git a/debian/control b/debian/control
index 9ff1565..04dcec2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: netty-tcnative
+Source: netty-tcnative-1.1
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -13,13 +13,13 @@ Build-Depends: automake,
libtool,
maven-debian-helper (>= 1.5)
Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/netty-tcnative.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/netty-tcnative.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/netty-tcnative-1.1.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/netty-tcnative-1.1.git
Homepage: https://github.com/netty/netty-tcnative/
-Package: libnetty-tcnative-java
+Package: libnetty-tcnative-1.1-java
Architecture: all
-Depends: libnetty-tcnative-jni (>= ${source:Version}),
+Depends: libnetty-tcnative-1.1-jni (>= ${source:Version}),
${maven:Depends},
${misc:Depends}
Suggests: ${maven:OptionalDepends}
@@ -33,7 +33,7 @@ Description: Tomcat native fork for Netty
* Complete mavenization of the project
* Improved OpenSSL support
-Package: libnetty-tcnative-jni
+Package: libnetty-tcnative-1.1-jni
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Tomcat native fork for Netty (JNI library)
diff --git a/debian/libnetty-tcnative-java.poms b/debian/libnetty-tcnative-1.1-java.poms
similarity index 95%
rename from debian/libnetty-tcnative-java.poms
rename to debian/libnetty-tcnative-1.1-java.poms
index 235eda3..04f15c8 100644
--- a/debian/libnetty-tcnative-java.poms
+++ b/debian/libnetty-tcnative-1.1-java.poms
@@ -26,7 +26,7 @@
# Empty by default. [mh_install]
#
pom.xml --no-parent
-openssl-dynamic/pom.xml --has-package-version
+openssl-dynamic/pom.xml --has-package-version --usj-name=netty-tcnative-1.1
openssl-static/pom.xml --ignore
boringssl-static/pom.xml --ignore
libressl-static/pom.xml --ignore
diff --git a/debian/maven.rules b/debian/maven.rules
index 4e5def9..9320a0b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,2 @@
-io.netty netty-tcnative jar s/.*/debian/ * *
+io.netty netty-tcnative* * s/.*/1.x/ * *
diff --git a/debian/patches/01-change-library-name.patch b/debian/patches/01-change-library-name.patch
new file mode 100644
index 0000000..82cefbc
--- /dev/null
+++ b/debian/patches/01-change-library-name.patch
@@ -0,0 +1,14 @@
+Description: Change the name of the native library loaded
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/openssl-dynamic/src/main/java/org/apache/tomcat/jni/Library.java
++++ b/openssl-dynamic/src/main/java/org/apache/tomcat/jni/Library.java
+@@ -26,7 +26,7 @@
+ public final class Library {
+
+ /* Default library names */
+- private static final String [] NAMES = {"netty-tcnative", "libnetty-tcnative", "netty-tcnative-1", "libnetty-tcnative-1"};
++ private static final String [] NAMES = {"netty-tcnative-1.1", "libnetty-tcnative-1.1"};
+ /*
+ * A handle to the unique Library singleton instance.
+ */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e806fe8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-change-library-name.patch
diff --git a/debian/rules b/debian/rules
index b6958ae..d11e3c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,17 @@ override_dh_auto_build-arch:
override_dh_auto_test-arch:
+override_dh_auto_install-indep:
+ dh_auto_install -i
+
+ # keep only the generic artifacts to make the package co-installable with libnetty-tcnative-java
+ rm -Rf debian/libnetty-tcnative-1.1-java/usr/share/maven-repo/io/netty/netty-tcnative/1.1.33*
+ rm -Rf debian/libnetty-tcnative-1.1-java/usr/share/maven-repo/io/netty/netty-tcnative-parent/1.1.33*
+ rm debian/libnetty-tcnative-1.1-java/usr/share/java/netty-tcnative-1.1-*.jar
+
override_dh_auto_install-arch:
- 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
+ mv openssl-dynamic/target/native-build/.libs/libnetty-tcnative- at VERSION@.so openssl-dynamic/target/native-build/.libs/libnetty-tcnative-1.1.so
+ dh_install -p libnetty-tcnative-1.1-jni openssl-dynamic/target/native-build/.libs/libnetty-tcnative-1.1.so usr/lib/${DEB_HOST_MULTIARCH}/jni
get-orig-source:
uscan --download-current-version --force-download --no-symlink
diff --git a/debian/watch b/debian/watch
index e9afd47..985bd0b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-https://github.com/netty/netty-tcnative/tags .*/netty-tcnative-(?:parent-)?(.*).tar.gz
+opts="mode=git,repack,compression=xz" \
+https://github.com/netty/netty-tcnative refs/tags/netty-tcnative-(?:parent-)?(1\.1\..*)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative-1.1.git
More information about the pkg-java-commits
mailing list