[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=37ea846

The following commit has been merged in the master branch:
commit 37ea846829e2a9d44eac240a026f4929d9cc2363
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 21 18:53:43 2016 +0000

    #1109 remove -std=c++98 in buildserver scripts.  This is now part of CMakeLists.txt (r4530) and ./configure (r4531)
---
 contrib/buildserver/cmake_daily.sh | 12 ++++++------
 contrib/buildserver/test_daily.sh  |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index 9a4c81b..f1996cf 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -116,14 +116,14 @@ testBuild()
                 ##
 
                 ##################
-                # 
+                #
                 # Reasons why I can't get cmake to work:
                 #
                 # 1) Even although gcc is on the path, we must tell cmake not to use /c/MinGW/bin/gcc)
                 # 2) It's using the wrong headers.  Needs /c/Qt/Qt5.6.0/Tools/mingw492_32/i686-w64-mingw32/include
                 #    cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF \
                 #                              -DCMAKE_C_COMPILER=$(which gcc) -DCMAKE_CXX_COMPILER=$(which g++) \
-                #                             "-DCMAKE_CXX_FLAGS=-std=c++98 -I/c/Qt/Qt5.6.0/Tools/mingw492_32/i686-w64-mingw32/include"
+                #                             "-DCMAKE_CXX_FLAGS=-I/c/Qt/Qt5.6.0/Tools/mingw492_32/i686-w64-mingw32/include"
                 #                              $exiv2
                 # 3) even so, it errors instantly on:
                 #    In file included from c:/Qt/Qt5.6.0/Tools/mingw492_32/i686-w64-mingw32/include/stddef.h:7:0,
@@ -140,15 +140,15 @@ testBuild()
                 #      from c:/Users/rmills/gnu/cmake/cmake-3.6.2/Utilities/cmlibarchive/libarchive/archive_platform.h:60,
                 #      from c:/Users/rmills/gnu/cmake/cmake-3.6.2/Utilities/cmlibarchive/libarchive/xxhash.c:35:
                 #      c:/Qt/Qt5.6.0/Tools/mingw492_32/i686-w64-mingw32/include/sdkddkver.h:186:2: error: #error NTDDI_VERSION and _WIN32_WINNT mismatch!
-                #    My work-around was to comment off the #error statement! 
+                #    My work-around was to comment off the #error statement!
                 ##################
 
                 ##
                 # build with autotools
                 make   clean
                 make   config
-                ./configure --prefix=/usr/local CXXFLAGS=-std=c++98
-                make 
+                ./configure --prefix=/usr/local
+                make
 
                 # install and make the samples
                 make   install
@@ -208,7 +208,7 @@ testBuild()
                 # I can guarantee it to be at least 3.4.1
                 # because I built it from source and installed it on the buildserver
                 /usr/local/bin/cmake -DCMAKE_INSTALL_PREFIX=$dist -DEXIV2_ENABLE_NLS=OFF $exiv2
-                make CXXFLAGS=-std=cxx98
+                make
                 result=$?
                 /usr/local/bin/cmake --build . --target install
                 testBuild
diff --git a/contrib/buildserver/test_daily.sh b/contrib/buildserver/test_daily.sh
index f4affe1..2f089d7 100755
--- a/contrib/buildserver/test_daily.sh
+++ b/contrib/buildserver/test_daily.sh
@@ -47,7 +47,7 @@ if [ -z "$RECURSIVE" ]; then
     if [  -e /tmp/jenkins ]; then
       rm -rf /tmp/jenkins
     fi
-    
+
     mkdir    /tmp/jenkins
     pushd    /tmp/jenkins 2>/dev/null
         echo $curl -O "$JENKINS/$DAILY/$build"
@@ -134,7 +134,7 @@ case $PLATFORM in
           done
         done
     ;;
-    
+
     mingw)
         if [ ! -z "$RECURSIVE" ]; then
             # test the delivered exiv2
@@ -150,8 +150,8 @@ case $PLATFORM in
 
             # compile, link and test the sample code
             echo ''
-            echo g++ -I$PLATFORM/include -L$PLATFORM/lib -std=c++98 samples/exifprint.cpp -lexiv2 -o $CD/exifprint
-                 g++ -I$PLATFORM/include -L$PLATFORM/lib -std=c++98 samples/exifprint.cpp -lexiv2 -o $CD/exifprint
+            echo g++ -I$PLATFORM/include -L$PLATFORM/lib samples/exifprint.cpp -lexiv2 -o $CD/exifprint
+                 g++ -I$PLATFORM/include -L$PLATFORM/lib samples/exifprint.cpp -lexiv2 -o $CD/exifprint
             echo "ls -alt $CD/exifprint.exe"
                   ls  -alt $CD/exifprint.exe
             echo ''

-- 
exiv2 packaging