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

The following commit has been merged in the master branch:
commit 7eba7b27d6071d0b539074abc3d242af7bc7aac2
Author: Robin Mills <robin at clanmills.com>
Date:   Sat May 2 13:22:40 2015 +0000

    #1072  test/tiff-test.sh rewrite. Correction to r3778 (which is incorrectly attributed to 1073)
---
 README            | 16 +++++++---------
 test/tiff-test.sh |  2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README b/README
index eed63a8..0426c5d 100644
--- a/README
+++ b/README
@@ -25,13 +25,12 @@ You can build the libraries in the following ways:
 
 2 Microsoft Visual C++
   - see msvc2003/ReadMe.txt      (32bit build           VC7.1/2003 2005,2008)
-  - see msvc2005/ReadMe.txt      (32bit and 64bit build VC8/2005,  2008,2010)
-  - see msvc2012/ReadMe.txt      (32bit and 64bit build VC11/2012           )
+  - see msvc2005/ReadMe.txt      (32bit and 64bit build VC8/2005,  2008,2010,2012)
 
 3 CMake (experimental support for cmake on all platforms)
   - see README-CMAKE for more information
 
-To build a commercial version of the Exiv2 library, see also section 
+To build a commercial version of the Exiv2 library, see also section
 "Commercial version" at the end of this file.
 
 On UNIX-like systems, use the GNU configure script. Run the following
@@ -42,8 +41,8 @@ build and install the library and utility:
     $ make
     $ sudo make install
 
-If you downloaded the source code from the subversion repository, you 
-won't have a configure script. Run 'make config' to generate it and see 
+If you downloaded the source code from the subversion repository, you
+won't have a configure script. Run 'make config' to generate it and see
 the section "Hacking" below.
 
 The default install locations are /usr/local/lib for the library,
@@ -78,7 +77,7 @@ gettext  *)  http://www.gnu.org/software/gettext/
 libiconv *)  http://www.gnu.org/software/libiconv/
 expat        http://expat.sourceforge.net/
 
-*) Some systems have gettext and iconv in libc. The configure script 
+*) Some systems have gettext and iconv in libc. The configure script
 should detect this.
 
 On Linux, it is usually best to install the dependencies through the
@@ -162,7 +161,7 @@ for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, 
+Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
 MA 02110-1301 USA.
 
 Commercial version
@@ -176,10 +175,9 @@ To do this on Windows, compile the library with the preprocessor
 symbol EXV_COMMERCIAL_VERSION defined in:
    msvc2003\include\exv_msvc.h
 or msvc2005\include\exv_msvc.h
-or msvc2012\include\exv_msvc.h
 
 On UNIX-like systems, run the configure
-script with the options --enable-commercial --disable-nls 
+script with the options --enable-commercial --disable-nls
 --disable-lensdata.
 
 # That's all Folks
diff --git a/test/tiff-test.sh b/test/tiff-test.sh
index fef74ca..cfec646 100644
--- a/test/tiff-test.sh
+++ b/test/tiff-test.sh
@@ -64,7 +64,7 @@ exifprobe()
 		LEN=${LENS[$INDEX]}
 		OFF=${OFFS[$INDEX]}
 		VAL=${VALS[$INDEX]}
-		ECHO ${TAG} $'	' ${TYP} $'	' ${LEN} $'	' '"'${VAL}'"'
+		echo ${TAG} $'	' ${TYP} $'	' ${LEN} $'	' '"'${VAL}'"'
 		INDEX=$((INDEX+1))
 	done
 

-- 
exiv2 packaging