Update gbp.conf

1 files changed, 29 insertions, 4 deletions

diff --git a/projects/git-buildpackage/gbp.conf b/projects/git-buildpackage/gbp.conf
index 7da678d..b959f77 100644
--- a/projects/git-buildpackage/gbp.conf
+++ b/projects/git-buildpackage/gbp.conf
@@ -1,8 +1,8 @@
 [DEFAULT]
 # Sign tags by default:
 sign-tags = True
-keyid = 0x3f3e6426
-# use pristine tar by defaul
+keyid = 0xB999CDB58C8DDBD2
+# use pristine tar by default
 pristine-tar = True
 
 [dch]
@@ -15,7 +15,11 @@ meta-closes = Closes|LP|BZ
 # Use the full commit message instead of the first line only
 full = True
 # Ignore these in commit messages
-ignore-regex = (Signed-off|Acked)-by:
+ignore-regex = (Signed-off|Acked)-by|git-svn-id:
+# Use author information from git
+git-author = True
+# Merge changelog entries by maintainer
+multimaint-merge = True
 
 [buildpackage]
 # Automatically push to remote repo after tagging a new release
@@ -26,7 +30,28 @@ postbuild = lintian $GBP_CHANGES_FILE
 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
+#postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH
+import-msg = New upstream version %(version)s
+interactive = False
+
+[import-dsc]
+sign-tags = False
+allow-unauthenticated = True
+
+[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
+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
+
+[pq]
+patch-numbers = False