Hi all, thanks for opinions. I have dropped ICS-reader for a while. Please, check the attached diff.
Thanks, Anton
diff --git a/debian/changelog b/debian/changelog index 58f7794..c37ab31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +imview (1.1.9c-12) unstable; urgency=low + + * [f09f4ac] Remove ics-reader patch. + * [8f73401] Disable ics-reader due to a buggy code. + + -- Anton Gladky <gl...@debian.org> Tue, 12 Feb 2013 20:07:08 +0100 + +imview (1.1.9c-11) unstable; urgency=low + + * [8106c00] Fix FTBFS on kFreeBSD*. + + -- Anton Gladky <gl...@debian.org> Thu, 07 Feb 2013 22:06:57 +0100 + +imview (1.1.9c-10) unstable; urgency=low + + [ Anton Gladky ] + * [f6c935a] Update homepage. (Closes: #681761) + * [272f222] Add upstream-files. + + [ Michael Terry ] + * [98e20d5] Prevent link fltk libraries statically. + + [ Sebastian Ramacher ] + * [5832a2e] Fix stack smashing in ics-reader. (Closes: #699820) + + -- Anton Gladky <gl...@debian.org> Wed, 06 Feb 2013 19:46:55 +0100 + imview (1.1.9c-9) unstable; urgency=low * [2c68893] Fix FTBFS with gcc-4.7. Thanks to Sebastian Ramacher. diff --git a/debian/control b/debian/control index 36230ff..bbad7fb 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: science Priority: optional Maintainer: Debian Science Maintainers <debian-science-maintain...@lists.alioth.debian.org> Uploaders: Teemu Ikonen <tpiko...@gmail.com>, Andreas Tille <ti...@debian.org>, - Anton Gladky <gladky.an...@gmail.com> + Anton Gladky <gl...@debian.org> Vcs-Browser: http://git.debian.org/?p=debian-science/packages/imview.git Vcs-Git: http://git.debian.org/git/debian-science/packages/imview.git Build-Depends: debhelper (>= 7.0.50~), libfltk1.1-dev, fluid (>= 1.3.0), diff --git a/debian/patches/04_disable_ics-reader.patch b/debian/patches/04_disable_ics-reader.patch new file mode 100644 index 0000000..ddfd9f5 --- /dev/null +++ b/debian/patches/04_disable_ics-reader.patch @@ -0,0 +1,79 @@ +Description: Disable ics-reader due to a buggy code. +Bug-Debian: http://bugs.debian.org/699820 +Author: Anton Gladky <gl...@debian.org> +Last-Update: 2013-02-12 + + +--- a/io/Makefile.in ++++ b/io/Makefile.in +@@ -55,7 +55,6 @@ + readgif.cxx \ + readtiff.cxx \ + readZimage.cxx \ +- readics.cxx \ + readpnm.cxx \ + cpostscript.cxx \ + savetiff.cxx \ +--- a/imageIO.cxx ++++ b/imageIO.cxx +@@ -78,7 +78,6 @@ + #include "io/readgif.hxx" + #include "io/readtiff.hxx" + #include "io/readZimage.hxx" +-#include "io/readics.hxx" + #include "io/readpnm.hxx" + #include "io/readsocket.hxx" + #include "io/readraw.hxx" +@@ -188,14 +187,6 @@ + // then try our luck with SCILimage and MetaImage (mha/mhd) + strcpy(tmpfilename, filename); + if ((tp = strrchr(tmpfilename, '.')) != 0) { +- if ((strncmp(tp, ".ics", 4) == 0) +- || (strncmp(tp, ".ids", 4) == 0)) { +- if (access(tmpfilename, R_OK) == 0) { +- return IMAGEIO_SCILIMAGE; +- } else { +- return IMAGEIO_UNREADABLE; +- } +- } + if ((strncmp(tp, ".mha", 4) == 0) + || (strncmp(tp, ".mhd", 4) == 0)) { + if (access(tmpfilename, R_OK) == 0) { +@@ -205,14 +196,6 @@ + } + } + } +- strcat(tmpfilename, ".ics"); +- if (access(tmpfilename, F_OK) == 0) { +- if (access(tmpfilename, R_OK) == 0) { +- return IMAGEIO_SCILIMAGE; +- } else { +- return IMAGEIO_UNREADABLE; +- } +- } + + + +@@ -328,11 +311,6 @@ + rv = readZImage(filename, frame); + break; + +- case IMAGEIO_SCILIMAGE: +- dbgprintf("Input image is SCIL\n"); +- rv = readICSImage(filename); +- break; +- + case IMAGEIO_METAIMAGE: + dbgprintf("Input image is META (ITK)\n"); + rv = readMETAImage(filename, frame); +@@ -441,10 +419,6 @@ + rv = zimagenbsubfiles(fname); + break; + +- case IMAGEIO_SCILIMAGE: +- rv = icsnbsubfiles(fname); +- break; +- + case IMAGEIO_METAIMAGE: + rv = metanbsubfiles(fname); + break; diff --git a/debian/patches/07_fix_kfreebsd_FTBFS.patch b/debian/patches/07_fix_kfreebsd_FTBFS.patch new file mode 100644 index 0000000..28994a0 --- /dev/null +++ b/debian/patches/07_fix_kfreebsd_FTBFS.patch @@ -0,0 +1,16 @@ +Description: fix FTBFS on kFreeBSD* + (aggregate 'semun arg' has incomplete type and cannot be defined) +Author: Anton Gladky <gl...@debian.org> +Last-Update: 2013-02-07 + +--- a/server/imshared.hxx ++++ b/server/imshared.hxx +@@ -65,7 +65,7 @@ + #include <setjmp.h> + + // this is WEIRD! but required on Unices +-#ifdef Linux ++#if defined (Linux) || (__FreeBSD_kernel__) + # if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) + #warning Incorrect <sys/sem.h>, workaround used. + /* union semun is defined by including <sys/sem.h> */ diff --git a/debian/patches/series b/debian/patches/series index 4067bcd..daab741 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,5 @@ 01_fix_FTBFS_Fl_Widget.patch 02_fix_FTBFS_gcc-4.patch 03_non-static.patch +04_disable_ics-reader.patch +07_fix_kfreebsd_FTBFS.patch
signature.asc
Description: OpenPGP digital signature
