From 77912ae717298cb06544f1bebd9701d0b3c2f2f0 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 9 Nov 2011 08:35:33 -0800 Subject: [PATCH] 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 --- AUTHORS | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 0d4cc959..645596a4 100644 --- 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 dd7c0fe4..c8b6c636 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))) -- 2.30.2