summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas D Steeves <sten@debian.org>2022-11-30 18:10:04 -0500
committerNicholas D Steeves <sten@debian.org>2022-11-30 18:10:04 -0500
commit5bdb1242c780db28bfb941b013fe2c7b9e3c5a8a (patch)
tree3f5d208bdc7c55b571ad7f2a7a93205ce4deac26
parentf7f58e6cc5f084bb7451af298b8aa02de4455736 (diff)
update debian dir
-rw-r--r--debian/changelog9
-rw-r--r--debian/gbp.conf8
-rwxr-xr-xdebian/rules1
-rw-r--r--debian/watch2
4 files changed, 15 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 4b52b98..f6c3321 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+evil-el (1.14.2-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release (Closes: #1020970).
+ * Switch to merging from upstream git tags
+ * Make docstrings before running sphinx to solve new FTBFS
+
+ -- Nicholas D Steeves <sten@debian.org> Fri, 14 Oct 2022 02:12:15 -0400
+
evil-el (1.14.0-1) unstable; urgency=medium
[ David Krauser ]
diff --git a/debian/gbp.conf b/debian/gbp.conf
index e27602c..922130b 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,10 +1,10 @@
[DEFAULT]
-upstream-branch = upstream
+#upstream-branch = upstream
debian-branch = master
-upstream-tag = upstream/%(version)s
+upstream-tag = %(version)s
debian-tag = debian/%(version)s
-pristine-tar = True
-pristine-tar-commit = True
+pristine-tar = false
+pristine-tar-commit = false
#postbuild = lintian $GBP_CHANGES_FILE
color = on
diff --git a/debian/rules b/debian/rules
index 3915629..c9d7f62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
override_dh_auto_build: export http_proxy=127.0.0.1:9
override_dh_auto_build: export https_proxy=127.0.0.1:9
override_dh_auto_build:
+ make docstrings
PYTHONPATH=. python3 -m sphinx -N -btexinfo doc/source/ build/info
makeinfo --no-split build/info/*.texi -o build/evil.info
diff --git a/debian/watch b/debian/watch
index cbaf25b..c93a94b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=4
-https://github.com/emacs-evil/evil/releases /emacs-evil/evil/archive/(.+)\.tar\.gz
+https://github.com/emacs-evil/evil/tags /emacs-evil/evil/archive/(.+)\.tar\.gz