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

The following commit has been merged in the master branch:
commit da9eab3ede386a60d4dc94a6658598c1c7f436fd
Author: vog <vog at notjusthosting.com>
Date:   Tue Jul 12 23:52:08 2011 +0000

    Improved error message in EpsImage
---
 src/epsimage.cpp           |  2 +-
 test/data/eps/eps-test.out | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index ced091f..97ed55e 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -691,7 +691,7 @@ namespace {
                 }
                 if (!isRemovableEmbedding) {
                     #ifndef SUPPRESS_WARNINGS
-                    EXV_WARNING << "Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: " << posOtherXmp << "
";
+                    EXV_WARNING << "XMP metadata block is not removable at position: " << posOtherXmp << "
";
                     #endif
                     if (write) throw Error(21);
                     break;
diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out
index 3bb3776..9fc1b9a 100644
--- a/test/data/eps/eps-test.out
+++ b/test/data/eps/eps-test.out
@@ -276,33 +276,33 @@ Exit code: 0
 -----> eps-flat_minimal_irremovable-xmp-before-endpagesetup.eps <-----
 
 Command: exiv2 -u -pa eps-flat_minimal_irremovable-xmp-before-endpagesetup.eps
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 837
+Warning: XMP metadata block is not removable at position: 837
 Xmp.test.test                                XmpText    20  TEST-irremovable-xmp
 Exit code: 253
 
 Command: exiv2 -f -eX eps-flat_minimal_irremovable-xmp-before-endpagesetup.eps
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 837
+Warning: XMP metadata block is not removable at position: 837
 Exit code: 0
 
 Command: exiv2 -ix eps-flat_minimal_irremovable-xmp-before-endpagesetup.eps
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 837
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 837
+Warning: XMP metadata block is not removable at position: 837
+Warning: XMP metadata block is not removable at position: 837
 eps-flat_minimal_irremovable-xmp-before-endpagesetup.eps: Could not write metadata to file: Failed to write image
 Exit code: 1
 
 -----> eps-flat_minimal_irremovable-xmp-before-endpagesetup_no-adocontainsxmp.eps <-----
 
 Command: exiv2 -u -pa eps-flat_minimal_irremovable-xmp-before-endpagesetup_no-adocontainsxmp.eps
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 809
+Warning: XMP metadata block is not removable at position: 809
 Exit code: 253
 
 Command: exiv2 -f -eX eps-flat_minimal_irremovable-xmp-before-endpagesetup_no-adocontainsxmp.eps
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 809
+Warning: XMP metadata block is not removable at position: 809
 Exit code: 0
 
 Command: exiv2 -ix eps-flat_minimal_irremovable-xmp-before-endpagesetup_no-adocontainsxmp.eps
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 809
-Warning: Inflexible XMP embedding is not replaceable because XMP metadata block is not removable at position: 809
+Warning: XMP metadata block is not removable at position: 809
+Warning: XMP metadata block is not removable at position: 809
 eps-flat_minimal_irremovable-xmp-before-endpagesetup_no-adocontainsxmp.eps: Could not write metadata to file: Failed to write image
 Exit code: 1
 

-- 
exiv2 packaging