updated deb and rpm to 1.0-7

7 files changed, 59 insertions, 38 deletions

diff --git a/DEBIAN/changelog b/DEBIAN/changelog
new file mode 100644
index 0000000..c104ef2
--- /dev/null
+++ b/DEBIAN/changelog
@@ -0,0 +1,9 @@
+keepalive (1.0-7) stable; urgency=low
+
+  * Rearranged package to be compliant with FHS 3.0
+  * Updated dependency to bgscripts-core.
+  * Added ./pack script.
+  * Removed old packaging.txt file entirely.
+  * Added changelog to spec file.
+
+ -- B Stack <bgstack15@gmail.com>  Thu Jan 26 2017 13:47:59 -500
diff --git a/DEBIAN/control b/DEBIAN/control
index 8d42833..e79a841 100644
--- a/DEBIAN/control
+++ b/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: keepalive
-Version: 1.0-6
+Version: 1.0-7
 Architecture: all
 Essential: no
 Priority: extra
@@ -9,5 +9,6 @@ Installed-Size: 350
 Homepage: https://bgstack15.wordpress.com/
 Source: keepalive.tgz
 Pre-Depends: bgscripts (>= 1.1-17), sssd, python3
+Depends: curl
 Description: Keepalive uses a system kerberos ticket (generating one if necessary) to stay authenticated to the http proxy.
  The user defines http_proxy and https_proxy. Keepalive assumes the system joined to an AD domain.
diff --git a/DEBIAN/md5sums b/DEBIAN/md5sums
index 3307807..70a5e3a 100644
--- a/DEBIAN/md5sums
+++ b/DEBIAN/md5sums
@@ -1,14 +1,23 @@
-317bad02db12ba2340b5c4ef30c9376b  usr/lib/systemd/system/keepalive.service
-5aa43c0360a508ad909cfe2ac4495179  etc/keepalive/packaging.txt
-76803e4e6e9f74fc8de2ae4ddfc7c470  etc/keepalive/bin/keepalive
-4e750e3f9ce8e00feaa34d614405f066  etc/keepalive/keepalive.conf
-5c34e36e9838a29d59f3ed9fa0b4c8e7  etc/keepalive/docs/debian/postinst
-061b27636d5dd3ab9ca7fa00b5a6e0a6  etc/keepalive/docs/debian/control
-391dcefa7356b76dfdc7eebae9e450ba  etc/keepalive/docs/debian/postrm
-eb54ab3395cf1a7f9ffd558b5142679d  etc/keepalive/docs/debian/prerm
-2a7ad29f5f70879eca2d71a01152ac19  etc/keepalive/docs/debian/preinst
-7b84e6ef73c48a2474789f8daf76a8d7  etc/keepalive/docs/debian/conffiles
-7c2ef5667400f3fa3166bbfe41a835e2  etc/keepalive/docs/keepalive.spec
-ec2f0bc9c707cb03aa933d203e1506ef  etc/keepalive/README.txt
+3ebecb4404eadd5e81a17f823478a5aa  usr/bin/keepalive
+3ebecb4404eadd5e81a17f823478a5aa  usr/share/keepalive/keepalive
+61de797388a134089db8a8e8fec85c85  usr/share/keepalive/inc/keepalive.conf
+b96f0547d5de63230d8690b6664880f7  usr/share/keepalive/inc/get-files
+adefd79b5811411168ed1f2f6fdcbd75  usr/share/keepalive/inc/scrub.txt
+bb88e3775cdf8c6c4dd3e6bfb0c5ab0a  usr/share/keepalive/inc/pack
+18f43a619fa8dd77a6c3c37b8465f988  usr/share/keepalive/inc/localize_git.sh
+7ef7280c69b6ebf930cd2615879b367f  usr/share/keepalive/docs/debian-keepalive/postinst
+91c538a1900016ae9e50eb66506854b0  usr/share/keepalive/docs/debian-keepalive/control
+6f7872e580c56fc1d2f3ed5e1a88bf24  usr/share/keepalive/docs/debian-keepalive/postrm
+7486860c224066fe829c5ec7f4a272be  usr/share/keepalive/docs/debian-keepalive/prerm
+0f39f7cbe97b762dbfbf6e46b2a62f39  usr/share/keepalive/docs/debian-keepalive/changelog
+c38dd889802671d0703a35b1dffbcd04  usr/share/keepalive/docs/debian-keepalive/preinst
+9212c79d73d7d2e339f4d1ed5fc6fb00  usr/share/keepalive/docs/debian-keepalive/md5sums
+7b84e6ef73c48a2474789f8daf76a8d7  usr/share/keepalive/docs/debian-keepalive/conffiles
+acf89298e2b6dc098461f296d4187f54  usr/share/keepalive/docs/files-for-versioning.txt
+7610bdce2e5e8919633e3052c5391beb  usr/share/keepalive/docs/README.txt
+af90e2883327d79fb17c8d094eb3d8c3  usr/share/keepalive/docs/keepalive.spec
+d3cab7f48aab2980114cef9eb54d9673  usr/share/keepalive/keepalive.sh
+c9d29ee063ec4b7d9d1847dbb7435245  usr/lib/systemd/system/keepalive.service
+61de797388a134089db8a8e8fec85c85  etc/keepalive/keepalive.conf
 cf972826834f5cce6d48266bc9f18110  etc/logrotate.d/keepalive
 3b4332e514014ed750012692a75dc572  etc/rsyslog.d/keepalivelog.conf
