summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/gbp.conf11
-rw-r--r--debian/pkg-zsh-workflow.org7
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000000000..f19a44fd0
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,11 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+upstream-branch = zsh-4.3.13
+debian-branch = debian
+upstream-tree = branch
+
+# Options only affecting git-dch
+[git-dch]
+id-length = 7
+meta = True
diff --git a/debian/pkg-zsh-workflow.org b/debian/pkg-zsh-workflow.org
index c5122e2af..8d9389e18 100644
--- a/debian/pkg-zsh-workflow.org
+++ b/debian/pkg-zsh-workflow.org
@@ -381,6 +381,13 @@
in later git-dch runs.
+*** Update debian/gbp.conf
+
+ The debian/gbp.conf file contains a reference pointing to the upstream
+ branch. Therefore the upstream-branch configuration inside debian/gbp.conf
+ needs to be adjusted for new upstream releases.
+
+
*** Fix outstanding bug
If *any* outstanding bugs are known, they should be fixed before