summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@ubuntu.com>2022-08-22 15:24:22 +0100
committerColin Watson <cjwatson@ubuntu.com>2022-08-22 15:25:03 +0100
commitc009589b142d836fcedcdf8f2ec17e879d2fcef0 (patch)
tree676a48cac9a2b2ecf6fe525d3a72fd8e91ef3130
parent497a84008d1d3c2afed54ef26b07ec45e90a03de (diff)
Restore debhelper 12 and debhelper-compat changes
This reverts commit b8653b108494945a2b380f6e9acb8e5ceac470be. Now that all Launchpad builders run focal, it's safe to upgrade the packaging to a debhelper version that requires that.
-rw-r--r--debian/changelog2
-rw-r--r--debian/compat1
-rw-r--r--debian/control2
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index e7d6df9..020778e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ git-build-recipe (0.3.7) UNRELEASED; urgency=medium
[ Debian Janitor ]
* Use secure copyright file specification URI.
* Remove unnecessary X-Python{,3}-Version field in debian/control.
+ * Bump debhelper from deprecated 9 to 12.
+ * Set debhelper-compat version in Build-Depends.
[ Colin Watson ]
* Switch from nose to pytest.
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 165655a..53959c8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: vcs
Priority: optional
Maintainer: Colin Watson <cjwatson@ubuntu.com>
Standards-Version: 3.9.7
-Build-Depends: debhelper (>= 9), dh-python, python3 (>= 3.1.2-8~), python3-setuptools, python3-dateutil, python3-debian, python3-testtools, python3-fixtures, python3-pytest, devscripts, git, pristine-tar, quilt
+Build-Depends: debhelper-compat (= 12), dh-python, python3 (>= 3.1.2-8~), python3-setuptools, python3-dateutil, python3-debian, python3-testtools, python3-fixtures, python3-pytest, devscripts, git, pristine-tar, quilt
Homepage: https://launchpad.net/git-build-recipe
Vcs-Git: https://git.launchpad.net/git-build-recipe
Vcs-Browser: https://git.launchpad.net/git-build-recipe