Fix lintian errors

* Fix lintian errors:
    - Update LSB header for tids init script
    - Make tids wrapper executable
    - Override things lintian gets wrong

diff --git a/debian/changelog b/debian/changelog
index f183c8f..dac8a99 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+moonshot-trust-router (1.4-9) unstable; urgency=medium
+
+  * Fix lintian errors:
+      - Update LSB header for tids init script
+      - Make tids wrapper executable
+      - Override things lintian gets wrong
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 03 Oct 2014 16:22:31 -0400
+
 moonshot-trust-router (1.4-8) unstable; urgency=medium
 
   * Fix umask of database

diff --git a/debian/moonshot-trust-router.lintian-overrides b/debian/moonshot-trust-router.lintian-overrides
index cb277d8..e61e544 100644 (file)
--- a/debian/moonshot-trust-router.lintian-overrides
+++ b/debian/moonshot-trust-router.lintian-overrides
@@ -1,3 +1,6 @@
 moonshot-trust-router: binary-without-manpage usr/bin/tidc
 moonshot-trust-router: binary-without-manpage usr/bin/trust_router
-moonshot-trust-router: binary-without-manpage usr/bin/tids
\ No newline at end of file
+moonshot-trust-router: binary-without-manpage usr/bin/tids
+moonshot-trust-router: script-not-executable usr/share/trust_router/redhat/*
+# No, actually we do test earlier and exit if the default file is not present
+moonshot-trust-router: init.d-script-sourcing-without-test

diff --git a/debian/moonshot-trust-router.postinst b/debian/moonshot-trust-router.postinst
index 7a4afbe..870aaac 100644 (file)
--- a/debian/moonshot-trust-router.postinst
+++ b/debian/moonshot-trust-router.postinst
@@ -20,7 +20,7 @@ case "$1" in
         if dpkg --compare-versions "$2" lt 1.2-2; then
            adduser --quiet --system --home /var/lib/trust_router --group --disabled-login trustrouter
            fi
-       su -s /bin/sh  -c "umask 027&&/usr/bin/sqlite3 </usr/share/trust_router/schema.sql /var/lib/trust_router/keys" trustrouter ||true
+       su -s /bin/sh  -c "umask 027&&sqlite3 </usr/share/trust_router/schema.sql /var/lib/trust_router/keys" trustrouter ||true
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/debian/moonshot-trust-router.tids.init b/debian/moonshot-trust-router.tids.init
index 4b75f25..95f6bd1 100644 (file)
--- a/debian/moonshot-trust-router.tids.init
+++ b/debian/moonshot-trust-router.tids.init
@@ -3,9 +3,9 @@
 # Provides: tids
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1  6
-# Required-Start: $freeradius
-# Required-Stop:
-# Should-Start: $network
+# Required-Start: $local_fs $remote_fs $network
+# Required-Stop:local_fs $remote_fs $network
+# Should-Start: freeradius
 # Short-Description: Starts Moonshot TIDS
 # Description: Starts the Moonshot Temporary ID Service
 ### END INIT INFO

diff --git a/debian/rules b/debian/rules
index 0aa145d..fa83728 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@
 override_dh_auto_configure:
        dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system
 
+override_dh_install:
+       chmod a+x debian/tids-wrapper
+       dh_install
 
 override_dh_strip:
        dh_strip --dbg-package=moonshot-trust-router-dbg