Thanks, I pushed it.
On Wed, Nov 09, 2011 at 10:23:55AM -0800, Justin Pettit wrote: > Looks reasonable to me. > > --Justin > > > On Nov 9, 2011, at 8:35 AM, Ben Pfaff wrote: > > > This doesn't fix a visible bug, since there's no epoch in the Open vSwitch > > version used in Debian, but some Nicira internal build scripts were > > inserting an epoch so it was visible in our builds. > > > > Reported-by: Edwin Chiu <ec...@nicira.com> > > --- > > AUTHORS | 1 + > > debian/rules | 2 +- > > 2 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/AUTHORS b/AUTHORS > > index 0d4cc95..645596a 100644 > > --- a/AUTHORS > > +++ b/AUTHORS > > @@ -64,6 +64,7 @@ Dave Walker davewal...@ubuntu.com > > Derek Cormier derek.corm...@lab.ntt.co.jp > > Duffie Cooley dcoo...@nicira.com > > DK Moon dkm...@nicira.com > > +Edwin Chiu ec...@nicira.com > > Eivind Bulie Haanaes > > Gaetano Catalli gaetano.cata...@gmail.com > > George Shuklin ama...@desunote.ru > > diff --git a/debian/rules b/debian/rules > > index dd7c0fe..c8b6c63 100755 > > --- a/debian/rules > > +++ b/debian/rules > > @@ -15,7 +15,7 @@ BUILD_NUMBER = 0 > > > > PACKAGE=openvswitch > > pdkms=openvswitch-datapath-dkms > > -DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: > > ([^-]+).*,\1,p') > > +DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: > > ([0-9]:)*([^-]+).*,\2,p') > > srcfiles := $(filter-out debian, $(wildcard * .[^.]*)) > > > > ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) > > -- > > 1.7.2.5 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
