[med-svn] r20059 - trunk/packages/minc/libminc/trunk/debian/patches
Steven Michael Robbins
smr at moszumanska.debian.org
Sun Sep 13 01:15:00 UTC 2015
Author: smr
Date: 2015-09-13 01:15:00 +0000 (Sun, 13 Sep 2015)
New Revision: 20059
Removed:
trunk/packages/minc/libminc/trunk/debian/patches/01_mincedit-sensible-viewer.diff
trunk/packages/minc/libminc/trunk/debian/patches/acrnema-version.patch
trunk/packages/minc/libminc/trunk/debian/patches/clang.patch
trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch
trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null.patch
trunk/packages/minc/libminc/trunk/debian/patches/fix-soversion-generation
trunk/packages/minc/libminc/trunk/debian/patches/makefile.patch
trunk/packages/minc/libminc/trunk/debian/patches/maxpathlen.patch
Log:
Remove obsolete patches.
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/01_mincedit-sensible-viewer.diff
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/01_mincedit-sensible-viewer.diff 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/01_mincedit-sensible-viewer.diff 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,11 +0,0 @@
---- a/progs/mincedit/mincedit
-+++ b/progs/mincedit/mincedit
-@@ -113,7 +113,7 @@ case $# in
- then
- editor=${EDITOR}
- else
-- editor="emacs"
-+ editor="sensible-editor"
- fi
- fi
- ;;
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/acrnema-version.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/acrnema-version.patch 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/acrnema-version.patch 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -555,6 +555,7 @@ libvolume_io2_la_SOURCES = \
- volume_io/Volumes/volume_cache.c \
- volume_io/Volumes/volumes.c
-
-+libacr_nema_la_LDFLAGS = -version-info 3:0:0
- libacr_nema_la_SOURCES = \
- conversion/Acr_nema/acr_io.c \
- conversion/Acr_nema/dicom_client_routines.c \
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/clang.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/clang.patch 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/clang.patch 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,17 +0,0 @@
-Author: Alexander Ovchinnikov <sanek23994 at gmail.com>
-Last-Changed: Sun, 16 Mar 2014 09:11:39 -0400
-Bugs-Debian: https://bugs.debian.org/741744
-Forwarded-Upstream: No
-Description: Build with clang compiler
-
---- a/libsrc2/hyper.c
-+++ b/libsrc2/hyper.c
-@@ -766,7 +766,7 @@ miget_real_value_hyperslab(mihandle_t vo
- miicv_setint(icv, MI_ICV_DO_DIM_CONV, TRUE);
- break;
- default:
-- return;
-+ return (MI_ERROR);
- }
- }
- result = miicv_attach(icv, file_id, var_id);
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null-voxel-loop.patch 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,22 +0,0 @@
-Description: Fix crash when input file cannot be expanded
- This patch fixes a segmentation fault that occurs when an input
- file has a filename extension that indicates compression (e.g.
- ".bz2"), but doesn't really contain content in the corresponding
- compression format. In this case exit with an error message instead
- of just crashing.
-Author: Martin Steghöfer <martin at steghoefer.eu>
-Bug-Debian: http://bugs.debian.org/716511
-
---- a/libsrc/voxel_loop.c
-+++ b/libsrc/voxel_loop.c
-@@ -2354,6 +2354,10 @@ PRIVATE int get_input_mincid(Loopfile_In
- filename = miexpand_file(loopfile_info->input_files[file_num], NULL,
- loopfile_info->headers_only,
- &created_tempfile);
-+ if (!filename) {
-+ fprintf(stderr, "Could not expand file \"%s\"!\n", loopfile_info->input_files[file_num]);
-+ exit(EXIT_FAILURE);
-+ }
- loopfile_info->input_mincid[index] = miopen(filename, NC_NOWRITE);
- if (created_tempfile) {
- (void) remove(filename);
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null.patch 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/fix-crash-filename-null.patch 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,22 +0,0 @@
-Description: Fix crash in mincconcat when header cannot be expanded
- This patch fixes a segmentation fault that occurs when an input
- file has a filename extension that indicates compression (e.g.
- ".bz2"), but doesn't really contain content in the corresponding
- compression format. In this case exit with an error message instead
- of just crashing.
-Author: Martin Steghöfer <martin at steghoefer.eu>
-Bug-Debian: http://bugs.debian.org/716616
-
---- a/progs/mincconcat/mincconcat.c
-+++ b/progs/mincconcat/mincconcat.c
-@@ -701,6 +701,10 @@ static void get_concat_dim_name(Concat_I
-
- /* Expand the file header and open the file */
- filename = miexpand_file(first_filename, NULL, TRUE, &created_tempfile);
-+ if (!filename) {
-+ fprintf(stderr, "Could not expand file \"%s\"!\n", first_filename);
-+ exit(EXIT_FAILURE);
-+ }
- input_mincid = miopen(filename, NC_NOWRITE);
- if (created_tempfile) {
- (void) remove(filename);
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/fix-soversion-generation
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/fix-soversion-generation 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/fix-soversion-generation 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,27 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c0af84..2f23bf1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -356,7 +356,6 @@ ENDIF(UNIX)
-
- SET_TARGET_PROPERTIES(${LIBMINC_LIBRARY}
- PROPERTIES
-- VERSION ${LIBMINC_PACKAGE_VERSION}
- SOVERSION ${LIBMINC_SOVERSION})
-
- IF(LIBMINC_MINC1_SUPPORT)
-diff --git a/ezminc/CMakeLists.txt b/ezminc/CMakeLists.txt
-index 96fa780..a408b3f 100644
---- a/ezminc/CMakeLists.txt
-+++ b/ezminc/CMakeLists.txt
-@@ -22,6 +22,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR})
- ADD_LIBRARY( minc_io ${LIBRARY_TYPE} ${MINC_IO_HEADERS} ${MINC_IO_SRC})
- TARGET_LINK_LIBRARIES(minc_io ${LIBMINC_LIBRARIES})
-
-+SET_TARGET_PROPERTIES(minc_io
-+ PROPERTIES
-+ SOVERSION ${LIBMINC_SOVERSION})
-+
- IF(LIBMINC_INSTALL_LIB_DIR)
- INSTALL(TARGETS
- minc_io
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/makefile.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/makefile.patch 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/makefile.patch 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,56 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -274,30 +274,30 @@ m4_files = \
- m4/smr_WITH_BUILD_PATH.m4
-
- ezMINC_files = \
-- ezminc/examples/volume_msq_dist.cpp
-- ezminc/examples/CMakeLists.txt
-- ezminc/examples/fuzzy_volume_similarity.cpp
-- ezminc/examples/trilinear_resample.cpp
-- ezminc/examples/volume_avg.cpp
-- ezminc/examples/volume_gtc_similarity.cpp
-- ezminc/examples/volume_similarity.cpp
-- ezminc/minc_1_simple_rw.cpp
-- ezminc/minc_1_simple_rw.h
-- ezminc/minc_io_4d_volume.h
-- ezminc/minc_io_fixed_vector.h
-- ezminc/minc_io_simple_volume.h
-- ezminc/tests/minc_rw_test2.cpp
-- ezminc/tests/minc_rw_test_4d.cpp
-- ezminc/tests/minc_rw_test_simple.cpp
-- ezminc/tests/CMakeLists.txt
-- ezminc/tests/ezminc_rw_test.cpp
-- ezminc/tests/ezminc_stats.cpp
-- ezminc/minc_1_simple.h
-- ezminc/CMakeLists.txt
-- ezminc/minc_1_rw.cpp
-- ezminc/minc_1_rw.h
-+ ezminc/examples/volume_msq_dist.cpp \
-+ ezminc/examples/CMakeLists.txt \
-+ ezminc/examples/fuzzy_volume_similarity.cpp \
-+ ezminc/examples/trilinear_resample.cpp \
-+ ezminc/examples/volume_avg.cpp \
-+ ezminc/examples/volume_gtc_similarity.cpp \
-+ ezminc/examples/volume_similarity.cpp \
-+ ezminc/minc_1_simple_rw.cpp \
-+ ezminc/minc_1_simple_rw.h \
-+ ezminc/minc_io_4d_volume.h \
-+ ezminc/minc_io_fixed_vector.h \
-+ ezminc/minc_io_simple_volume.h \
-+ ezminc/tests/minc_rw_test2.cpp \
-+ ezminc/tests/minc_rw_test_4d.cpp \
-+ ezminc/tests/minc_rw_test_simple.cpp \
-+ ezminc/tests/CMakeLists.txt \
-+ ezminc/tests/ezminc_rw_test.cpp \
-+ ezminc/tests/ezminc_stats.cpp \
-+ ezminc/minc_1_simple.h \
-+ ezminc/CMakeLists.txt \
-+ ezminc/minc_1_rw.cpp \
-+ ezminc/minc_1_rw.h \
- ezminc/minc_io_exceptions.h
--
-+
- voxeltoworld_SOURCES = progs/coordinates/voxeltoworld.c
-
- worldtovoxel_SOURCES = progs/coordinates/worldtovoxel.c
Deleted: trunk/packages/minc/libminc/trunk/debian/patches/maxpathlen.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/maxpathlen.patch 2015-09-13 01:10:58 UTC (rev 20058)
+++ trunk/packages/minc/libminc/trunk/debian/patches/maxpathlen.patch 2015-09-13 01:15:00 UTC (rev 20059)
@@ -1,14 +0,0 @@
---- a/progs/mincmorph/mincmorph.c
-+++ b/progs/mincmorph/mincmorph.c
-@@ -30,6 +30,11 @@
- #define INTERNAL_PREC NC_FLOAT /* should be NC_FLOAT or NC_DOUBLE */
- #define DEF_DOUBLE -DBL_MAX
-
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 1024
-+#endif
-+
-+
- /* function prototypes */
- char *get_real_from_string(char *string, double *value);
- char *get_string_from_string(char *string, char **value);
More information about the debian-med-commit
mailing list