From 6082c574cc464102752b7b4a4b3188ea1effbca1 Mon Sep 17 00:00:00 2001
From: Rudolf J Streif <rstreif@debian.streifs.net>
Date: Thu, 11 Feb 2016 14:44:18 -0800
Subject: Resolved Debian Packaging Issues

- Fixed rvi.postinst and rvi.postrm files to address lintian complains.
- Fixed changelog for correct Debian versioning.
- Fixed rules and control for various issues.

Signed-off-by: Rudolf J Streif <rudolf.streif@gmail.com>
---
 debian_template/changelog    |  2 +-
 debian_template/control      |  2 +-
 debian_template/rules        |  2 +-
 debian_template/rvi.postinst |  9 ++-------
 debian_template/rvi.postrm   | 22 +++++++++++-----------
 5 files changed, 16 insertions(+), 21 deletions(-)

(limited to 'debian_template')

diff --git a/debian_template/changelog b/debian_template/changelog
index 378c78c..3d774a4 100644
--- a/debian_template/changelog
+++ b/debian_template/changelog
@@ -1,4 +1,4 @@
-rvi (0.5.0) jessie; urgency=low
+rvi (0.5.0-1) jessie; urgency=low
 
   * Initial release
 
diff --git a/debian_template/control b/debian_template/control
index a112832..bab7968 100644
--- a/debian_template/control
+++ b/debian_template/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Magnus Feuer <mfeuer@jaguarlandrover.com>
 Build-Depends: debhelper (>= 9), libbluetooth-dev, esl-erlang (>= 1:18.2)
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://github.com/PDXostc/rvi_core
 
 Package: rvi
diff --git a/debian_template/rules b/debian_template/rules
index f332d29..2eb3045 100755
--- a/debian_template/rules
+++ b/debian_template/rules
@@ -5,7 +5,7 @@
 export DH_VERBOSE=1
 
 %:
-	dh --with systemd $@
+	dh $@
 
 override_dh_auto_install:
 	 ./scripts/rvi_install \
diff --git a/debian_template/rvi.postinst b/debian_template/rvi.postinst
index f6d5de5..10c11fe 100644
--- a/debian_template/rvi.postinst
+++ b/debian_template/rvi.postinst
@@ -23,10 +23,10 @@ set -e
 case "$1" in
 
   configure)
-    # Set up our config for apache
+    # Set up our config
     cat /proc/sys/kernel/random/uuid > /etc/rvi/device_id
     echo "RVI Device ID set to $(cat /etc/rvi/device_id) in /etc/rvi/device_id"
-    update-rc.d rvi defaults
+    #DEBHELPER#
   ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)
@@ -40,11 +40,6 @@ case "$1" in
 
 esac
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
 db_stop
 
 exit 0
diff --git a/debian_template/rvi.postrm b/debian_template/rvi.postrm
index 0ded6f8..0c7252f 100644
--- a/debian_template/rvi.postrm
+++ b/debian_template/rvi.postrm
@@ -6,14 +6,15 @@
 set -e
 
 # summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
@@ -24,7 +25,8 @@ case "$1" in
 
   remove|purge|upgrde|disappear)
     rm -f /etc/init.d/rvi
-    update-rc.d rvi remove
+    rm -rf /etc/rvi
+    #DEBHELPER#
   ;;
 
   *)
@@ -34,8 +36,6 @@ case "$1" in
 
 esac
 
-#DEBHELPER#
-
 db_stop
 
 exit 0
-- 
cgit v1.2.1