aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog26
-rw-r--r--debian/compat1
-rw-r--r--debian/control7
-rw-r--r--debian/postinst22
-rw-r--r--debian/pyversions1
-rwxr-xr-xdebian/rules4
6 files changed, 43 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 728fca1..5d7f55a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+whatmaps (0.0.12-4) unstable; urgency=medium
+
+ * [3030430] d/postinst: Don't fail in container without apt
+ (Closes: #1020895)
+ * [dbd0843] Bump debhelper compat to 13
+ * [b2b1e7b] d/control: Drop X-Python3-Version
+ * [de2a09d] Bump standards version to 4.6.1.
+ No changes needed
+ * [b0f56a6] Drop unused pyversions.
+ Thanks linitian
+ * [75a2d0b] d/rules: Use dh_execute_after.
+ This ensures that DEB_BUILD_OPTIONS=nocheck gets honored automatically
+ * [6b68c87] d/control: Switch priority to optional.
+ It's prefereed over `extra`
+
+ -- Guido Günther <agx@sigxcpu.org> Fri, 28 Oct 2022 09:59:38 +0200
+
+whatmaps (0.0.12-3) unstable; urgency=medium
+
+ * [f2095d5] Fix vcs-git url
+ * [eeaefc0] Build-depend on dh-python (Closes: #896742)
+ * [ddb6eda] Bump standards version to 4.1.4
+ * [c12ed6b] gbp.conf: set id-length to have git commit ids in the changelog
+
+ -- Guido Günther <agx@sigxcpu.org> Wed, 02 May 2018 09:42:16 +0200
+
whatmaps (0.0.12-2) unstable; urgency=medium
* [affd69d] Simplify smoke test
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 3c94ed2..ed9e44b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,18 @@
Source: whatmaps
Section: admin
-Priority: extra
+Priority: optional
Maintainer: Guido Günther <agx@sigxcpu.org>
Build-Depends:
- debhelper (>= 9~),
+ debhelper-compat (= 13),
dh-python,
lsb-release,
python3,
python3-mock,
python3-nose,
python3-setuptools,
-Standards-Version: 4.1.4
+Standards-Version: 4.6.1
Homepage: https://honk.sigxcpu.org/piki/projects/whatmaps
Vcs-Git: https://git.sigxcpu.org/cgit/whatmaps/
-X-Python3-Version: >= 3.4
Package: whatmaps
Architecture: all
diff --git a/debian/postinst b/debian/postinst
index 8a56265..cc9b9dd 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,10 +12,17 @@ case "$1" in
db_get whatmaps/enable_service_restarts || true
DBVAL="$RET"
- # Configuration file doesn't exist but user wants updates enabled so
- # recreate it:
- if [ ! -f $APT_CONF ] && [ $DBVAL = "true" ]; then
- cat << EOF > $APT_CONF
+ if [ -f $APT_CONF ]; then
+ case $DBVAL in
+ "true") VAL=1;;
+ *) VAL=0;;
+ esac
+ sed -i -e "s,^\(\s*Whatmaps::Enable-Restart\s\+\"\)\S\+\(\"\s*;\),\1${VAL}\2," $APT_CONF
+ else
+ # Configuration file doesn't exist but user wants updates enabled so
+ # recreate it:
+ if [ $DBVAL = "true" ]; then
+ cat << EOF > $APT_CONF
// Set to 1 or true to enable service restarts on security updates
Whatmaps::Enable-Restart "1";
@@ -25,12 +32,7 @@ Whatmaps::Security-Update-Origins {
"\${distro_id} \${distro_codename}-security";
};
EOF
- else
- case $DBVAL in
- "true") VAL=1;;
- *) VAL=0;;
- esac
- sed -i -e "s,^\(\s*Whatmaps::Enable-Restart\s\+\"\)\S\+\(\"\s*;\),\1${VAL}\2," $APT_CONF
+ fi
fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index f387774..ba473b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,10 @@ override_dh_installman:
pod2man man/whatmaps.pod man/whatmaps.8
dh_installman man/whatmaps.8
-override_dh_auto_test:
+execute_after_dh_auto_test:
python3 setup.py nosetests
dh_auto_test
-override_dh_auto_clean:
+execute_after_dh_auto_clean:
rm -f man/whatmaps.8
dh_auto_clean