[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=d5fef7b

The following commit has been merged in the master branch:
commit d5fef7b428e9e2fba2743d7936a24c4e7881d832
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Sep 19 08:24:24 2016 +0000

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

diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index e472f3b..3928b47 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -170,7 +170,6 @@ testBuild()
                 cp     -R /usr/local/lib/pkgconfig/*        "$dist/lib/pkgconfig"
                 mkdir  -p                                   "$dist/share/man/man1/"
                 cp     -R /usr/local/share/man/man1/*exiv2* "$dist/share/man/man1/"
-                mkdir  -p                                   "$dist/samples"
 
                 # run the test suite
                 make   tests | tee                          "$dist/logs/test.log"
@@ -253,8 +252,8 @@ if [ "$result" == "0" ]; then
 
         # add documentation and samples to dist
         cat contrib/buildserver/dailyReadMe.txt | sed -E -e "s/__BUILD__/$zip/"  > "$build/dist/ReadMe.txt"
-        mkdir -p                    "$build/dist/samples/"
-        cp    samples/*             "$build/dist/samples/"
+        mkdir -p                           "$build/dist/samples/"
+        cp    samples/*.cpp samples/*.hpp  "$build/dist/samples/"
 
         # create the bundle
         pushd "$build" > /dev/null
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index abc9507..6f9ddb5 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -3,7 +3,7 @@
 source $(find . -name buildserver.library 2>/dev/null)
 
 echo -------------------------------
-echo PLATFORM = $PLATFORM
+echo PLATFORM = $PLATFORM PWD = $PWD
 echo -------------------------------
 ##
 # figure out today's build
@@ -126,6 +126,7 @@ case $PLATFORM in
     
     mingw)
         if [ ! -z "$RECURSIVE" ]; then
+        	svn update .
             # test the delivered exiv2
             PATH="$PWD/$PLATFORM/bin:$PATH"
             echo ''

-- 
exiv2 packaging