diff --git a/DEBIAN/postinst b/DEBIAN/postinst
index 4c3092b..d7082a1 100755
--- a/DEBIAN/postinst
+++ b/DEBIAN/postinst
@@ -1,5 +1,10 @@
 #!/bin/sh
+# deb postinst 2017-01-26
+thisservice=keepalive.service
+{
+systemctl daemon-reload
+systemctl enable ${thisservice}
+systemctl start ${thisservice}
+} 1>/dev/null 2>&1
 
-systemctl daemon-reload 1>/dev/null 2>&1
-systemctl enable keepalive 1>/dev/null 2>&1
-systemctl start keepalive 1>/dev/null 2>&1
+exit 0
diff --git a/DEBIAN/postrm b/DEBIAN/postrm
index 2c475d8..f35ae34 100755
--- a/DEBIAN/postrm
+++ b/DEBIAN/postrm
@@ -1,4 +1,3 @@
-#!/bin/sh
-
-# whether removing an updated package or just removing it entirely, this is a good idea:
+# deb postrm 2017-01-26
 systemctl daemon-reload 1>/dev/null 2>&1
+exit 0
diff --git a/DEBIAN/preinst b/DEBIAN/preinst
index 75ff571..afa9350 100755
--- a/DEBIAN/preinst
+++ b/DEBIAN/preinst
@@ -1,17 +1,17 @@
 #!/bin/sh
+# deb pre 2017-01-26
 #https://www.debian.org/doc/debian-policy/ch-maintainerscripts.html
 thisservice=keepalive.service
-
+{
 case "${1}" in
    upgrade)
-      # This preinst is being run before an upgrade.
-      # $2 is old-version-number
-      systemctl stop keepalive.service 1>/dev/null 2>&1
+      # Upgrade. $2 is old-version-number.
+      systemctl stop ${thiservice}
       ;;
    install)
-      # Brand new installation of the package.
-      [ ]
+      # New install.
+      :
       ;;
 esac
-
+} 1>/dev/null 2>&1
 exit 0
diff --git a/DEBIAN/prerm b/DEBIAN/prerm
index 99a4f6a..84e2bbd 100755
--- a/DEBIAN/prerm
+++ b/DEBIAN/prerm
@@ -1,18 +1,16 @@
-#!/bin/sh
-
+# deb prerm 2017-01-26
 thisservice=keepalive.service
-
+{
 case "${1}" in
-   upgrade)
-      # This prerm upgrade is running because a newer version of this package is being installed.
-      # $2 is new-version-number
-      [ ]
-      ;;
    remove)
-      # No new package being installed. Just remove it.
-      systemctl stop "${thisservice}" 1>/dev/null 2>&1
-      systemctl disable "${thisservice}" 1>/dev/null 2>&1
+      # Final removal.
+      systemctl stop "${thisservice}"
+      systemctl disable "${thisservice}"
+      ;;
+   upgrade)
+      # Upgrade. $2 is new-version-number
+      :
       ;;
 esac
-
+} 1>/dev/null 2>&1
 exit 0