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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:46:58 UTC 2017


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

The following commit has been merged in the master branch:
commit 30425b0626a4307ae70392feb165fdaddb4297c9
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Sep 18 19:37:55 2016 +0000

    #1109 Work in Progress on MinGW/32 daily build.
---
 contrib/buildserver/cmake_daily.sh | 4 ++--
 contrib/buildserver/test_daily.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index 6ba753e..400efb8 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -184,14 +184,14 @@ testBuild()
                     export CFLAGS=-m64
                     export CXXFLAGS=-m64
                     export LDFLAGS=-m64
-                    /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin; $0"
+                    /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin $0"
                     result=$?
                 fi
                 if [ "$win32" == true ]; then
                     export CFLAGS=-m32
                     export CXXFLAGS=-m32
                     export LDFLAGS=-m32
-                    /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:.; $0"
+                    /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. $0"
                     result=$?
                 fi
                 exit 0 ; # stop now. RECURSIVE will do the packaging
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index fd23b9a..214f006 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -154,14 +154,14 @@ case $PLATFORM in
                export CFLAGS=-m64
                export CXXFLAGS=-m64
                export LDFLAGS=-m64
-               /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin; $0"
+               /c/MinGW64/msys/1.0/bin/bash.exe -c "export PATH=/c/TDM-GCC-64/bin:/c/MinGW64/bin:/c/MinGW64/msys/1.0/bin:/c/MinGW64/msys/1.0/local/bin $0"
                result=$?
            fi
            if [ "$win32" == true ]; then
                export CFLAGS=-m32
                export CXXFLAGS=-m32
                export LDFLAGS=-m32
-               /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:.; /c/cygwin64/home/rmills/gnu/exiv2/buildserver/$0"
+               /c/MinGW/msys/1.0/bin/bash.exe -c "export PATH=/c/Qt/Qt5.6.0/5.6/mingw49_32/bin:/c/Qt/Qt5.6.0/Tools/mingw492_32/bin:/c/MinGW/bin:/usr/bin:/usr/local/bin:/c/cygwin64/bin:/c/Users/rmills/com:. $0"
                result=$?
            fi
         fi

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list