[Git][java-team/libapache-mod-jk][master] 2 commits: Rename httpd-jk.conf to jk.conf to restore compatibility with Debian's Apache

[Markus Koschany]

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


Commits:
f8d4df27 by Markus Koschany at 2020-05-27T19:15:17+02:00
Rename httpd-jk.conf to jk.conf to restore compatibility with Debian's Apache

helpers a2enmod and a2dismod.

Closes: #928813

- - - - -
b63d4463 by Markus Koschany at 2020-05-27T19:20:32+02:00
Update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/libapache2-mod-jk.install
- debian/libapache2-mod-jk.links
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libapache-mod-jk (1:1.2.46-2) unstable; urgency=medium
+
+  * Rename httpd-jk.conf to jk.conf to restore compatibility with Debian's
+    Apache helpers a2enmod and a2dismod. (Closes: #928813)
+
+ -- Markus Koschany <apo at debian.org>  Wed, 27 May 2020 19:19:20 +0200
+
 libapache-mod-jk (1:1.2.46-1) unstable; urgency=medium
 
   * New upstream version 1.2.46.


=====================================
debian/libapache2-mod-jk.install
=====================================
@@ -1,4 +1,4 @@
-conf/httpd-jk.conf           /etc/apache2/mods-available/
+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/


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


=====================================
debian/rules
=====================================
@@ -24,5 +24,9 @@ override_dh_compress:
 # No check target
 override_dh_auto_test:
 
+override_dh_install:
+	mv $(CURDIR)/conf/httpd-jk.conf $(CURDIR)/conf/jk.conf
+	dh_install
+
 get-orig-source:
 	uscan --verbose --download-current-version --force-download



View it on GitLab: https://salsa.debian.org/java-team/libapache-mod-jk/-/compare/725efd8afab8adfce65ceb104446c217b3a42766...b63d44630e6ca8640b9ce9572fafb41343560fed

-- 
View it on GitLab: https://salsa.debian.org/java-team/libapache-mod-jk/-/compare/725efd8afab8adfce65ceb104446c217b3a42766...b63d44630e6ca8640b9ce9572fafb41343560fed
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/20200527/16d85d98/attachment.html>