[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=4ac2c94

The following commit has been merged in the master branch:
commit 4ac2c94ad23e7fa5bcb1a853c8ebf034a400de85
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Dec 10 11:12:47 2015 +0000

    #1041  Polishing jenkins_daily.sh
---
 jenkins_daily.sh | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/jenkins_daily.sh b/jenkins_daily.sh
index d03659a..7f03771 100755
--- a/jenkins_daily.sh
+++ b/jenkins_daily.sh
@@ -43,20 +43,9 @@ mkdir -p  $dist
 
 ##
 # test the build
-# For an unknown reason, we sometimes build the wrong architecture
-# I suspect this is due to a rogue version of vcvars.bat which does not understand x64
-export EXIV2_BINDIR=$dist
-if [ ! -e $dist/exiv2.exe ]; then
-    if [ "$arch" == "x64" -a -e $di32/exiv2.exe  ]; then
-        export EXIV2_BINDIR=$di32
-    fi 
-    if [ "$arch" == "Win32" -a -e $di64/exiv2.exe  ]; then
-        export EXIV2_BINDIR=$di64
-    fi
-fi
-
-if [ -e $EXIV2_BINDIR/exiv2.exe ]; then
+if [ -e $dist/exiv2.exe ]; then
     pushd  test
+    export EXIV2_BINDIR=$dist
     for test in addmoddel.sh \
         bugfixes-test.sh     \
         exifdata-test.sh     \

-- 
exiv2 packaging