[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:49 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a6ba04d
The following commit has been merged in the master branch:
commit a6ba04d422092d8b922aee11640ad1395d46abb9
Author: Robin Mills <robin at clanmills.com>
Date: Wed Aug 31 18:09:37 2016 +0000
#994 Update svn_version.h using svn info 'Last Changed Rev' instead of 'Changed'. This enables exiv2 -vVg svn to identify build branch or trunk.
---
src/svn_version.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/svn_version.sh b/src/svn_version.sh
index ff962e9..1e5c9eb 100755
--- a/src/svn_version.sh
+++ b/src/svn_version.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-##
+##
# update svn_version_h when revision changes
##
@@ -12,7 +12,7 @@ s=$?
# from Jenkins, svn is almost always a disaster because
# Jenkins SVN Plugin is 1.7 and the build machine is normally at least 1.8
if [ "$s" == "0" ]; then
- svn_version=$(svn info .. | grep ^Revision | cut -f 2 -d' ')
+ svn_version=$(svn info .. | grep '^Last Changed Rev' | cut -f 2 -d':' | tr -d ' ')
if [ -z "$svn_version" ]; then svn_version=0 ; fi
else
svn_version=0
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list