[Git][java-team/libapache-mod-jk][master] 3 commits: Fix broken httpd-jk symlink.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / libapache-mod-jk


Commits:
2ac749ae by Markus Koschany at 2018-10-03T11:38:16Z
Fix broken httpd-jk symlink.

Closes: #910160
Thanks: Andreas Beckmann for the report.

- - - - -
e5e1adc4 by Markus Koschany at 2018-10-03T11:39:07Z
Update changelog

- - - - -
c1c89ef4 by Markus Koschany at 2018-10-03T11:44:58Z
Update various occurrences of jk.conf to httpd-jk.conf.

- - - - -


6 changed files:

- debian/changelog
- debian/clean
- debian/copyright
- debian/libapache2-mod-jk.README.Debian
- debian/libapache2-mod-jk.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libapache-mod-jk (1:1.2.44-2) unstable; urgency=medium
+
+  * Fix broken httpd-jk symlink.
+    Thanks to Andreas Beckmann for the report. (Closes: #910160)
+
+ -- Markus Koschany <apo at debian.org>  Wed, 03 Oct 2018 13:38:45 +0200
+
 libapache-mod-jk (1:1.2.44-1) unstable; urgency=medium
 
   * New upstream version 1.2.44.


=====================================
debian/clean
=====================================
@@ -1,4 +1,4 @@
-conf/jk.conf
+conf/httpd-jk.conf
 build/docs/images/add.gif
 build/docs/images/code.gif
 build/docs/images/design.gif


=====================================
debian/copyright
=====================================
@@ -53,7 +53,7 @@ Files: debian/*
 Copyright: 2003,      Stefan Gybas <sgybas at debian.org>
            2009,      Michael Koch <konqueror at gmx.de>
            2011,      Damien Raude-Morvan <drazzib at debian.org>
-           2015-2016, Markus Koschany <apo at debian.org>
+           2015-2018, Markus Koschany <apo at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0


=====================================
debian/libapache2-mod-jk.README.Debian
=====================================
@@ -6,13 +6,13 @@ The documentation can be found in the libapache-mod-jk-doc package.
 
 At install, this module is enabled into existing Apache2 configuration.
 Default configuration is located here :
-  /etc/apache2/mods-available/jk.conf
+  /etc/apache2/mods-available/httpd-jk.conf
 
 One default worker named ajp13_worker, which connects to the localhost on
 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
+By default, no webapp is mounted so you'll have to edit httpd-jk.conf
 to enable, at least, a JkMount directive for you webapp.
 
 Please pay attention to global scope vs VirtualHost when setting JkMount


=====================================
debian/libapache2-mod-jk.links
=====================================
@@ -1 +1 @@
-/etc/apache2/mods-available/jk.conf /etc/libapache2-mod-jk/httpd-jk.conf
+/etc/apache2/mods-available/httpd-jk.conf /etc/libapache2-mod-jk/httpd-jk.conf


=====================================
debian/rules
=====================================
@@ -9,10 +9,6 @@ export DEB_CFLAGS_MAINT_APPEND = -D_LARGEFILE_SUPPORT -D_LARGEFILE64_SOURCE -D_F
 override_dh_auto_configure:
 	dh_auto_configure -- --with-apxs=/usr/bin/apxs2
 
-override_dh_auto_build:
-	dh_auto_build
-	cp conf/httpd-jk.conf conf/jk.conf
-
 override_dh_auto_install:
 ifneq (,$(filter libapache-mod-jk-doc, $(shell dh_listpackages)))
 	cd xdocs && install -d ../build/docs/ && cp -R * ../build/docs/



View it on GitLab: https://salsa.debian.org/java-team/libapache-mod-jk/compare/fd3bb5d38f03fa7fb169768cfc38bee833d6327a...c1c89ef4cd7a74b9df88621db6e7d9754ee7df1c

-- 
View it on GitLab: https://salsa.debian.org/java-team/libapache-mod-jk/compare/fd3bb5d38f03fa7fb169768cfc38bee833d6327a...c1c89ef4cd7a74b9df88621db6e7d9754ee7df1c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181003/040f53d7/attachment.html>