[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=1db1974

The following commit has been merged in the master branch:
commit 1db19743787b950fbf260c6f1c205bf8e37ee179
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 13 10:23:34 2017 +0200

    Drop upstream patches
---
 debian/patches/series                   |  1 -
 debian/patches/upstream-fix-casio-crash | 18 ------------------
 2 files changed, 19 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 4746860..381e3f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream-fix-casio-crash
 CVE-2017-9239.patch
diff --git a/debian/patches/upstream-fix-casio-crash b/debian/patches/upstream-fix-casio-crash
deleted file mode 100644
index 2603745..0000000
--- a/debian/patches/upstream-fix-casio-crash
+++ /dev/null
@@ -1,18 +0,0 @@
-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