Fixed and overrode linda and lintian warnings as appropriate.

diff --git a/debian/changelog b/debian/changelog
index 5ebe1b4677a17b933e2186ba4ac15bfc0292b477..7013be653c310f7a34a19c981b3f2b8f2021da5b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+memories (1.2-3) unstable; urgency=low
+
+  * Fixed and overrode linda and lintian warnings as appropriate
+
+ -- Ben Hutchings <ben@decadentplace.org.uk>  Sat, 18 Feb 2006 19:20:55 +0000
+
 memories (1.2-2) unstable; urgency=low
 
   * Added missing dependencies

diff --git a/debian/linda-overrides b/debian/linda-overrides
new file mode 100644 (file)
index 0000000..b288e9f
--- /dev/null
+++ b/debian/linda-overrides
@@ -0,0 +1,3 @@
+# We use non-standard dir permissions to keep session information private.
+Tag: non-standard-dir-perm
+Data: var/lib/memories/session(lock|s)

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644 (file)
index 0000000..080fa07
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,3 @@
+# We use non-standard dir permissions to keep session information private.
+memories binary: non-standard-dir-perm var/lib/memories/sessions/ 0770 != 0755
+memories binary: non-standard-dir-perm var/lib/memories/sessionlock/ 0770 != 0755

diff --git a/debian/memories.postinst b/debian/memories.postinst
index 5393e1b56046c303276e435a2713bac315d1a245..c64a337a0f911c01344a4460e5afadd2ce0529ab 100755 (executable)
--- a/debian/memories.postinst
+++ b/debian/memories.postinst
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+#DEBHELPER#
+
 if [ "x$1" = xconfigure ]; then
 
     # Install our configuration fragment and make Apache load it

diff --git a/debian/memories.postrm b/debian/memories.postrm
index 0d3c14fb01b4d27cf76724390a52fbe19013f141..823999cc35811ec74c47f3ef55e02c4ddf33ec1c 100755 (executable)
--- a/debian/memories.postrm
+++ b/debian/memories.postrm
@@ -9,3 +9,5 @@ if [ "x$1" = xremove -o "x$1" = xpurge ]; then
         fi
     done
 fi
+
+#DEBHELPER#

diff --git a/debian/rules b/debian/rules
index 5a72f843ac85f198b5f4e8e1f55af439e070ff64..5a8e7f51f87d24dd999823ff91ad68ec1a5a61bd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,10 @@ binary-indep :
        install -m 644 memories.sql tag_dates debian/memories/usr/share/memories/
        install -d debian/memories/var/lib/memories
        install -d -o www-data -g www-data -m 770 debian/memories/var/lib/memories/sessions debian/memories/var/lib/memories/sessionlock
+       install -d debian/memories/usr/share/linda/overrides
+       install -m 644 debian/linda-overrides debian/memories/usr/share/linda/overrides/memories
+       install -d debian/memories/usr/share/lintian/overrides
+       install -m 644 debian/lintian-overrides debian/memories/usr/share/lintian/overrides/memories
        dh_perl
        dh_installchangelogs Changes
        dh_installdocs README