[Glibc-bsd-commits] r5857 - trunk/freebsd-utils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2015-12-08 19:28:31 +0000 (Tue, 08 Dec 2015)
New Revision: 5857

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/rules
Log:
Support +ds source_version suffix in svn_revision


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2015-12-06 18:09:39 UTC (rev 5856)
+++ trunk/freebsd-utils/debian/changelog	2015-12-08 19:28:31 UTC (rev 5857)
@@ -1,3 +1,9 @@
+freebsd-utils (10.1~svn273304+ds1-1) UNRELEASED; urgency=medium
+
+  * Support +ds source_version suffix in svn_revision
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Tue, 08 Dec 2015 18:52:10 +0000
+
 freebsd-utils (10.1~svn273304-2) experimental; urgency=medium
 
   * fstype_alias.diff:  accept some Linux-style names for `mount -t`

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2015-12-06 18:09:39 UTC (rev 5856)
+++ trunk/freebsd-utils/debian/rules	2015-12-08 19:28:31 UTC (rev 5857)
@@ -31,7 +31,7 @@
 
 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')
+svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)[+-].*/\1/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')