updated deb and rpm to 1.0-7

21 files changed, 124 insertions, 131 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 
diff --git a/usr/share/keepalive/docs/debian-keepalive/changelog b/usr/share/keepalive/docs/debian-keepalive/changelog
new file mode 100644
index 0000000..c104ef2
--- /dev/null
+++ b/usr/share/keepalive/docs/debian-keepalive/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/usr/share/keepalive/docs/debian/conffiles b/usr/share/keepalive/docs/debian-keepalive/conffiles
index 8dafbff..8dafbff 100644
--- a/usr/share/keepalive/docs/debian/conffiles
+++ b/usr/share/keepalive/docs/debian-keepalive/conffiles
diff --git a/usr/share/keepalive/docs/debian/control b/usr/share/keepalive/docs/debian-keepalive/control
index e79a841..e79a841 100644
--- a/usr/share/keepalive/docs/debian/control
+++ b/usr/share/keepalive/docs/debian-keepalive/control
diff --git a/usr/share/keepalive/docs/debian-keepalive/md5sums b/usr/share/keepalive/docs/debian-keepalive/md5sums
new file mode 100644
index 0000000..70a5e3a
--- /dev/null
+++ b/usr/share/keepalive/docs/debian-keepalive/md5sums
@@ -0,0 +1,23 @@
+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/usr/share/keepalive/docs/debian/postinst b/usr/share/keepalive/docs/debian-keepalive/postinst
index eae6cd5..d7082a1 100755
--- a/usr/share/keepalive/docs/debian/postinst
+++ b/usr/share/keepalive/docs/debian-keepalive/postinst
@@ -6,4 +6,5 @@ systemctl daemon-reload
 systemctl enable ${thisservice}
 systemctl start ${thisservice}
 } 1>/dev/null 2>&1
+
 exit 0
diff --git a/usr/share/keepalive/docs/debian/postrm b/usr/share/keepalive/docs/debian-keepalive/postrm
index f35ae34..f35ae34 100755
--- a/usr/share/keepalive/docs/debian/postrm
+++ b/usr/share/keepalive/docs/debian-keepalive/postrm
diff --git a/usr/share/keepalive/docs/debian/preinst b/usr/share/keepalive/docs/debian-keepalive/preinst
index afa9350..afa9350 100755
--- a/usr/share/keepalive/docs/debian/preinst
+++ b/usr/share/keepalive/docs/debian-keepalive/preinst
diff --git a/usr/share/keepalive/docs/debian/prerm b/usr/share/keepalive/docs/debian-keepalive/prerm
index 84e2bbd..84e2bbd 100755
--- a/usr/share/keepalive/docs/debian/prerm
+++ b/usr/share/keepalive/docs/debian-keepalive/prerm
diff --git a/usr/share/keepalive/docs/debian/md5sums b/usr/share/keepalive/docs/debian/md5sums
deleted file mode 100644
index 3307807..0000000
--- a/usr/share/keepalive/docs/debian/md5sums
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-cf972826834f5cce6d48266bc9f18110  etc/logrotate.d/keepalive
-3b4332e514014ed750012692a75dc572  etc/rsyslog.d/keepalivelog.conf
diff --git a/usr/share/keepalive/docs/keepalive.spec b/usr/share/keepalive/docs/keepalive.spec
index 764bcc8..67bdd23 100644
--- a/usr/share/keepalive/docs/keepalive.spec
+++ b/usr/share/keepalive/docs/keepalive.spec
@@ -85,26 +85,27 @@ exit 0
 %dir /etc/keepalive
 %dir /usr/share/keepalive
 %dir /usr/share/keepalive/docs
-%dir /usr/share/keepalive/docs/debian
+%dir /usr/share/keepalive/docs/debian-keepalive
 %dir /usr/share/keepalive/inc
 /etc/logrotate.d/keepalive
 %config /etc/rsyslog.d/keepalivelog.conf
 %config /etc/keepalive/keepalive.conf
 /usr/share/keepalive/keepalive.sh
 /usr/share/keepalive/docs/keepalive.spec
-/usr/share/keepalive/docs/debian/postinst
-/usr/share/keepalive/docs/debian/conffiles
-/usr/share/keepalive/docs/debian/md5sums
-/usr/share/keepalive/docs/debian/prerm
-/usr/share/keepalive/docs/debian/postrm
-/usr/share/keepalive/docs/debian/control
-/usr/share/keepalive/docs/debian/preinst
 %doc %attr(444, -, -) /usr/share/keepalive/docs/README.txt
