fix debian package

Author: Deric-W

debian/build_deb.sh

@@ -18,35 +18,33 @@ then read -p "pip executeable: " pip
 else pip=$3
 fi
 
-package="pyhp_"$version"_all"
+package="pyhp_${version}_all"
 
 mkdir "$package"
 
-# place config file, cache handlers and "executable"
-mkdir -p "$package/lib/pyhp/cache_handlers"
-cp ../cache_handlers/* "$package/lib/pyhp/cache_handlers"
-
-mkdir "$package/etc"
-cp ../pyhp.conf "$package/etc"
+# place pyhp-core files
+mkdir -p "${package}/usr/lib/python3/dist-packages"
+$pip install --target "${package}/usr/lib/python3/dist-packages" --ignore-installed --no-compile "$wheel"
 
-mkdir -p "$package/usr/bin"
-cp pyhp "$package/usr/bin"
-chmod +x "$package/usr/bin/pyhp"
+# place config file and "executable"
+mkdir "${package}/etc"
+cp ../pyhp.toml "${package}/etc"
 
-# place pyhp-core files
-mkdir -p "$package/usr/lib/python3/dist-packages"
-$pip install --target "$package/usr/lib/python3/dist-packages" --ignore-installed $wheel
+mkdir -p "${package}/usr/bin"
+mv "${package}/usr/lib/python3/dist-packages/bin/pyhp" "${package}/usr/bin"
+rmdir "${package}/usr/lib/python3/dist-packages/bin"
+chmod +x "${package}/usr/bin/pyhp"
 
 # place metadata files
 mkdir "$package/DEBIAN"
 # calculate installed size
-cat control | python3 format.py "$version" $(du -sk --apparent-size --exclude "DEBIAN" "$package" 2>/dev/null | cut -f1) > "$package/DEBIAN/control"
+cat control | python3 format.py "${version}" $(du -sk --apparent-size --exclude "DEBIAN" "${package}" 2>/dev/null | cut -f1) > "${package}/DEBIAN/control"
 cp conffiles "$package/DEBIAN"
 
-mkdir -p "$package/usr/share/doc/pyhp"
-cp copyright "$package/usr/share/doc/pyhp"
-cp changelog "$package/usr/share/doc/pyhp/changelog.Debian"
-gzip -n --best "$package/usr/share/doc/pyhp/changelog.Debian"
+mkdir -p "${package}/usr/share/doc/pyhp"
+cp copyright "${package}/usr/share/doc/pyhp"
+cp changelog "${package}/usr/share/doc/pyhp/changelog.Debian"
+gzip -n --best "${package}/usr/share/doc/pyhp/changelog.Debian"
 
 # generate md5sums file
 chdir "$package"
@@ -67,3 +65,5 @@ dpkg-deb --build "$package"
 rm -r "$package"
 
 echo "Done"
+
+exit 0

debian/changelog

@@ -1,3 +1,14 @@
+pyhp (2.2-1) stable; urgency=low
+
+  * sixth release
+  * replace cache handlers with backends submodule
+  * add unbounded version of memory cache
+  * add files, zipfiles and memory backend
+  * fix race condition in file cache
+  * change config format to TOML
+
+ -- Eric Wolf <[email protected]>  Sun, 14 Mar 2021 19:00:00 +0100
+
 pyhp (2.1-1) stable; urgency=low
 
   * fifth release

debian/conffiles

@@ -1 +1 @@
-/etc/pyhp.conf
+/etc/pyhp.toml

debian/pyhp

@@ -13,7 +13,7 @@
 
 # package metadata
 # needs to be defined before .main is imported
-__version__ = "2.1"
+__version__ = "2.2"
 __author__ = "Eric Wolf"
 __maintainer__ = "Eric Wolf"
 __license__ = "GPLv3"

pyhp/__init__.py

@@ -59,7 +59,7 @@
 argparser.add_argument(
     "name",
     type=str,
-    help="name to be loaded from the caching hierarchy (omit for reading from stdin)",
+    help="name to be loaded from the backend (omit for reading from stdin)",
     nargs="?",
     default="-"
 )