diff options
| author | Bastien ROUCARIÈS <roucaries.bastien@gmail.com> | 2016-09-05 16:57:00 (GMT) |
|---|---|---|
| committer | Bastien ROUCARIÈS <roucaries.bastien@gmail.com> | 2016-09-05 16:57:48 (GMT) |
| commit | efdea96ace66eceb20514391f65ba46a3941899b (patch) | |
| tree | 350e97be4f0fa4a297df39c63f1fadb4e86a7ce0 | |
| parent | a74c96127e25660b93e1fa4ba56d366812fa5bab (diff) | |
So bump for gcc6debian/6.9.5.8+dfsg-2
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/libmagick++-6.q16-6v6.symbols (renamed from debian/libmagick++-6.q16-6.symbols) | 2 | ||||
| -rwxr-xr-x | debian/rules | 10 |
4 files changed, 15 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 1283fec..3f9e30a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ imagemagick (8:6.9.5.8+dfsg-1) unstable; urgency=medium #836172). * Bug fix: "TIFF divide by zero", thanks to Bastien ROUCARIES (Closes: #836171). + * Avoid buffer overflow in SGI file handling (Closes: #836776). * Use autopkgtest. - * Avoid buffer overflow in SGI file handling (Closes: #836776) + * So bump for gcc6. -- Bastien Roucariès <roucaries.bastien+debian@gmail.com> Mon, 05 Sep 2016 15:34:53 +0200 diff --git a/debian/control b/debian/control index 27757c7..f186bc3 100644 --- a/debian/control +++ b/debian/control @@ -332,12 +332,14 @@ Description: image manipulation library - development files This version of libmagickwand-dev is compiled for a channe depth of 16 bits (Q16). -Package: libmagick++-6.q16-6 +Package: libmagick++-6.q16-6v6 Architecture: any Multi-Arch: same Section: libs Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libmagick++-6.q16-6 +Replaces: libmagick++-6.q16-6 Description: object-oriented C++ interface to ImageMagick The Magick++ library is a set of C++ wrapper classes that provides access to the ImageMagick package functionality from within a C++ application. @@ -353,7 +355,7 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: libmagick++-6-headers (= ${source:Version}), - libmagick++-6.q16-6 (= ${binary:Version}), + libmagick++-6.q16-6v6 (= ${binary:Version}), libmagickcore-6.q16-dev (= ${binary:Version}), libmagickwand-6.q16-dev (= ${binary:Version}), pkg-config, diff --git a/debian/libmagick++-6.q16-6.symbols b/debian/libmagick++-6.q16-6v6.symbols index c72bd22..32fac7a 100644 --- a/debian/libmagick++-6.q16-6.symbols +++ b/debian/libmagick++-6.q16-6v6.symbols @@ -1,4 +1,4 @@ -libMagick++-6.Q16.so.6 libmagick++-6.q16-6 #MINVER# +libMagick++-6.Q16.so.6 libmagick++-6.q16-6v6 #MINVER# (optional=InternalABInoAPI)MagickPlusPlusDestroyMagick@Base 8:6.9.2.3 (c++)"Magick::adaptiveBlurImage::adaptiveBlurImage(double, double)@Base" 8:6.9.2.3 (c++)"Magick::adaptiveBlurImage::operator()(Magick::Image&) const@Base" 8:6.9.2.3 diff --git a/debian/rules b/debian/rules index 73e9caf..a496f86 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DH_VERBOSE=1 export QUANTUMDEPTH ?= q16 export CORESOVERSION ?= 2 export WANDSOVERSION ?= 2 -export PPSOVERSION ?= 6 +export PPSOVERSION ?= 6v6 # default im version used for adding default file export DEFAULTIMVERSION ?= 6 @@ -623,7 +623,13 @@ override_dh_compress: override_dh_makeshlibs: # avoid plugins' dir - dh_makeshlibs -v -Xcoders/ -Xfilters/ + FAIL=0; \ + for PKG in $$(dh_listpackages -a); do \ + echo dh_makeshlibs -p$$PKG -v -Xcoders/ -Xfilters/ ; \ + dh_makeshlibs -p$$PKG -v -Xcoders/ -Xfilters/; \ + FAIL=$$?; \ + done; \ + exit $$fail # remove after jessie+2 override_dh_strip: |