From 34e7a71a7b05fea681ab6a88186522781af007c3 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 7 May 2010 15:41:44 -0600 Subject: [PATCH] Update the gitbuilder template; we'll extract later back to debian/master. --- debian/gbp.conf.template | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/debian/gbp.conf.template b/debian/gbp.conf.template index 0ccec1bc..b3fd1ddf 100644 --- a/debian/gbp.conf.template +++ b/debian/gbp.conf.template @@ -4,20 +4,13 @@ # edit as needed. [DEFAULT] -# the default build command: -#builder = debuild -i\.git/ -I.git #builder = debuild -d -us -uc -i\.git/ -I.git builder = pdebuild --debbuildopts '-d -i\.git/ -I.git' -# the default clean command: -#cleaner = debuild clean + cleaner = fakeroot debian/rules clean -# the default branch for upstream sources: -#upstream-branch = upstream -#upstream-branch = release/2.1.0/2 -upstream-branch = release/2.1.0 -# the default branch for the debian patch: -#debian-branch = master -debian-branch = dmaster-fixups # ideally debian/2.1.0, as a branch +upstream-branch = release/2.1.1-4.3rc +debian-branch = debian/2.1.1 + # the default tag formats used: #upstream-tag = upstream/%(version)s #debian-tag = debian/%(version)s -- 2.39.2