summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Beaupré2011-09-29 15:05:02 -0400
committerAntoine Beaupré2011-09-29 15:05:02 -0400
commitd2848af48e5939918131b976fd430f41033e8c6c (patch)
tree87520cc6fdf3a34a707f68d86e8e8a5b3f2a51b0
parent78d4df2a5f81485a470291f4086f93136d2c4216 (diff)
fix git-buildpackage configuration to follow new versionsdebian/1.4-1
-rw-r--r--debian/gbp.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 94e3149..3bab0d8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,6 +3,9 @@
upstream-branch = upstream
# and we merge the upstream branch here when we upgrade the package
debian-branch = debian
+# we do not checkout the .orig tarball from the tag, but from the
+# upstream branch
+upstream-tree = branch
export-dir = build-area/
tarball-dir = build-area/tarballs/