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

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

    #1109 Work in Progress on MinGW/32 daily build.  With good fortune, this is now complete!
---
 contrib/buildserver/cmake_daily.sh  |  4 +++-
 contrib/buildserver/dailyReadMe.txt | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index 3928b47..bdbbcf2 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -172,7 +172,7 @@ testBuild()
                 cp     -R /usr/local/share/man/man1/*exiv2* "$dist/share/man/man1/"
 
                 # run the test suite
-                make   tests | tee                          "$dist/logs/test.log"
+                make   tests | tee                          "$build/dist/logs/test.log"
             else
                 # recursively invoke MinGW/bash with appropriate tool chain
                 export RECURSIVE=1
@@ -254,6 +254,8 @@ if [ "$result" == "0" ]; then
         cat contrib/buildserver/dailyReadMe.txt | sed -E -e "s/__BUILD__/$zip/"  > "$build/dist/ReadMe.txt"
         mkdir -p                           "$build/dist/samples/"
         cp    samples/*.cpp samples/*.hpp  "$build/dist/samples/"
+        mkdir -p                           "$build/dist/contrib/Qt"
+        cp    contrib/Qt/*                 "$build/dist/contrib/Qt"
 
         # create the bundle
         pushd "$build" > /dev/null
diff --git a/contrib/buildserver/dailyReadMe.txt b/contrib/buildserver/dailyReadMe.txt
index 416d85f..a3c6d14 100644
--- a/contrib/buildserver/dailyReadMe.txt
+++ b/contrib/buildserver/dailyReadMe.txt
@@ -90,13 +90,16 @@ $
 platform = mingw
 -----------------
 
-dist/mingw/bin/exiv2.exe                             exiv2.exe and sample applications
-       .../bin/libexiv2-14.dll                       shared library
-          /lib/exiv2.dll.a                           libraries for exiv2/expat/zlib
-          /include/exiv2/                            include files
-          /share/                                    man pages
-dist/samples/exifprint.cpp                           sample code
-dist/logs/                                           log files
+This a 32bit build of Exiv2 aimed at Qt/MinGW users.
+
+dist/mingw/bin/exiv2.exe                              exiv2.exe and sample applications
+       .../bin/libexiv2-14.dll                        shared library
+          /lib/exiv2.dll.a                            libraries for exiv2/expat/zlib
+          /include/exiv2/                             include files
+          /share/                                     man pages
+dist/samples/                                         sample code
+dist/logs/                                            log files
+dist/contrib/Qt                                       Qt code and notes
 
 To run exiv2.exe:
 $ cd dist
@@ -125,6 +128,7 @@ dist3\x64\dll\Releasein\exiv2.exe               exiv2.exe and sample appli
                          \share\                      man pages
 dist\samples\exifprint.cpp                            sample code
 dist\logs\                                            log files
+dist/contrib/Qt                                       Qt code and notes
 distcvars.bat                                       script used by test_daily.sh
 
 To run exiv2.exe:

-- 
exiv2 packaging