[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=290baee

The following commit has been merged in the master branch:
commit 290baeea7249a654fa8ef9d023533b769ecbfa06
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Jul 2 22:18:29 2014 +0000

    svn_version: strengthened to handle errors from svn (for example when building from the distribution tar bundle)
---
 src/svn_version.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/svn_version.sh b/src/svn_version.sh
index 26c9767..1ed2511 100755
--- a/src/svn_version.sh
+++ b/src/svn_version.sh
@@ -2,7 +2,8 @@
 
 ## 
 # update svn_version.h when the revision has changed
-svn_version=$(svn info .. | grep ^Revision | cut -f 2 -d' ')
+svn_version=$(svn info .. 2>/dev/null | grep ^Revision | cut -f 2 -d' ')
+if [ -z "$svn_version" ]; then svn_version=0 ; fi
 if [ -e svn_version.h ]; then
 	old=$(cut -f 3 -d' ' svn_version.h)
 	if [ "$old" != "$svn_version" ]; then

-- 
exiv2 packaging