diff -Nru gdcm-2.8.7/debian/changelog gdcm-2.8.7/debian/changelog --- gdcm-2.8.7/debian/changelog 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/changelog 2018-10-22 10:48:10.000000000 +0000 @@ -1,3 +1,19 @@ +gdcm (2.8.7-5) unstable; urgency=medium + + * Team upload + * d/p/5083513138fc90aa602b93293d2e44ae73e883b0.patch + - grab an additional fix from Ubuntu + + -- Gianfranco Costamagna Mon, 22 Oct 2018 12:48:10 +0200 + +gdcm (2.8.7-4) unstable; urgency=medium + + * Team upload + * debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch: + - adapt to new poppler 0.69 with upstream patch + + -- Gianfranco Costamagna Mon, 22 Oct 2018 11:35:13 +0200 + gdcm (2.8.7-3) unstable; urgency=medium * d/control: Add conflict with python2 packages, Closes: #908472 diff -Nru gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch --- gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch 1970-01-01 00:00:00.000000000 +0000 +++ gdcm-2.8.7/debian/patches/5083513138fc90aa602b93293d2e44ae73e883b0.patch 2018-10-22 10:48:10.000000000 +0000 @@ -0,0 +1,74 @@ +From 5083513138fc90aa602b93293d2e44ae73e883b0 Mon Sep 17 00:00:00 2001 +From: Mathieu Malaterre +Date: Thu, 18 Oct 2018 10:33:48 +0200 +Subject: [PATCH] Adapt to new poppler API + +Bug #462 +--- + Applications/Cxx/gdcminfo.cxx | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Applications/Cxx/gdcminfo.cxx b/Applications/Cxx/gdcminfo.cxx +index d926a2a8e..2c510d7df 100644 +--- a/Applications/Cxx/gdcminfo.cxx ++++ b/Applications/Cxx/gdcminfo.cxx +@@ -189,7 +189,7 @@ static int checkdeflated(const char *name) + static std::string getInfoDate(Dict *infoDict, const char *key) + { + Object obj; +- char *s; ++ const char *s; + int year, mon, day, hour, min, sec, n; + struct tm tmStruct; + //char buf[256]; +@@ -201,7 +201,8 @@ static std::string getInfoDate(Dict *infoDict, const char *key) + if (infoDict->lookup((char*)key, &obj)->isString()) + #endif + { +- s = obj.getString()->getCString(); ++ const GooString* gs = obj.getString(); ++ s = gs->getCString(); + if (s[0] == 'D' && s[1] == ':') + { + s += 2; +@@ -256,7 +257,7 @@ static std::string getInfoDate(Dict *infoDict, const char *key) + static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap) + { + Object obj; +- GooString *s1; ++ const GooString *s1; + GBool isUnicode; + Unicode u; + char buf[8]; +Index: gdcm-2.8.7/Applications/Cxx/gdcmpdf.cxx +=================================================================== +--- gdcm-2.8.7.orig/Applications/Cxx/gdcmpdf.cxx ++++ gdcm-2.8.7/Applications/Cxx/gdcmpdf.cxx +@@ -37,7 +37,7 @@ + static std::string getInfoDate(Dict *infoDict, const char *key) + { + Object obj; +- char *s; ++ const char *s; + int year, mon, day, hour, min, sec, n; + struct tm tmStruct; + //char buf[256]; +@@ -49,7 +49,8 @@ + if (infoDict->lookup((char*)key, &obj)->isString()) + #endif + { +- s = obj.getString()->getCString(); ++ const GooString* gs = obj.getString(); ++ s = gs->getCString(); + if (s[0] == 'D' && s[1] == ':') + { + s += 2; +@@ -104,7 +105,7 @@ + static std::string getInfoString(Dict *infoDict, const char *key, UnicodeMap *uMap, GBool & unicode) + { + Object obj; +- GooString *s1; ++ const GooString *s1; + GBool isUnicode = gFalse; + Unicode u; + char buf[8]; diff -Nru gdcm-2.8.7/debian/patches/series gdcm-2.8.7/debian/patches/series --- gdcm-2.8.7/debian/patches/series 2018-10-01 18:48:07.000000000 +0000 +++ gdcm-2.8.7/debian/patches/series 2018-10-22 10:48:10.000000000 +0000 @@ -8,3 +8,4 @@ gdcm-fix-xslt-maxdepth.patch fix-vtkjava-build-dir.patch add_cxx11_vtk_defines.patch +5083513138fc90aa602b93293d2e44ae73e883b0.patch