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

The following commit has been merged in the master branch:
commit 2c8988fc7a82132dd2f406f5db6548bf69a757b3
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Dec 15 15:25:20 2015 +0000

    #1109 and #1041  Debugging cygwin/jenkins_build.sh  I don't know why this has broken as it has been working perfectly for at least a year.
---
 jenkins_build.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/jenkins_build.sh b/jenkins_build.sh
index 49db985..cb59f47 100755
--- a/jenkins_build.sh
+++ b/jenkins_build.sh
@@ -163,8 +163,12 @@ case "$build" in
 
 			# deal with 32bit and 64bit build requests
 			# Jenkins invokes the 32 bit cygwin, so recursively build 64 bits.
+			echo make clean
 			make clean
+			echo rm config.log config.status
 			rm   -rf config.log config.status
+			echo make config
+			make config
 			echo ./configure ${withcurl} ${withssh} --disable-nls
 				 ./configure ${withcurl} ${withssh} --disable-nls
 			make -j
@@ -176,14 +180,14 @@ case "$build" in
         else
 			if [ "$x64" == true ]; then
 				export RECURSIVE=1
-				# /cygdrive/c/cygwin64/bin/bash.exe -c "cd $PWD ; ./$0"
-				cd "$PWD" ; ./$0
+				/cygdrive/c/cygwin64/bin/bash.exe -c "cd $PWD ; ./$0"
+				# cd "$PWD" ; ./$0
 				result=$?
 			fi
 			if [ "$Win32" == true ]; then
 				export RECURSIVE=1
-				# /cygdrive/c/cygwin/bin/bash.exe -c "cd $PWD ; ./$0"
-				cd "$PWD" ; ./$0
+				/cygdrive/c/cygwin/bin/bash.exe -c "cd $PWD ; ./$0"
+				# cd "$PWD" ; ./$0
 				result=$?
 			fi
         fi

-- 
exiv2 packaging