summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2016-09-29 12:23:24 +0200
committerRaphaël Hertzog <hertzog@debian.org>2016-09-29 12:23:24 +0200
commit79fb6d3a71632e7003a325509a428e3b27b5da0e (patch)
treef3a9b39fb7103c8e6acc6d9594c4e1d9f6952b97
parent1519e7ae43ce63b2128dc02059fe57cbcab18ac8 (diff)
downloadapache2-79fb6d3a71632e7003a325509a428e3b27b5da0e.tar.gz
Add some lintian overrides for non-problems
* two update-rc.d calls in postinst * a .js file with a very long line
-rw-r--r--debian/apache2.lintian-overrides3
-rw-r--r--debian/changelog2
-rw-r--r--debian/source/lintian-overrides2
3 files changed, 7 insertions, 0 deletions
diff --git a/debian/apache2.lintian-overrides b/debian/apache2.lintian-overrides
index c9ec6574..4b539722 100644
--- a/debian/apache2.lintian-overrides
+++ b/debian/apache2.lintian-overrides
@@ -7,3 +7,6 @@ package-contains-empty-directory usr/lib/cgi-bin/
# Apache uses var/www/html/ as a new default document root
# See #730372 and https://lists.debian.org/debian-devel/2012/04/msg00301.html
apache2: dir-or-file-in-var-www var/www/html/
+# Second update-rc.d call is to disable the service
+duplicate-updaterc.d-calls-in-postinst apache-htcacheclean
+
diff --git a/debian/changelog b/debian/changelog
index 1b2537ec..983d147a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ apache2 (2.4.23-5) unstable; urgency=low
* Modify handling of /etc/init.d/apache-htcacheclean to have a usual
Default-Start value but instead we disable it manually in the postinst.
That way "systemctl enable apache-htcacheclean" works.
+ * Add some lintian overrides for non-problems (two update-rc.d calls in
+ postinst, and a .js file with a very long line).
-- Raphaël Hertzog <hertzog@debian.org> Thu, 29 Sep 2016 12:03:31 +0200
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 00000000..7a5861a8
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Even though one line is very long, it's still hand-editable source code
+source-is-missing docs/manual/style/scripts/prettify.js