This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository libapache-mod-jk.
commit 77d2f6186c3ae49abeda0c83afa7ff6d61b7b47d Author: Markus Koschany <[email protected]> Date: Fri Oct 30 23:27:06 2015 +0000 New upstream release 1.2.41-1 --- debian/README.source | 7 --- debian/changelog | 17 ++++++ debian/clean | 96 ++++++++++++++++++++++++++++++ debian/control | 36 ++++++----- debian/copyright | 46 +++++++++++++- debian/libapache2-mod-jk.NEWS | 4 +- debian/libapache2-mod-jk.README.Debian | 2 +- debian/libapache2-mod-jk.install | 8 +-- debian/patches/disable-libtool-check.patch | 54 ----------------- debian/patches/series | 1 - debian/rules | 47 +-------------- 11 files changed, 188 insertions(+), 130 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 36c0d91..0000000 --- a/debian/README.source +++ /dev/null @@ -1,7 +0,0 @@ -libapache-mod-jk for Debian -=========================== - -Steps to retrieve the upstream sources of this package. - -1. svn export -r 1680946 https://svn.apache.org/repos/asf/tomcat/jk/trunk/ -2. Change JK_VERISRELEASE to 1 in native/common/jk_version.h diff --git a/debian/changelog b/debian/changelog index efe0674..8a7ba5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +libapache-mod-jk (1:1.2.41-1) unstable; urgency=medium + + * Team upload. + * Imported Upstream version 1.2.41. + * Drop README.source. We use regular upstream releases again. + * Update get-orig-source target. Use --verbose and --download-current-version + flags. + * Drop disable-libtool-check.patch. Not required for normal releases. + * Vcs-Browser: Use https. + * Remove autoconf and automake from Build-Depends again. + * Run wrap-and-sort -sa. + * Add clean file and ensure libapache-mod-jk can be built twice in a row. + * debian/rules: Remove override for dh_auto_clean. + * Update debian/copyright for new release. + + -- Markus Koschany <[email protected]> Fri, 30 Oct 2015 22:33:34 +0100 + libapache-mod-jk (1:1.2.40+svn150520-1) unstable; urgency=high * Team upload. diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..a57244c --- /dev/null +++ b/debian/clean @@ -0,0 +1,96 @@ +conf/jk.conf +build/docs/images/add.gif +build/docs/images/code.gif +build/docs/images/design.gif +build/docs/images/docs.gif +build/docs/images/fix.gif +build/docs/images/jakarta-logo.gif +build/docs/images/printer.gif +build/docs/images/tomcat.gif +build/docs/images/update.gif +build/docs/images/void.gif +native/apache-2.0/mod_jk.a +native/apache-2.0/mod_jk.o +native/apache-2.0/mod_jk.so +native/common/.libs/* +native/apache-2.0/.libs/* +native/common/*.o +build/docs/ajp/ajpv13a.html +build/docs/ajp/ajpv13ext.html +build/docs/ajp/project.html +build/docs/build.html +build/docs/changelog +build/docs/common_howto/loadbalancers.html +build/docs/common_howto/project.html +build/docs/common_howto/proxy.html +build/docs/common_howto/quick.html +build/docs/common_howto/timeouts.html +build/docs/common_howto/workers.html +build/docs/empty.html +build/docs/index.html +build/docs/miscellaneous/changelog.html +build/docs/miscellaneous/doccontrib.html +build/docs/miscellaneous/faq.html +build/docs/miscellaneous/jkstatustasks.html +build/docs/miscellaneous/project.html +build/docs/miscellaneous/reporttools.html +build/docs/news/20041100.html +build/docs/news/20050101.html +build/docs/news/20060101.html +build/docs/news/20070301.html +build/docs/news/20081001.html +build/docs/news/20090301.html +build/docs/news/20100101.html +build/docs/news/20110701.html +build/docs/news/20120301.html +build/docs/news/20140201.html +build/docs/news/20150101.html +build/docs/news/project.html +build/docs/project.html +build/docs/reference/apache.html +build/docs/reference/iis.html +build/docs/reference/project.html +build/docs/reference/status.html +build/docs/reference/uriworkermap.html +build/docs/reference/workers.html +build/docs/style.css +build/docs/webserver_howto/apache.html +build/docs/webserver_howto/iis.html +build/docs/webserver_howto/nes.html +build/docs/webserver_howto/project.html +native/Makefile +native/apache-1.3/Makefile +native/apache-1.3/Makefile.apxs +native/apache-2.0/Makefile +native/apache-2.0/Makefile.apxs +native/apache-2.0/mod_jk.la +native/apache-2.0/mod_jk.lo +native/common/Makefile +native/common/config.h +native/common/jk_ajp12_worker.lo +native/common/jk_ajp13.lo +native/common/jk_ajp13_worker.lo +native/common/jk_ajp14.lo +native/common/jk_ajp14_worker.lo +native/common/jk_ajp_common.lo +native/common/jk_connect.lo +native/common/jk_context.lo +native/common/jk_lb_worker.lo +native/common/jk_map.lo +native/common/jk_md5.lo +native/common/jk_msg_buff.lo +native/common/jk_pool.lo +native/common/jk_shm.lo +native/common/jk_sockbuf.lo +native/common/jk_status.lo +native/common/jk_types.h +native/common/jk_uri_worker_map.lo +native/common/jk_url.lo +native/common/jk_util.lo +native/common/jk_worker.lo +native/common/list.mk +native/common/stamp-h1 +native/config.log +native/config.nice +native/config.status +native/libtool diff --git a/debian/control b/debian/control index 1a1fd03..831e84d 100644 --- a/debian/control +++ b/debian/control @@ -2,24 +2,30 @@ Source: libapache-mod-jk Section: httpd Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: apache2-dev, - autoconf, - automake, - autotools-dev, - debhelper (>= 9), - dh-apache2, - libtool -Build-Depends-Indep: lynx, xsltproc +Uploaders: + Damien Raude-Morvan <[email protected]> +Build-Depends: + apache2-dev, + autotools-dev, + debhelper (>= 9), + dh-apache2, + libtool +Build-Depends-Indep: + lynx, + xsltproc Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libapache-mod-jk -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-mod-jk +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-mod-jk Homepage: http://tomcat.apache.org Package: libapache2-mod-jk Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Suggests: libapache-mod-jk-doc, tomcat8 +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Suggests: + libapache-mod-jk-doc, + tomcat8 Description: Apache 2 connector for the Tomcat Java servlet engine Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages (JSP) specification from the Apache Jakarta project. @@ -31,8 +37,10 @@ Description: Apache 2 connector for the Tomcat Java servlet engine Package: libapache-mod-jk-doc Architecture: all Section: doc -Depends: ${misc:Depends} -Suggests: libapache2-mod-jk +Depends: + ${misc:Depends} +Suggests: + libapache2-mod-jk Description: Documentation of libapache2-mod-jk package Documentation and examples of the Apache jk connector for the Tomcat Java servlet engine. diff --git a/debian/copyright b/debian/copyright index af902ea..0b4c07a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,11 +11,49 @@ Files: native/iis/pcre/* Copyright: 1997-2004, University of Cambridge License: BSD-3-clause +Files: native/scripts/build/unix/ltmain.sh + native/scripts/build/unix/missing + native/scripts/build/unix/compile + native/aclocal.m4 +Copyright: 1996-2013 Free Software Foundation, Inc. +License: GPL-2+ + +Files: native/scripts/build/unix/config.guess + native/scripts/build/unix/config.sub +Copyright: 1992-2014 Free Software Foundation, Inc. +License: GPL-3+ + +Files: native/scripts/build/unix/install-sh +Copyright: 1994, X Consortium +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + + Files: debian/* Copyright: 2003, Stefan Gybas <[email protected]> 2009, Michael Koch <[email protected]> 2011, Damien Raude-Morvan <[email protected]> - 2015, Markus Koschany <[email protected]> + 2015, Markus Koschany <[email protected]> License: Apache-2.0 License: Apache-2.0 @@ -49,4 +87,10 @@ License: BSD-3-clause ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: GPL-2+ + On Debian systems, the full text of the GNU General Public license 2 + can be found in the file '/usr/share/common-licenses/GPL-2 +License: GPL-3+ + On Debian systems, the full text of the GNU General Public license 3 + can be found in the file '/usr/share/common-licenses/GPL-3 diff --git a/debian/libapache2-mod-jk.NEWS b/debian/libapache2-mod-jk.NEWS index c76356b..1bdf780 100644 --- a/debian/libapache2-mod-jk.NEWS +++ b/debian/libapache2-mod-jk.NEWS @@ -30,7 +30,7 @@ libapache2-mod-jk (1:1.2.14.1-1) unstable; urgency=low the archive. Its recommended to switch to this package. Due to building packages - for Apache 1.3 and 2 the documentation is now packaged separately - (libapache-mod-jk-doc). + for Apache 1.3 and 2 the documentation is now packaged separately + (libapache-mod-jk-doc). -- Wolfgang Baer <[email protected]> Thu, 23 Jun 2005 22:42:54 +0200 diff --git a/debian/libapache2-mod-jk.README.Debian b/debian/libapache2-mod-jk.README.Debian index 8cf16b9..f9c6215 100644 --- a/debian/libapache2-mod-jk.README.Debian +++ b/debian/libapache2-mod-jk.README.Debian @@ -13,7 +13,7 @@ port 8009, is configured. If you need more workers or want to connect to a remote tomcat you have to modify the workers.properties file. By default, no webapp is mounted so you'll have to edit jk.conf -to enable, at least, a JkMount directive for you webapp. +to enable, at least, a JkMount directive for you webapp. Please pay attention to global scope vs VirtualHost when setting JkMount (see #460398) as, by default, no mounts will be inherited from the diff --git a/debian/libapache2-mod-jk.install b/debian/libapache2-mod-jk.install index e982abe..6ef6e11 100644 --- a/debian/libapache2-mod-jk.install +++ b/debian/libapache2-mod-jk.install @@ -1,4 +1,4 @@ -conf/jk.conf /etc/apache2/mods-available/ -debian/jk.load /etc/apache2/mods-available/ -debian/workers.properties /etc/libapache2-mod-jk/ -native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/ +conf/jk.conf /etc/apache2/mods-available/ +debian/jk.load /etc/apache2/mods-available/ +debian/workers.properties /etc/libapache2-mod-jk/ +native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/ diff --git a/debian/patches/disable-libtool-check.patch b/debian/patches/disable-libtool-check.patch deleted file mode 100644 index db8595a..0000000 --- a/debian/patches/disable-libtool-check.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Thu, 21 May 2015 17:10:30 +0200 -Subject: disable libtool check - -Disable libtool check for SVN builds. This patch can be removed with the next -official release. - -Forwarded: not-needed ---- - native/scripts/build/unix/buildcheck.sh | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -diff --git a/native/scripts/build/unix/buildcheck.sh b/native/scripts/build/unix/buildcheck.sh -index db119a7..9b67052 100755 ---- a/native/scripts/build/unix/buildcheck.sh -+++ b/native/scripts/build/unix/buildcheck.sh -@@ -35,21 +35,21 @@ else - echo "buildconf: autoconf version $ac_version (ok)" - fi - --ac_version=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/(.*//;q'` --if test -z "$ac_version"; then --echo "buildconf: libtool not found." --echo " You need libtool version 1.4 or newer installed" --echo " to build mod_jk from SVN." --exit 1 --fi --IFS=.; set $ac_version; IFS=' ' --if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then --echo "buildconf: libtool version $ac_version found." --echo " You need libtool version 1.4 or newer installed" --echo " to build mod_jk from SVN." --exit 1 --else --echo "buildconf: libtool version $ac_version (ok)" --fi -+#ac_version=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/(.*//;q'` -+#if test -z "$ac_version"; then -+#echo "buildconf: libtool not found." -+#echo " You need libtool version 1.4 or newer installed" -+#echo " to build mod_jk from SVN." -+#exit 1 -+#fi -+#IFS=.; set $ac_version; IFS=' ' -+#if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then -+#echo "buildconf: libtool version $ac_version found." -+#echo " You need libtool version 1.4 or newer installed" -+#echo " to build mod_jk from SVN." -+#exit 1 -+#else -+#echo "buildconf: libtool version $ac_version (ok)" -+#fi - - exit 0 diff --git a/debian/patches/series b/debian/patches/series index a8bb2f8..cb4453d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 0001-disable-logo.patch 0002-debianize-log-directory.patch 0003-upgrade-info-to-error-message.patch -disable-libtool-check.patch fix-privacy-breach.patch diff --git a/debian/rules b/debian/rules index 760a3a6..ac77a31 100755 --- a/debian/rules +++ b/debian/rules @@ -7,57 +7,12 @@ export DEB_CFLAGS_MAINT_APPEND = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_F dh $@ --with autotools_dev,apache2 --sourcedirectory=native override_dh_auto_configure: - # Run buildconf.sh before configure step. Only needed for building SVN - # snapshots - cd native && ./buildconf.sh dh_auto_configure -- --with-apxs=/usr/bin/apxs2 - #sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native/common/Makefile override_dh_auto_build: dh_auto_build cp conf/httpd-jk.conf conf/jk.conf -override_dh_auto_clean: - rm -f conf/jk.conf - # ac_config_files - rm -f Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs \ - apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile \ - common/list.mk common/jk_types.h jni/Makefile - # MAINTAINERCLEANFILES - rm -f native/config.status - rm -f native/config.log - rm -f native/config.cache - rm -f native/common/*.o - rm -f native/common/*.lo - rm -f native/apache-2.0/mod_jk.a - rm -f native/apache-2.0/mod_jk.so* - rm -f native/apache-2.0/mod_jk.o - rm -f native/apache-2.0/mod_jk.lo - rm -f native/apache-2.0/mod_jk.la - rm -rf build/docs/ - rm -rf native/apache-2.0/.libs native/common/.libs - rm -f native/Makefile - rm -f native/Makefile.in - rm -f native/aclocal.m4 - rm -f native/apache-1.3/Makefile - rm -f native/apache-1.3/Makefile.apxs - rm -f native/apache-2.0/Makefile - rm -f native/apache-2.0/Makefile.apxs - rm -f native/common/Makefile - rm -f native/common/config.h - rm -f native/common/config.h.in - rm -f native/common/jk_types.h - rm -f native/common/list.mk - rm -f native/common/stamp-h1 - rm -f native/config.nice - rm -f native/configure - rm -f native/libtool - rm -f native/scripts/build/unix/compile - rm -f native/scripts/build/unix/install-sh - rm -f native/scripts/build/unix/ltmain.sh - rm -f native/scripts/build/unix/missing - - override_dh_auto_install: ifneq (,$(filter libapache-mod-jk-doc, $(shell dh_listpackages))) cd xdocs && install -d ../build/docs/ && cp -R * ../build/docs/ @@ -74,4 +29,4 @@ override_dh_compress: override_dh_auto_test: get-orig-source: - uscan --force-download --rename + uscan --verbose --download-current-version --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
