From bc36d6568988dca36ff58489dc4a1fecf7ec6c23 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 7 May 2010 15:42:22 -0600 Subject: [PATCH] Update git files from debian/2.1.0 --- .gbp.conf | 41 +++++++++++++++++++++++++++++++++++++++++ .gitignore | 1 + 2 files changed, 42 insertions(+) create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 index 00000000..1a572bfc --- /dev/null +++ b/.gbp.conf @@ -0,0 +1,41 @@ +# Configuration file for git-buildpackage and friends + +[DEFAULT] +#builder = debuild -d -us -uc -i\.git/ -I.git +builder = pdebuild --debbuildopts '-d -i\.git/ -I.git' + +cleaner = fakeroot debian/rules clean +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 + +# Options only affecting git-buildpackage +[git-buildpackage] +#upstream-branch = dfsgclean +# uncomment this to automatically GPG sign tags +#sign-tags = True +# keyid to GPG sign tags with +#keyid = 0xdeadbeef +# push to a remote repository after a successful tag: +#posttag = git-push git.example.com +# use this for more svn-buildpackage like bahaviour: +#export-dir = ../build-area/ +#tarball-dir = ../tarballs/ + +# Options only affecting git-import-orig +[git-import-orig] +#upstream-branch = newupstream +#debian-branch = dfsgclean + +# Options only affecting git-import-dsc +[git-import-dsc] +#upstream-branch = svn-upstream + +# Options only affecting git-dch +[git-dch] +#git-log = --no-merges +#snapshot-number = snapshot + 1 + diff --git a/.gitignore b/.gitignore index 93b03677..3587edeb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ support/sdk/java/net/tinyos/message/SerialPacket.java support/sdk/java/net/tinyos/packet/Serial.java support/sdk/java/net/tinyos/tools/PrintfMsg.java +/debian/control -- 2.39.2