From 2e9fe043c9c1c38ffc02bd9ec6a7e9ec0f64e0b8 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Mon, 7 Dec 2009 13:49:02 -0700 Subject: [PATCH] Update changelog and .gbp.conf --- .gbp.conf | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 6 +++--- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 .gbp.conf diff --git a/.gbp.conf b/.gbp.conf new file mode 100644 index 00000000..1fe90139 --- /dev/null +++ b/.gbp.conf @@ -0,0 +1,43 @@ +# Configuration file for git-buildpackage and friends +# +# Copy this to .gbp.conf in the git repo top directory after merging and +# edit as needed. + +[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 = tinyos/2.0.2.2 +debian-branch = debian/2.0.2.2 + +# 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/debian/changelog b/debian/changelog index 72b9b40c..fcb08f64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -tinyos (2.1.0-1tinyos1) hardy; urgency=low +tinyos (2.0.2.2-1tinyos1) hardy; urgency=low - * Package tinyOS upstream release 2.1.0. + * Package tinyOS upstream release 2.0.2.2 - -- R. Steve McKown Fri, 04 Dec 2009 15:14:38 -0700 + -- R. Steve McKown Mon, 07 Dec 2009 13:48:29 -0700 -- 2.39.2