[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=4a75d4f

The following commit has been merged in the master branch:
commit 4a75d4f472e14e95a435c08ac5816bc8730c99f7
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Aug 30 07:32:14 2016 +0000

    #1203 test/webp-test.sh - silence warning about time format.
---
 test/data/webp-test.out | 18 +++++++-----------
 test/webp-test.sh       | 12 ++++++------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/test/data/webp-test.out b/test/data/webp-test.out
index 942ca04..e91665c 100644
--- a/test/data/webp-test.out
+++ b/test/data/webp-test.out
@@ -329,25 +329,22 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
   VP8  |   172008 |      598 | .G...*.. .>1..B.!..o.. ......]..
   EXIF |    12040 |   172614 | II*........................... .
   XMP  |     2864 |   184662 | <?xpacket begin="..." id="W5M0Mp
-Warning: Unsupported time format
 STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
  Chunk |   Length |   Offset | Payload
-  RIFF |   197870 |        0 | WEBP
+  RIFF |   188070 |        0 | WEBP
   VP8X |       10 |       12 | ,........
   ICCP |      560 |       30 | ...0ADBE....mntrRGB XYZ ........
   VP8  |   172008 |      598 | .G...*.. .>1..B.!..o.. ......]..
   EXIF |    12040 |   172614 | II*........................... .
-  XMP  |    13207 |   184662 | <?xpacket begin="..." id="W5M0Mp
+  XMP  |     3407 |   184662 | <?xpacket begin="..." id="W5M0Mp
 STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
  Chunk |   Length |   Offset | Payload
-  RIFF |   200568 |        0 | WEBP
+  RIFF |  1862068 |        0 | WEBP
   VP8X |       10 |       12 | ,........
   ICCP |      560 |       30 | ...0ADBE....mntrRGB XYZ ........
   VP8  |   172008 |      598 | .G...*.. .>1..B.!..o.. ......]..
   EXIF |    12040 |   172614 | II*........................... .
-  XMP  |    15905 |   184662 | <?xpacket begin="..." id="W5M0Mp
-Warning: Unsupported time format
-Warning: Unsupported time format
+  XMP  |  1677405 |   184662 | <x:xmpmeta xmlns:x="adobe:ns:met
 STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
  Chunk |   Length |   Offset | Payload
   RIFF |   187526 |        0 | WEBP
@@ -356,12 +353,11 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
   VP8  |   172008 |      598 | .G...*.. .>1..B.!..o.. ......]..
   EXIF |    12040 |   172614 | II*........................... .
   XMP  |     2864 |   184662 | <?xpacket begin="..." id="W5M0Mp
-Warning: Unsupported time format
 STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
  Chunk |   Length |   Offset | Payload
-  RIFF |   182354 |        0 | WEBP
+  RIFF |   187684 |        0 | WEBP
   VP8X |       10 |       12 | ,........
   ICCP |      560 |       30 | ...0ADBE....mntrRGB XYZ ........
   VP8  |   172008 |      598 | .G...*.. .>1..B.!..o.. ......]..
-  EXIF |     6868 |   172614 | II*........................... .
-  XMP  |     2864 |   179490 | <?xpacket begin="..." id="W5M0Mp
+  EXIF |    12198 |   172614 | II*.............................
+  XMP  |     2864 |   184820 | <?xpacket begin="..." id="W5M0Mp
diff --git a/test/webp-test.sh b/test/webp-test.sh
index c80f4d6..f654206 100755
--- a/test/webp-test.sh
+++ b/test/webp-test.sh
@@ -58,11 +58,11 @@ source ./functions.source
     exiv2 -pS                           $filename
     exiv2 -ix                           $filename
 
-    # copy the XMP from exiv2-bug937.jpg to test file
-    copyTestFile                        exiv2-bug937.jpg
-    exiv2 -pX                           exiv2-bug937.jpg > $xmp_name
-    exiv2 -ea --force                   exiv2-bug937.jpg 2>/dev/null
-    mv                                  exiv2-bug937.exv   $exv_name
+    # copy the XMP from exiv2-bug922.jpg to test file
+    copyTestFile                        exiv2-bug922.jpg
+    exiv2 -pX                           exiv2-bug922.jpg > $xmp_name
+    exiv2 -ea --force                   exiv2-bug922.jpg 2>/dev/null
+    mv                                  exiv2-bug922.exv   $exv_name
 
     copyTestFile                        $filename
     exiv2 -pS                           $filename
@@ -72,7 +72,7 @@ source ./functions.source
     exiv2 -pS                           $filename
 
     printf "EXIF " >&3
-    copyTestFile                        exiv2-bug937.jpg $filename
+    copyTestFile                        exiv2-bug922.jpg $filename
     exiv2 --force -ea                   $filename
     copyTestFile                        $filename
     exiv2 -pS                           $filename

-- 
exiv2 packaging