[Glibc-bsd-commits] r5945 - trunk/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-19 20:52:29 +0000 (Sat, 19 Mar 2016)
New Revision: 5945

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Amend svn_revision regex to support local suffixes
(Thanks, Jon Boden) (Closes: #818700)


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2016-03-19 18:04:22 UTC (rev 5944)
+++ trunk/kfreebsd-10/debian/changelog	2016-03-19 20:52:29 UTC (rev 5945)
@@ -1,3 +1,10 @@
+kfreebsd-10 (10.3~svn296373-3) UNRELEASED; urgency=medium
+
+  * Amend svn_revision regex to support local suffixes
+    (Thanks, Jon Boden) (Closes: #818700)
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 19 Mar 2016 20:49:47 +0000
+
 kfreebsd-10 (10.3~svn296373-2) experimental; urgency=medium
 
   * Directly declare Build-Depends: freebsd-mk (>= 10.3~), since

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2016-03-19 18:04:22 UTC (rev 5944)
+++ trunk/kfreebsd-10/debian/rules	2016-03-19 20:52:29 UTC (rev 5945)
@@ -13,7 +13,7 @@
 source		:= $(shell dpkg-parsechangelog | grep ^Source: | sed -e 's/^.*: //g')
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
 tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]\+.*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
 version		:= $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
 major           := $(shell echo $(version) | sed -e 's/\..*//g')
 revision	:= $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')