-%doc %attr(444, -, -) /usr/share/keepalive/docs/packaging.txt
+/usr/share/keepalive/docs/debian-keepalive/postinst
+/usr/share/keepalive/docs/debian-keepalive/conffiles
+/usr/share/keepalive/docs/debian-keepalive/md5sums
+/usr/share/keepalive/docs/debian-keepalive/changelog
+/usr/share/keepalive/docs/debian-keepalive/prerm
+/usr/share/keepalive/docs/debian-keepalive/postrm
+/usr/share/keepalive/docs/debian-keepalive/control
+/usr/share/keepalive/docs/debian-keepalive/preinst
 %doc %attr(444, -, -) /usr/share/keepalive/docs/files-for-versioning.txt
 /usr/share/keepalive/inc/get-files
 /usr/share/keepalive/inc/pack
 /usr/share/keepalive/inc/localize_git.sh
+%config /usr/share/keepalive/inc/keepalive.conf
 %doc %attr(444, -, -) /usr/share/keepalive/inc/scrub.txt
 /usr/share/keepalive/keepalive
 /usr/lib/systemd/system/keepalive.service
@@ -113,6 +114,7 @@ exit 0
 %changelog
 * Thu Jan 26 2017 B Stack <bgstack15@gmail.com> 1.0-7
 - Rearranged package to be compliant with FHS 3.0
