[pkg-java] r17141 - in trunk/tomcat-native/debian: . patches

Tue Aug 13 08:47:12 UTC 2013

Author: drazzib
Date: 2013-08-13 08:47:11 +0000 (Tue, 13 Aug 2013)
New Revision: 17141

Modified:
   trunk/tomcat-native/debian/changelog
   trunk/tomcat-native/debian/compat
   trunk/tomcat-native/debian/control
   trunk/tomcat-native/debian/copyright
   trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
   trunk/tomcat-native/debian/rules
Log:
* New upstream release.
* Merge Gianfranco Costamagna work:
  - d/control: Bump Standards-Version to 3.9.4.
  - d/{control,compat}: Bump debhelper to 9.
* d/control: Update Vcs-* fields with canonical URL.
* d/copyright: Fix small issue in DEP-5 format.
* Switch to dh7:
  - d/rules: Upgrade to dh call
  - d/control: Drop B-D on cdbs.
* Install in Multi-Arch location:
  - d/control: Add Pre-Depends and Multi-Arch fields

Modified: trunk/tomcat-native/debian/changelog
===================================================================

--- trunk/tomcat-native/debian/changelog	2013-08-12 09:14:39 UTC (rev 17140)
+++ trunk/tomcat-native/debian/changelog	2013-08-13 08:47:11 UTC (rev 17141)
@@ -1,3 +1,19 @@
+tomcat-native (1.1.27-1) unstable; urgency=low
+
+  * New upstream release.
+  * Merge Gianfranco Costamagna work:
+    - d/control: Bump Standards-Version to 3.9.4.
+    - d/{control,compat}: Bump debhelper to 9.
+  * d/control: Update Vcs-* fields with canonical URL.
+  * d/copyright: Fix small issue in DEP-5 format.
+  * Switch to dh7:
+    - d/rules: Upgrade to dh call
+    - d/control: Drop B-D on cdbs.
+  * Install in Multi-Arch location:
+    - d/control: Add Pre-Depends and Multi-Arch fields
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 12 Aug 2013 16:11:30 +0200
+
 tomcat-native (1.1.24-1) unstable; urgency=low
 
   * Team upload.

Modified: trunk/tomcat-native/debian/compat
===================================================================
--- trunk/tomcat-native/debian/compat	2013-08-12 09:14:39 UTC (rev 17140)
+++ trunk/tomcat-native/debian/compat	2013-08-13 08:47:11 UTC (rev 17141)
@@ -1 +1 @@
-7
+9

Modified: trunk/tomcat-native/debian/control
===================================================================
--- trunk/tomcat-native/debian/control	2013-08-12 09:14:39 UTC (rev 17140)
+++ trunk/tomcat-native/debian/control	2013-08-13 08:47:11 UTC (rev 17141)
@@ -3,20 +3,21 @@
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                dpkg-dev (>= 1.16.1~),
                libapr1-dev,
                libssl-dev
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tomcat-native/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat-native/
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/tomcat-native/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/tomcat-native/
 Homepage: http://tomcat.apache.org/native-doc/
 
 Package: libtcnative-1
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: Tomcat native library using the apache portable runtime
  Tomcat can use the Apache Portable Runtime to provide superior scalability,
  performance, and better integration with native server technologies.

Modified: trunk/tomcat-native/debian/copyright
===================================================================
--- trunk/tomcat-native/debian/copyright	2013-08-12 09:14:39 UTC (rev 17140)
+++ trunk/tomcat-native/debian/copyright	2013-08-13 08:47:11 UTC (rev 17141)
@@ -8,8 +8,8 @@
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2008-2009, Michael Koch <konqueror at gmx.de>
-Copyright: 2010-2011, Damien Raude-Morvan
+Copyright: 2008-2009, Michael Koch <konqueror at gmx.de>,
+ 2010-2013, Damien Raude-Morvan <drazzib at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0

Modified: trunk/tomcat-native/debian/patches/drop_sslv2_support.diff
===================================================================
--- trunk/tomcat-native/debian/patches/drop_sslv2_support.diff	2013-08-12 09:14:39 UTC (rev 17140)
+++ trunk/tomcat-native/debian/patches/drop_sslv2_support.diff	2013-08-13 08:47:11 UTC (rev 17141)
@@ -1,7 +1,7 @@
 Description: Drop all support for SSLv2 protocol since it's use has been
  deprecated, because of weaknesses in the security of the protocol.
 Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-08-12
+Last-Update: 2013-08-12
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622141
 Forwarded: https://issues.apache.org/bugzilla/show_bug.cgi?id=51056
 --- a/jni/examples/org/apache/tomcat/jni/SSL.properties
@@ -28,18 +28,14 @@
              /* Load Server key and certificate */
 --- a/jni/java/org/apache/tomcat/jni/SSL.java
 +++ b/jni/java/org/apache/tomcat/jni/SSL.java
-@@ -70,10 +70,9 @@
+@@ -68,7 +68,6 @@
       * Define the SSL Protocol options
       */
      public static final int SSL_PROTOCOL_NONE  = 0;
 -    public static final int SSL_PROTOCOL_SSLV2 = (1<<0);
      public static final int SSL_PROTOCOL_SSLV3 = (1<<1);
      public static final int SSL_PROTOCOL_TLSV1 = (1<<2);
--    public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_SSLV2|SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1);
-+    public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1);
- 
-     /*
-      * Define the SSL verify levels
+     public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_SSLV3|SSL_PROTOCOL_TLSV1);
 --- a/jni/java/org/apache/tomcat/jni/SSLContext.java
 +++ b/jni/java/org/apache/tomcat/jni/SSLContext.java
 @@ -31,9 +31,7 @@
@@ -54,7 +50,7 @@
       * </PRE>
 --- a/jni/native/include/ssl_private.h
 +++ b/jni/native/include/ssl_private.h
-@@ -114,10 +114,9 @@
+@@ -113,10 +113,9 @@
   * Define the SSL Protocol options
   */
  #define SSL_PROTOCOL_NONE       (0)

Modified: trunk/tomcat-native/debian/rules
===================================================================
--- trunk/tomcat-native/debian/rules	2013-08-12 09:14:39 UTC (rev 17140)
+++ trunk/tomcat-native/debian/rules	2013-08-13 08:47:11 UTC (rev 17141)
@@ -1,25 +1,27 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+%:
+	dh $@ --sourcedirectory=jni/native
 
-DEB_SRCDIR := jni/native
+override_dh_auto_configure:
+	JAVA_HOME=/usr/lib/jvm/default-java \
+	dh_auto_configure -- --with-apr=/usr --with-ssl=/usr
+  
+DEB_INSTALL_CHANGELOGS_libtcnative_1 := CHANGELOG.txt
 
-DEB_CONFIGURE_SCRIPT_ENV := JAVA_HOME=/usr/lib/jvm/default-java
-DEB_CONFIGURE_EXTRA_FLAGS := --with-apr=/usr --with-ssl=/usr
 
-DEB_INSTALL_CHANGELOGS_libtcnative_1 := CHANGELOG.txt
-
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -f jni/native/config.nice
 
-install/libtcnative-1::
+override_dh_auto_install:
+	dh_auto_install
 	rmdir debian/libtcnative-1/usr/bin
 	rmdir debian/libtcnative-1/usr/include
 	find $(DEB_DESTDIR) -name "*.la" -exec rm -vf {} \;
 
+# No check target
+override_dh_auto_test:
+
 get-orig-source:
 	uscan --force-download --rename


