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

The following commit has been merged in the master branch:
commit e572f25107715d77846d99085864eda0c63b5492
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Sep 21 19:03:21 2016 +0000

    #1109 MinGW/32 daily build.  Documentation update to reflect r4530 and r4531
---
 contrib/Qt/ReadMe.txt               | 12 ++++++------
 contrib/buildserver/dailyReadMe.txt |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/Qt/ReadMe.txt b/contrib/Qt/ReadMe.txt
index 794b8f3..eed5d8b 100644
--- a/contrib/Qt/ReadMe.txt
+++ b/contrib/Qt/ReadMe.txt
@@ -17,8 +17,8 @@ OR
    /c/Users/rmills/gnu/exiv2/trunk/contrib/Qt > qmake commandLinePro.pro
 
 3) Build commandLineTool.cpp
-   /c/Users/rmills/gnu/exiv2/trunk/contrib/Qt > make -B CXXFLAGS=-std=c++98 LDFLAGS=-L/usr/local/lib
-    
+   /c/Users/rmills/gnu/exiv2/trunk/contrib/Qt > make -B LDFLAGS=-L/usr/local/lib
+
 4) Run commandLineTool.exe
    /c/Users/rmills/gnu/exiv2/trunk/contrib/Qt > release/commandLineTool.exe
 
@@ -33,15 +33,15 @@ Gotchas (that I know about)
 3  You may need to copy libstdc++-6.dll to /usr/local/bin
    cp $(which libstdc++-6.dll) /usr/local/bin
 
-4  You may have to edit commandLineTool.pro to match environment
+4  You may have to edit commandLineTool.pro to match your environment
 
 5  DO NOT USE Cygwin Builds
 
 6  Do not give up.
    This stuff works.  You may have to work quite hard to get it working.
-   Don't give up.  It will work.
+   Don't give up.     It will work.
 
-7  If you give up with MinGW, use Visual Studio
+7  If you give up with MinGW, use Visual Studio.
 
 Running MinGW bash and setting Qt tools in the path
 ---------------------------------------------------
@@ -70,7 +70,7 @@ rem ------------------
 UNICODE_PATH
 ------------
 
-Qt users may prefer to build Exiv2 to support UNICODE_PATH.  The sample application samples/exifprint.cpp works with UNICODE_PATH.  
+Qt users may prefer to build Exiv2 to support UNICODE_PATH.  The sample application samples/exifprint.cpp works with UNICODE_PATH.
 
 Searching for more information about Qt, MinGW and UNICODE_PATH
 ---------------------------------------------------------------
diff --git a/contrib/buildserver/dailyReadMe.txt b/contrib/buildserver/dailyReadMe.txt
index 9096902..49b4027 100644
--- a/contrib/buildserver/dailyReadMe.txt
+++ b/contrib/buildserver/dailyReadMe.txt
@@ -25,7 +25,7 @@ $ linux/bin/exiv2
 To compile and link your own code:
 $ cd dist
 $ sudo cp -R linux/* /usr/local/
-$ g++ samples/exifprint.cpp -lexiv2 -o exifprint
+$ g++ -std=c++98 samples/exifprint.cpp -L/usr/local/lib -lexiv2 -o exifprint
 $ ./exifprint --version
 exiv2=0.25.0
 ...
@@ -55,7 +55,7 @@ $ macosx/bin/exiv2
 To compile and link your own code:
 $ cd dist
 $ sudo cp -R macosx/* /usr/local
-$ g++ samples/exifprint.cpp -lexiv2 -o exifprint
+$ g++ -std=c++98 samples/exifprint.cpp -L/usr/local/lib -lexiv2 -o exifprint
 $ ./exifprint --version
 exiv2=0.25.0
 ...
@@ -84,7 +84,7 @@ To compile and link your own code:
            An error such as "incorrect architecture" is a symptom of using cygwin32
 $ cd dist
 $ cp -R cygwin/* /usr/local
-$ g++ -L/usr/local/lib -lexiv2 samples/exifprint.cpp -o exifprint
+$ g++ -std=c++98 samples/exifprint.cpp -L/usr/local/lib -lexiv2 -o exifprint
 $ ./exifprint --version
 exiv2=0.25.0
 ...
@@ -115,7 +115,7 @@ To compile and link your own code:
            An error such as "incorrect architecture" is a symptom of using mingw64
 $ cd dist
 $ cp -R mingw/*  /usr/local
-$ g++ --std=c++98 -L/usr/local/lib -lexiv2.dll samples/exifprint.cpp -o exifprint
+$ g++ -std=c++98 samples/exifprint.cpp -L/usr/local/lib -lexiv2.dll -o exifprint
 $ ./exifprint --version
 exiv2=0.25.0
 ...

-- 
exiv2 packaging