Created
December 6, 2022 01:06
-
-
Save mwhudson/31d8a75540990965ebbd38ecd48f5bdc to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/debian/changelog b/debian/changelog | |
index 5497d4c2db..4e10ce9240 100644 | |
--- a/debian/changelog | |
+++ b/debian/changelog | |
@@ -1,3 +1,10 @@ | |
+golang-1.18 (1.18.1-1ubuntu1~18.04) bionic; urgency=medium | |
+ | |
+ * Lower debhelper requirement. | |
+ * Stop using debhelper 12/13 execute_{after,before}_ overrides. | |
+ | |
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 06 Dec 2022 11:36:44 +1300 | |
+ | |
golang-1.18 (1.18.1-1ubuntu1) jammy; urgency=medium | |
* Merge from Debian unstable. Remaining changes: | |
diff --git a/debian/control b/debian/control | |
index ebd8967aa3..7dd33063e0 100644 | |
--- a/debian/control | |
+++ b/debian/control | |
@@ -13,7 +13,7 @@ Uploaders: Michael Stapelberg <stapelberg@debian.org>, | |
Anthony Fok <foka@debian.org> | |
Section: golang | |
Priority: optional | |
-Build-Depends: debhelper-compat (= 13), | |
+Build-Depends: debhelper-compat (= 11), | |
golang-any (>= 2:1.4~) | golang-go (>= 2:1.4~) | gccgo (>= 4:5~), | |
netbase | |
Standards-Version: 4.6.0 | |
diff --git a/debian/rules b/debian/rules | |
index 6e88151b19..807e9b96a6 100755 | |
--- a/debian/rules | |
+++ b/debian/rules | |
@@ -56,7 +56,7 @@ override_dh_auto_clean: | |
rm -f -v golang-$(GOVER)-$${x##golang-X.Y-}; \ | |
done | |
-execute_after_dh_prep: | |
+override_dh_prep: | |
dh_prep | |
@set -e; cd debian; for x in golang-X.Y-*; do \ | |
sed -e 's/X.Y/$(GOVER)/g' $$x > golang-$(GOVER)-$${x##golang-X.Y-}; \ | |
@@ -84,10 +84,12 @@ override_dh_auto_test-arch: | |
override_dh_compress-indep: | |
dh_compress -Xusr/share/doc/golang-$(GOVER)-doc/html | |
-execute_before_dh_install-arch: | |
+override_dh_install-arch: | |
rm -rf $(GOCACHE) | |
+ dh_install --arch | |
-execute_after_dh_install-indep: | |
+override_dh_install-indep: | |
+ dh_install --indep | |
# Remove generated source files, they are installed in golang-$(GOVER)-go. | |
cd debian/golang-$(GOVER)-src/usr/share/go-$(GOVER)/ && rm -v -f $(GENERATED_FILES) | |
# Remove Plan9 rc(1) scripts |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment