[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=2a7359b

The following commit has been merged in the master branch:
commit 2a7359b158c3f597c7c1408976330784bb94fa8f
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Sep 25 21:16:01 2016 +0000

    #1230 Buildserver maintenance.
---
 contrib/buildserver/buildserver.library | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/contrib/buildserver/buildserver.library b/contrib/buildserver/buildserver.library
index 40a739f..cd994a1 100644
--- a/contrib/buildserver/buildserver.library
+++ b/contrib/buildserver/buildserver.library
@@ -10,13 +10,13 @@ if [ -z "$DAILY"   ]; then export DAILY=userContent/builds/Daily       ; fi
 # osName - print 'macosx' or 'cygwin' or 'mingw' or 'linux'
 osName () {
     if   [ "$(uname)"    == Darwin ]; then
-      echo macosx
+         echo macosx
     elif [ "$(uname -o)" == Cygwin ]; then
-      echo cygwin
+         echo cygwin
     elif [ "$(uname -o)" == Msys   ]; then
-      echo mingw
+         echo mingw
     else
-      echo linux
+         echo linux
     fi
 }
 
@@ -24,7 +24,15 @@ osName () {
 # which PLATFORM
 # PLATFORM must be defined as msvc or ming when called from ssh
 if [ "$PLATFORM" == "" ]; then
-    export PLATFORM=$(echo osName)
+    if   [ "$(uname)"    == Darwin ]; then
+         export PLATFORM=macosx
+    elif [ "$(uname -o)" == Cygwin ]; then
+         export PLATFORM=cygwin
+    elif [ "$(uname -o)" == Msys   ]; then
+         export PLATFORM=mingw
+    else
+         export PLATFORM=linux
+    fi
     if [ "$PLATFORM" == "cygwin" ]; then
         # tweak path to ensure the correct version of perl and expr for autotools
         export "PATH=/bin:$PATH"

-- 
exiv2 packaging