1 files changed, 47 insertions, 25 deletions
diff --git a/projects/git-buildpackage/gbp.conf b/projects/git-buildpackage/gbp.conf
index b959f77..bef74e4 100644
--- a/projects/git-buildpackage/gbp.conf
+++ b/projects/git-buildpackage/gbp.conf
@@ -4,6 +4,30 @@ sign-tags = True
 keyid = 0xB999CDB58C8DDBD2
 # use pristine tar by default
 pristine-tar = True
+dist = DEP14
+
+## The gbp commands ##
+[buildpackage]
+# Automatically push to remote repo after tagging a new release
+posttag = /var/scratch/debian/git-buildpackage/git-buildpackage/examples/gbp-posttag-push -u
+# Setup tmpfs for pbuilder
+prebuild = /home/agx/bin/tmpfs-build
+# Run Lintian after a succesful build
+postbuild = lintian $GBP_CHANGES_FILE
+# Build command
+#builder = dpkg-buildpackage -i -I -uc -us
+# Clean command
+cleaner = /bin/true
+pbuilder = True
+pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
+
+[import-orig]
+# Automatically forward the changelog after importing a new upstream version
+postimport = gbp dch -S -a --debian-branch=$GBP_BRANCH && git commit --amend -C@{0} debian/changelog
+import-msg = New upstream version %(version)s
+interactive = False
+# Don't bother merging the upstream branch, we know how the result should look like:
+merge-mode=replace
 
 [dch]
 # Parse meta tags like Closes: from commit messages
@@ -20,38 +44,36 @@ ignore-regex = (Signed-off|Acked)-by|git-svn-id:
 git-author = True
 # Merge changelog entries by maintainer
 multimaint-merge = True
-
-[buildpackage]
-# Automatically push to remote repo after tagging a new release
-posttag = /usr/share/doc/git-buildpackage/examples/gbp-posttag-push
-# Run Lintian after a succesful build
-postbuild = lintian $GBP_CHANGES_FILE
-# Build command
-builder = dpkg-buildpackage -i -I -uc -us
-# Clean command
-cleaner = /bin/true
-pbuilder = True
-pbuilder-options = --hookdir /home/agx/.pbuilder/hooks
-
-[import-orig]
-# Automatically forward the changelog after importing a new upstream version
-#postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
-import-msg = New upstream version %(version)s
-interactive = False
+# Always ignore branch
+ignore-branch = True
 
 [import-dsc]
 sign-tags = False
 allow-unauthenticated = True
 
+[pq]
+patch-numbers = False
+
+## Remote sites we create repos at ##
 [remote-config pkg-libvirt]
-# Location of the repository
-remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
-# Template dir to passed to git-init
+remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s.git
 template-dir = /srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
 
 [remote-config calendarserver]
-# Location of the repository
-remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s
+remote-url-pattern = ssh://git.debian.org/git/calendarserver/%(pkg)s.git
+
+# Git push based 'CI'
+[remote-config cowbuilder]
+bare = False
+template-dir = /home/agx/pkgs/templates
+remote-url-pattern = ssh://cowbuilder/~/pkgs/%(pkg)s
+
+[remote-config test] 
+remote-url-pattern = ssh://honk.dyn.sigxcpu.org/~/%(pkg)s.git
+
+## Hooks can put config in here too ##
+[gbp-posttag-push]
+upload-cmd = source-only-upload
+#upload-cmd = true
+#pristine-tar = False
 
-[pq]
-patch-numbers = False