[Pkg-kde-extras] Bug#814051: Planned NMU

[Norbert Preining]

Hi Max,

so here is the stuff about the NMU. I sent this email to the 
bug report ...

On Sun, 15 May 2016, Norbert Preining wrote:
> Package: libexiv2-14
> Followup-For: Bug #814051
> 
> This bug is fixed in svn 3889 and 3890 in upstream svn, 9 months ago
> 
> 
> I have prepared a NMU that will fix this bug and plan to upload it
> to the DELAYED-7 queue.

I attach a corrected debdiff which also fixes a simple bug
about the description not mentioning XMP.

Let me know if you are fine with that and I will upload (direct?
delayed-7).

All the best and thanks for your work

Norbert

------------------------------------------------------------------------
PREINING, Norbert                               http://www.preining.info
JAIST, Japan                                 TeX Live & Debian Developer
GPG: 0x860CDC13   fp: F7D8 A928 26E3 16A1 9FA0  ACF0 6CAC A448 860C DC13
------------------------------------------------------------------------
-------------- next part --------------
diff -Nru exiv2-0.25/debian/changelog exiv2-0.25/debian/changelog
--- exiv2-0.25/debian/changelog	2015-10-08 15:42:37.000000000 +0900
+++ exiv2-0.25/debian/changelog	2016-05-17 23:11:04.000000000 +0900
@@ -1,3 +1,11 @@
+exiv2 (0.25-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix crashes on Casio images files (upstream cherry pick) (Closes: #814051)
+  * mention XMP in the description (Closes: #790784)
+
+ -- Norbert Preining <preining at debian.org>  Tue, 17 May 2016 23:08:21 +0900
+
 exiv2 (0.25-2.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru exiv2-0.25/debian/control exiv2-0.25/debian/control
--- exiv2-0.25/debian/control	2015-08-06 19:37:59.000000000 +0900
+++ exiv2-0.25/debian/control	2016-05-17 23:08:14.000000000 +0900
@@ -20,7 +20,7 @@
 Package: exiv2
 Architecture: any
 Depends: libexiv2-14 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Description: EXIF/IPTC metadata manipulation tool
+Description: EXIF/IPTC/XMP metadata manipulation tool
  Exiv2 is a C++ library and a command line utility to manage image metadata.
  It provides fast and easy read and write access to the Exif, IPTC and XMP
  metadata of images in various formats
@@ -46,7 +46,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: exiv2
 Multi-Arch: same
-Description: EXIF/IPTC metadata manipulation library
+Description: EXIF/IPTC/XMP metadata manipulation library
  Exiv2 is a C++ library and a command line utility to manage image metadata.
  It provides fast and easy read and write access to the Exif, IPTC and XMP
  metadata of images in various formats
@@ -69,7 +69,7 @@
 Architecture: any
 Depends: libexiv2-14 (= ${binary:Version}), ${misc:Depends}
 Suggests: libexiv2-doc
-Description: EXIF/IPTC metadata manipulation library - development files
+Description: EXIF/IPTC/XMP metadata manipulation library - development files
  Exiv2 is a C++ library and a command line utility to manage image metadata.
  It provides fast and easy read and write access to the Exif, IPTC and XMP
  metadata of images in various formats
@@ -80,7 +80,7 @@
 Depends: libjs-jquery, ${misc:Depends}
 Section: doc
 Architecture: all
-Description: EXIF/IPTC metadata manipulation library - HTML documentation
+Description: EXIF/IPTC/XMP metadata manipulation library - HTML documentation
  Exiv2 is a C++ library and a command line utility to manage image metadata.
  It provides fast and easy read and write access to the Exif, IPTC and XMP
  metadata of images in various formats
@@ -93,7 +93,7 @@
 Architecture: any
 Priority: extra
 Multi-Arch: same
-Description: EXIF/IPTC metadata manipulation library - debug
+Description: EXIF/IPTC/XMP metadata manipulation library - debug
  Exiv2 is a C++ library and a command line utility to manage image metadata. It
  provides fast and easy read and write access to the Exif, IPTC and XMP metadata
  of images in various formats
diff -Nru exiv2-0.25/debian/patches/series exiv2-0.25/debian/patches/series
--- exiv2-0.25/debian/patches/series	2015-08-06 19:37:59.000000000 +0900
+++ exiv2-0.25/debian/patches/series	2016-05-15 21:03:46.000000000 +0900
@@ -1 +1,2 @@
 libtool_update.diff
+upstream-fix-casio-crash
diff -Nru exiv2-0.25/debian/patches/upstream-fix-casio-crash exiv2-0.25/debian/patches/upstream-fix-casio-crash
--- exiv2-0.25/debian/patches/upstream-fix-casio-crash	1970-01-01 09:00:00.000000000 +0900
+++ exiv2-0.25/debian/patches/upstream-fix-casio-crash	2016-05-15 21:07:37.000000000 +0900
@@ -0,0 +1,18 @@
+upstream svn 3889 and 3890 to prevent crashing on cimg
+---
+ src/makernote.cpp |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- exiv2-0.25.orig/src/makernote.cpp
++++ exiv2-0.25/src/makernote.cpp
+@@ -79,7 +79,9 @@
+         { "-",              olympusId,   0,              newOlympusMn2   },
+         { "-",              olympus2Id,  0,              newOlympus2Mn2  },
+         { "-",              pentaxId,    0,              newPentaxMn2    },
+-        { "-",              pentaxDngId, 0,              newPentaxDngMn2 }
++        { "-",              pentaxDngId, 0,              newPentaxDngMn2 },
++	{ "-",              casioId,     0,              newIfdMn2       },
++	{ "-",              casio2Id,    0,              newCasio2Mn2    }
+     };
+ 
+     bool TiffMnRegistry::operator==(const std::string& key) const