debian: Strip epoch from version number used in directory names.

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 <echiu@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 0d4cc959bb0b9b6cf13fe2399d7016978c644e6b..645596a48d7f41d04f055f60f6215bbbaae24056 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -64,6 +64,7 @@ Dave Walker             DaveWalker@ubuntu.com
 Derek Cormier           derek.cormier@lab.ntt.co.jp
 Duffie Cooley           dcooley@nicira.com
 DK Moon                 dkmoon@nicira.com
+Edwin Chiu              echiu@nicira.com
 Eivind Bulie Haanaes
 Gaetano Catalli         gaetano.catalli@gmail.com
 George Shuklin          amarao@desunote.ru

diff --git a/debian/rules b/debian/rules
index dd7c0fe44e70835e99b892f9be7b3105488d39c4..c8b6c636fcdc57917fab428bdd15d88db3ae284a 100755 (executable)
--- 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)))