Control: tags 1101456 + patch

Dear maintainer,

I've prepared an NMU for javascript-common (versioned as 12+nmu1). The diff
is attached to this message.

Chris

diff -Nru javascript-common-12/debian/changelog javascript-common-12+nmu1/debian/changelog
--- javascript-common-12/debian/changelog	2024-12-08 21:17:31.000000000 +0100
+++ javascript-common-12+nmu1/debian/changelog	2025-05-03 14:12:36.000000000 +0200
@@ -1,3 +1,13 @@
+javascript-common (12+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Make dh_apache2 failures in postinst/preinst non-fatal.
+    (Closes: #1101456)
+  * Correct postinst to use cat instead of echo with multiline
+    mesage.
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sat, 03 May 2025 14:12:36 +0200
+
 javascript-common (12) unstable; urgency=medium
 
   * Team upload.
diff -Nru javascript-common-12/debian/javascript-common.postinst javascript-common-12+nmu1/debian/javascript-common.postinst
--- javascript-common-12/debian/javascript-common.postinst	2024-12-08 21:17:31.000000000 +0100
+++ javascript-common-12+nmu1/debian/javascript-common.postinst	2025-05-03 14:12:36.000000000 +0200
@@ -14,6 +14,13 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+dh_apache2_failed() {
+	cat << EOS
+Updating the apache2 configuration failed. Please check yourself if the
+javascript-common configuration for apache2 is enabled.
+EOS
+}
+
 lighttpd_setup() {
 	mkdir -p /etc/lighttpd/conf-enabled
 	if [ ! -e /etc/lighttpd/conf-enabled/90-javascript-alias.conf ]
diff -Nru javascript-common-12/debian/javascript-common.prerm javascript-common-12+nmu1/debian/javascript-common.prerm
--- javascript-common-12/debian/javascript-common.prerm	2024-12-08 21:17:31.000000000 +0100
+++ javascript-common-12+nmu1/debian/javascript-common.prerm	2025-05-03 14:12:36.000000000 +0200
@@ -14,14 +14,19 @@
 # the debian-policy package
 
 disabled_file_content() {
-	echo << EOS
+	cat << EOS
 This file has been automatically generated by javascript-common during its
 uninstallation in order to keep track that you choose to disabled
 javascript-alias from lighttpd.
 It will disappear if you reinstall javascript-common or if you purge it.
 EOS
 }
-
+dh_apache2_failed() {
+	cat << EOS
+Updating the apache2 configuration failed. Please check yourself if the
+javascript-common configuration for apache2 is enabled.
+EOS
+}
 
 case "${1}" in
 	remove)
diff -Nru javascript-common-12/debian/rules javascript-common-12+nmu1/debian/rules
--- javascript-common-12/debian/rules	2024-12-08 21:17:31.000000000 +0100
+++ javascript-common-12+nmu1/debian/rules	2025-05-03 14:12:28.000000000 +0200
@@ -2,3 +2,7 @@
 
 %:
 	dh ${@} --with apache2
+
+override_dh_apache2:
+	dh_apache2 --error-handler=dh_apache2_failed
+

Reply via email to