[SCM] exiv2 packaging branch, master, updated. debian/0.25-2-5-gb5dd0bf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d28fd03

The following commit has been merged in the master branch:
commit d28fd0363c112b2b43ad2a57b6609bb99fb93795
Author: Norbert Preining <norbert at preining.info>
Date:   Wed May 18 18:36:16 2016 +0200

    Planned NMU
    
      * Fix crashes on Casio images files (upstream cherry pick) (Closes: #814051)
      * mention XMP in the description (Closes: #790784)
---
 debian/changelog                        |  8 ++++++++
 debian/control                          | 10 +++++-----
 debian/patches/series                   |  1 +
 debian/patches/upstream-fix-casio-crash | 18 ++++++++++++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca39003..2a6c84e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 --git a/debian/control b/debian/control
index c4d19b5..b2740c3 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/exiv2.git
 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 @@ Pre-Depends: ${misc:Pre-Depends}
 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 @@ Section: libdevel
 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 @@ Package: libexiv2-doc
 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 @@ Section: debug
 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 --git a/debian/patches/series b/debian/patches/series
index 50dcbcc..6244361 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 libtool_update.diff
+upstream-fix-casio-crash
diff --git a/debian/patches/upstream-fix-casio-crash b/debian/patches/upstream-fix-casio-crash
new file mode 100644
index 0000000..2603745
--- /dev/null
+++ b/debian/patches/upstream-fix-casio-crash
@@ -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

-- 
exiv2 packaging