From 0cc6a24d0e3fc8b9e6b97dbb85894feb49d55910 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Mon, 7 Dec 2009 11:07:11 -0700 Subject: [PATCH] Update integration branch for release/2.1.0-3 --- .gbp.conf | 2 +- debian/changelog | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gbp.conf b/.gbp.conf index 510aed0b..fa044c82 100644 --- a/.gbp.conf +++ b/.gbp.conf @@ -5,7 +5,7 @@ builder = pdebuild --debbuildopts '-d -i\.git/ -I.git' cleaner = fakeroot debian/rules clean -upstream-branch = tinyos/2.1.0 +upstream-branch = release/2.1.0-3 debian-branch = debian/2.1.0 # the default tag formats used: diff --git a/debian/changelog b/debian/changelog index 72b9b40c..95b32866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -tinyos (2.1.0-1tinyos1) hardy; urgency=low +tinyos (2.1.0-3-1tinyos1) hardy; urgency=low - * Package tinyOS upstream release 2.1.0. + * Package TMI release 2.1.0-3, based on official tinyOS release 2.1.0. - -- R. Steve McKown Fri, 04 Dec 2009 15:14:38 -0700 + -- R. Steve McKown Mon, 07 Dec 2009 11:06:20 -0700 -- 2.39.2