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 <[email protected]>
---
 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             [email protected]
 Derek Cormier           [email protected]
 Duffie Cooley           [email protected]
 DK Moon                 [email protected]
+Edwin Chiu              [email protected]
 Eivind Bulie Haanaes
 Gaetano Catalli         [email protected]
 George Shuklin          [email protected]
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
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to