[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=6efd001

The following commit has been merged in the master branch:
commit 6efd001272feb5f01d48febeefe85caf3f749a52
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Dec 11 19:08:55 2015 +0000

    #1041.  Correction to r4099 for Linux
---
 jenkins_daily.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index c52577e..83b249f 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -12,6 +12,9 @@ vs=2013
 
 result=0
 
+uname=$(uname)
+if [ "$uname"    == "Linux"  ]; then PLATFORM=linux  ; fi
+if [ "$uname"    == "Darwin" ]; then PLATFORM=macosx ; fi
 ##
 # determine location of the build and source directories
 if [ "$PLATFORM" == "msvc" ]; then
@@ -92,8 +95,7 @@ if [ -e $dist/$bin/exiv2$exe ]; then
     ##
     # store the build for users to collect
     mmHD=""
-    uname=$(uname)
-    if [ "$PLATFORM" == "linux" -o "$uname"    == "Linux" ]; then
+    if [ "$PLATFORM" == "linux" ]; then
     	mmHD=/media/psf/Host
     fi
     if [ "$PLATFORM" == "msvc" -o  "$PLATFORM" == "cygwin" ]; then
@@ -114,7 +116,7 @@ if [ -e $dist/$bin/exiv2$exe ]; then
         dow=$(date|cut -d' ' -f 1) # Thu   day of the week
         dom=$(date|cut -d' ' -f 2) # 10    day of the month
         mon=$(date|cut -d' ' -f 2) # Dec   month
-        svn=$($dist/exiv2.exe -vVg|grep -e ^svn | cut -d= -f 2)
+        svn=$($EXIV2_BINDIR/exiv2$exe -vVg|grep -e ^svn | cut -d= -f 2)
         date=$(date +'%Y-%m-%d+%H-%M-%S')
         b="${PLATFORM}-svn-${svn}-date-${date}.tar.gz"
         echo build = "$b"

-- 
exiv2 packaging