-- Updated dependency to bgscripts-core
-- Added ./pack script
-- Added changelog to spec file
+- Updated dependency to bgscripts-core.
+- Added ./pack script.
+- Removed old packaging.txt file entirely.
+- Added changelog to spec file.
diff --git a/usr/share/keepalive/docs/packaging.txt b/usr/share/keepalive/docs/packaging.txt
deleted file mode 100644
index 7610649..0000000
--- a/usr/share/keepalive/docs/packaging.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-File: etc/keepalive/packaging.txt
-Package: keepalive
-Author: bgstack15
-Startdate: 2016-06-02
-Title: Packaging instructions for keepalive
-Purpose: To make it easier to build the package
-History: 2016-10-27 updated for git project
-Usage:
-Reference: bgscripts package packaging.txt
-Improve:
-Document: Below this line
-
-### PACKAGING for rhel/centos
-package=keepalive
-version=1.0-7
-shortversion=1.0
-rpmbuilddir=~/rpmbuild/
-packagespecfile="${package}-${version}/etc/${package}/docs/${package}.spec"
-sed -i -n '1,/^\%files$/p;' ${rpmbuilddir}/SOURCES/"${packagespecfile}"
-cd ${rpmbuilddir}/SOURCES/"${package}-${version}"
-find * ! -type d ! -regex '.*?.swp' ! -regex '.*?DEBIAN.*?' | sed -e 's/^/\//;' -e 's/\(.*\.txt\)/%doc %attr(444, -, -) \1/;' -e 's/\(.*\.conf\)/%config \1/;' -e 's/\(.*bin.*\)/%verify(link) \1/;' -e 's/\(.*\)\.py$/\1\.py\n\1\.pyc\n\1\.pyo/;' >> ${rpmbuilddir}/SOURCES/"${packagespecfile}"
-rm -rf ${rpmbuilddir}/SOURCES/"${package}-${shortversion}"
-cp -prf ${rpmbuilddir}/SOURCES/"${package}-${version}" ${rpmbuilddir}/SOURCES/"${package}-${shortversion}"
-rm -rf ${rpmbuilddir}/SOURCES/"${package}-${shortversion}"/DEBIAN
-cd ${rpmbuilddir}/SOURCES
-rm -rf "${package}".tgz; tar -zc --exclude='.git' -f "${package}.tgz" "${package}-${shortversion}" && rm -rf ${rpmbuilddir}/SOURCES/"${package}-${shortversion}"
-cp -p ${rpmbuilddir}/SOURCES/"${packagespecfile}" ${rpmbuilddir}/SPECS
-cd ${rpmbuilddir}/RPMS/noarch
-rpmbuild -bb "${rpmbuilddir}"/SPECS/"${package}".spec
-
-### PACKAGING for debian
-# You need package dpkg-dev to build packages.
-package=keepalive
-version=1.0-7
-packagedebfilesdir="${package}-${version}/etc/keepalive/docs/debian"
-cd ~/deb/"${package}-${version}"
-find . -type f ! -regex '.*.hg.*' ! -regex '.*?debian-binary.*' ! -regex '.*?DEBIAN.*' ! -regex '.*?.swp' ! -regex '.*\.git.*' -printf '%P ' | xargs md5sum > DEBIAN/md5sums
-rm -rf ~/deb/"${package}-${version}"/DEBIAN/ 2>/dev/null; mkdir -p ~/deb/"${package}-${version}"/DEBIAN/
-cp -pf ~/deb/"${packagedebfilesdir}"/* ~/deb/"${package}-${version}"/DEBIAN/
-cd ~/deb
-rm -rf ~/deb/"${package}-${version}.a"
-cp -pR ~/deb/"${package}-${version}" ~/deb/"${package}-${version}.a"
-rm -rf ~/deb/"${package}-${version}"/.git
-dpkg-deb -b ~/deb/"${package}-${version}"
-rm -rf ~/deb/"${package}-${version}"
-mv ~/deb/"${package}-${version}.a" ~/deb/"${package}-${version}"
-
-### PACKAGING in a master.tgz
-cd ~/deb 2>/dev/null || cd ~/rpmbuild/SOURCES
-package=keepalive
-version=1.0-7
-rm -rf ./"${package}-${version}".master.tgz
-tar -zcf "${package}-${version}".master.tgz "${package}-${version}"/
diff --git a/usr/share/keepalive/inc/get-files b/usr/share/keepalive/inc/get-files
index ab75e63..071c452 100755
--- a/usr/share/keepalive/inc/get-files
+++ b/usr/share/keepalive/inc/get-files
@@ -25,16 +25,12 @@ s/\(.*\)\.py$/\1\.py\n\1\.pyc\n\1\.pyo/;
 
 ### for deb
 # will be redirected to md5sum
-# WORKHERE: this is the bgscripts one
 find . -mindepth 1 \
    ! -type d \
+   ! -regex '.*README\.md.*' \
    ! -regex '.*.hg.*' ! -regex '.*?debian-binary.*' \
-   ! -regex '.*?DEBIAN.*' ! -regex '.*?.swp' ! -regex '.*\.git.*' \
-   \( \
-      -regex '.*rdp.*' -o \
-      -regex '.*get-files$' -o \
-      -regex '.*icons.*' \
-   \) \
+   ! -regex '.*?DEBIAN.*' ! -regex '.*?.swp' \
+   ! -regex '.*\.git.*' \
    -printf '%P '
 
       ;;
diff --git a/usr/share/keepalive/inc/keepalive.conf b/usr/share/keepalive/inc/keepalive.conf
new file mode 100644
index 0000000..9debff9
--- /dev/null
+++ b/usr/share/keepalive/inc/keepalive.conf
@@ -0,0 +1,11 @@
+# File: keepalive.conf
+# bgstack15@gmail.com 2016-07-22
+# updated for keepalive-1.0-5
+[keepalive]
+lockfile = /tmp/.keepalive.py.lock
+keytab = /etc/krb5.keytab
+refresh = 240
+# refresh is an integer in seconds
+proxy = https://proxy1.example.com:4433/?cfru=aHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS8=
+proxy = https://proxy2.example.com:4433/?cfru=aHR0cHM6Ly93d3cuZ29vZ2xlLmNvbS8=
+logoutproxy = http://proxylogout.example.com
diff --git a/usr/share/keepalive/inc/pack b/usr/share/keepalive/inc/pack
index 448a98c..883c44f 100755
--- a/usr/share/keepalive/inc/pack
+++ b/usr/share/keepalive/inc/pack
@@ -77,21 +77,18 @@ rm -rf "${rpmbuilddir}/SOURCES/${package}-${shortversion}/" "${rpmbuilddir}/SOUR
 # if you copy-paste this, be sure to define package, version
 debdir=~/deb
 debiandirmain="${package}-${version}/usr/share/${package}/docs/debian-${package}"
-cd "${debdir}/${package}-${version}/usr/bin"
-for word in beep bup fl lecho newscript plecho rdp send treesize; do ln -sf ../share/bgscripts/${word}.sh ${word}; done
-for word in dli updateval; do ln -sf ../share/bgscripts/${word}.py ${word}; done
-ln -sf ../share/bgscripts/bgscripts.bashrc bp
 cd "${debdir}/${package}-${version}"
 "${debdir}/${package}-${version}/usr/share/${package}/inc/get-files" deb | xargs md5sum > "${debdir}/${debiandirmain}/md5sums"
-cd ~/deb
-mv "${debdir}/${package}-${version}/.git" "${debdir}/.git$$"
+cd "${debdir}/${package}-${version}"
+mv .git "../.git$$"; mv README.md "../README.md$$"
 
 # main
 rm -rf "${debdir}/${package}-${version}/DEBIAN/" 2>/dev/null; mkdir -p "${debdir}/${package}-${version}/DEBIAN/"
 cp -pf "${debdir}/${debiandirmain}"/* "${debdir}/${package}-${version}/DEBIAN/"
 fakeroot dpkg-deb -b "${debdir}/${package}-${version}"
 
-mv "${debdir}/.git$$" "${debdir}/${package}-${version}/.git"
+cd "${debdir}/${package}-${version}"
+mv "../.git$$" .git; mv "../README.md$$" README.md
 
       ;;
    targz)