Author: smr Date: 2012-02-26 08:04:51 +0000 (Sun, 26 Feb 2012) New Revision: 9796
Added: trunk/packages/minc/tags/2.1.10-1/ trunk/packages/minc/tags/2.1.10-1/debian/changelog trunk/packages/minc/tags/2.1.10-1/debian/control trunk/packages/minc/tags/2.1.10-1/debian/patches/hdfv2-fixes.patch trunk/packages/minc/tags/2.1.10-1/debian/patches/series trunk/packages/minc/tags/2.1.10-1/debian/rules Removed: trunk/packages/minc/tags/2.1.10-1/debian/changelog trunk/packages/minc/tags/2.1.10-1/debian/control trunk/packages/minc/tags/2.1.10-1/debian/patches/03_mincview.diff trunk/packages/minc/tags/2.1.10-1/debian/patches/decompress-whole-file.diff trunk/packages/minc/tags/2.1.10-1/debian/patches/read_file_names-refactor.patch trunk/packages/minc/tags/2.1.10-1/debian/patches/series trunk/packages/minc/tags/2.1.10-1/debian/rules Log: [svn-buildpackage] Tagging minc 2.1.10-1 Deleted: trunk/packages/minc/tags/2.1.10-1/debian/changelog =================================================================== --- trunk/packages/minc/trunk/debian/changelog 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/changelog 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,320 +0,0 @@ -minc (2.1.00-5) unstable; urgency=low - - * patches/mincaverage-pathmax.patch: Remove. - * patches/read_file_names-refactor.patch: New. Refactored duplicated - PATH_MAX-using code into library. Need to run autoreconf because - Makefile.am changed. - - * rules: Fix errors and really disable tests on sparc. - - -- Steve M. Robbins <[email protected]> Mon, 20 Feb 2012 15:00:32 -0600 - -minc (2.1.00-4) unstable; urgency=low - - * source/format: Set to 3.0 (quilt), so that patches are applied. - - * patches/mincaverage-pathmax.patch: New. Work around missing PATH_MAX - definition; fixes FTBFS on hurd. - - * rules: Tests are buggy, but do work on most architectures. Disable on - sparc. - - -- Steve M. Robbins <[email protected]> Sun, 19 Feb 2012 21:58:51 -0600 - -minc (2.1.00-3) unstable; urgency=low - - * control: Switch to (serial) libhdf5-dev, to avoid conflict with serial - netcdf. Closes: #658307. - - * control: - * rules: Switch from cdbs to debhelper's dh (compat level 9). - - -- Steve M. Robbins <[email protected]> Sun, 19 Feb 2012 08:53:04 -0600 - -minc (2.1.00-2) unstable; urgency=low - - * patches/decompress-whole-file.diff: New. Always decompress entire - file to support compressed MINC2 files. Closes: #585676. - - -- Steve M. Robbins <[email protected]> Sun, 18 Dec 2011 20:47:03 -0600 - -minc (2.1.00-1) unstable; urgency=low - - * New upstream. - - -- Steve M. Robbins <[email protected]> Tue, 17 Aug 2010 22:26:16 -0500 - -minc (2.0.18+cvs20100518-1) unstable; urgency=low - - * Pull upstream CVS, contains fixes for netcdf 4. Closes: #577060, - #581296. - - * control: replace libhdf5-*-dev (differing by architecture) by - libhdf5-mpi-dev. - - -- Steve M. Robbins <[email protected]> Tue, 18 May 2010 22:53:30 -0500 - -minc (2.0.18-1) unstable; urgency=low - - * New upstream version. - - -- Steve M. Robbins <[email protected]> Mon, 20 Jul 2009 05:24:57 -0500 - -minc (2.0.17-1) unstable; urgency=low - - * New upstream version. - - * patches/04_manpages.diff: - * debian/patches/05_parseargv.diff: Remove; applied upstream. - - -- Steve M. Robbins <[email protected]> Tue, 20 Jan 2009 19:37:41 -0600 - -minc (2.0.16-4) unstable; urgency=low - - * debian/patches/05_parseargv.diff: New. Patch from upstream to fix arg - parsing on 64bits. Closes: #510629. This was also the root cause of - mincheader and mincdiff failing. Closes: #506276. - - * debian/control: Add ${misc:Depends}, since we use debhelper. - - * debian/rules: Do not install test code acr_test, dicom_test. - - -- Steve M. Robbins <[email protected]> Sat, 03 Jan 2009 16:29:06 -0600 - -minc (2.0.16-3) unstable; urgency=low - - * debian/control: Extend previous fix from build-depends to libminc-dev - depends; i.e. use OpenMPI, except for certain architectures that it - doesn't support; in the latter case, use LAM. - - -- Steve M. Robbins <[email protected]> Thu, 30 Oct 2008 01:10:55 -0500 - -minc (2.0.16-2) unstable; urgency=low - - * debian/control: Use OpenMPI, except for certain architectures that it - doesn't support; in the latter case, use LAM. - - -- Steve M. Robbins <[email protected]> Mon, 27 Oct 2008 01:11:21 -0500 - -minc (2.0.16-1) unstable; urgency=low - - * New upstream release. - - debian/patches/02_mincedit-no-escape-chars: Remove. Applied upstream. - - * debian/control: Switch dependencies from libhdf5-serial-dev to - libhdf5-openmpi-dev. - * debian/rules: Add CFLAGS=-I/usr/include/mpi to configure step so that - mpi.h is found. - - * debian/control: Remove tetex-bin from build-depends (was alternative - to texlive-latex-base). Update Standards-Version to 3.8.0 (no - changes). - - * debian/patches/04_manpages.diff: Fix errors in manpages, mainly - removal of trailing TAB characters. - - * debian/rules: Adhere to parallel keyword in DEB_BUILD_OPTIONS. - - -- Steve M. Robbins <[email protected]> Sat, 11 Oct 2008 23:55:42 -0500 - -minc (2.0.15-3) unstable; urgency=low - - [ Charles Plessy ] - * debian/copyright: added upstream contact information. - - [ Steve M. Robbins ] - * debian/patches/02_mincedit-no-escape-chars.diff: New. Patch mincedit - to remove extraneous \n strings. Closes: 486048. - * debian/control: Replace depends on netcdfg-dev by libnetcdf-dev. - - -- Steve M. Robbins <[email protected]> Thu, 19 Jun 2008 07:40:18 -0500 - -minc (2.0.15-2) unstable; urgency=low - - [ David Paleino ] - * debian/rules: - - conditionally add -mieee on Alpha (Closes: #368263) - - [ Steve M. Robbins ] - * debian/rules: Do not run the tests, since they are broken in many - ways; e.g. int functions without a return statement, checking - floating-point values without a tolerance, and some that require a - list of files on the command line but are given none. - Closes: #475808. - - -- Steve M. Robbins <[email protected]> Thu, 05 Jun 2008 09:24:59 -0500 - -minc (2.0.15-1) unstable; urgency=low - - [ Charles Plessy ] - * Changed the doc-base section according to the new policy. - - [ David Paleino ] - * New upstream release - * debian/patches/: - - 01_mincedit-sensible-viewer.diff updated - - 02_testdir-runtests.diff removed, it has been merged upstream - - -- Steve M. Robbins <[email protected]> Sat, 31 May 2008 05:53:26 -0500 - -minc (2.0.14-2) unstable; urgency=low - - * rules: Don't install byte_swap or extract; can use "dd" instead of - these tools. Closes: #459834. - - * control: Package minc-tools depends on libgetopt-tabular-perl. - * rules: Don't install Tabular.pm. - * Getopt-Tabular-0.3/Tabular.pm: Remove. - * patches/04_progs-use-lib.diff: Remove. - * copyright: Remove Getopt-Tabular license text. - - -- Steve M. Robbins <[email protected]> Fri, 11 Jan 2008 00:30:23 -0600 - -minc (2.0.14-1) unstable; urgency=low - - * New upstream version. Closes: #450922. - - * control: Set Maintainer to debian-med-packaging. - Add build-depends for libhdf5-serial-dev, texlive-latex-base. - Rename package libminc0 --> libminc2-1. - Rename package libminc0-dev --> libminc-dev. - Package libminc-dev depends on libhdf5-serial-dev. - Package minc-tools depends on imagemagick. - - * rules: Configure with --enable-minc2 and --enable-acr-nema. - - * Getopt-Tabular-0.3/Tabular.pm: New. Perl module required - for mincpik and xfmflip. Closes: #457074. - - * patches/02_testdir-runtests.diff: New. Fix test scripts. - - * patches/03_mincview.diff: New. Use 'display' from ImageMagick rather - than 'xv' to view images. Closes: #457072. - - * patches/04_progs-use-lib.diff: New. Add "use lib" declaration to find - the private Getopt::Tabular. - - -- Steve M. Robbins <[email protected]> Sun, 06 Jan 2008 20:40:29 -0600 - -minc (1.5-2) NEVER UPLOADED; urgency=low - - * Rewrite build system using cdbs. - - patches/01_mincedit-sensible-viewer.diff: New. Obtained from - existing Debian diff. - - * control: Build-depend on texlive-latex-base | tetex-bin, rather - than just tetex-bin. Update to Standards-Version 3.7.3 (no change - required). Use ${binary:Version} rather than ${Source-Version} - for libminc0-dev dependency on libminc0. Add Homepage and Vcs-Svn - header fields. - - -- Steve M. Robbins <[email protected]> Sat, 29 Dec 2007 15:10:53 -0600 - -minc (1.5-1) unstable; urgency=low - - * New upstream. - - -- Steve M. Robbins <[email protected]> Mon, 13 Nov 2006 23:26:13 -0600 - -minc (1.4.1-1) unstable; urgency=low - - * New upstream. - - -- Steve M. Robbins <[email protected]> Sat, 11 Nov 2006 22:14:54 -0600 - -minc (1.4-4) unstable; urgency=low - - * testdir/create_grid_xfm.c: initialize minc_input_options properly. - Closes: #352183. - - -- Steve M. Robbins <[email protected]> Sat, 18 Feb 2006 17:33:37 -0500 - -minc (1.4-3) unstable; urgency=low - - * Build-depend on csh. Closes: #351826. - - -- Steve M. Robbins <[email protected]> Tue, 7 Feb 2006 20:02:56 -0500 - -minc (1.4-2) unstable; urgency=low - - * Rebuild to pick up new netcdf library, which changed due to - C++ ABI transition (#346312). - - -- Steve M. Robbins <[email protected]> Sun, 5 Feb 2006 13:45:22 -0500 - -minc (1.4-1) unstable; urgency=low - - * New upstream version. - - * Omit dependency on essential package debianutils (for sensible-editor). - Closes: #316425. - - -- Steve M. Robbins <[email protected]> Sun, 3 Jul 2005 20:31:25 -0400 - -minc (1.3-3) unstable; urgency=low - - * progs/mincedit/mincedit: use "sensible-editor" rather than "emacs". - Closes: #292194. - - -- Steve M. Robbins <[email protected]> Thu, 27 Jan 2005 22:21:22 -0500 - -minc (1.3-2) unstable; urgency=low - - * debian/rules: package minc-tools depends on libtext-format-perl - Closes: #278840. - - -- Steve M. Robbins <[email protected]> Sun, 28 Nov 2004 14:33:06 -0500 - -minc (1.3-1) unstable; urgency=low - - * New upstream version. - Re-ran all auto*-tools machinery, as upstream used fairly old versions. - - * configure.in: Don't use AC_CONFIG_LINKS to generate link - volume_io/Include/volume_io to directory volume_io/Include as - autoconf 2.59 chokes on it. Use shell commands instead. - - * volume_io/Include/internal_volume_io.h: Do not include "config.h". - * volume_io/Prog_utils/files.c: Do include "config.h". - * volume_io/Prog_utils/time.c: Restore call to sysconf( _SC_CLK_TCK ), - wrapped in #if HAVE_SYSCONF. - - -- Steve M. Robbins <[email protected]> Sun, 28 Nov 2004 14:22:03 -0500 - -minc (1.2-1) unstable; urgency=low - - * New upstream version. - - * debian/control: minc-tools depend on netcdf-bin (for ncdump). - - -- Steve M. Robbins <[email protected]> Sat, 20 Dec 2003 11:22:09 -0500 - -minc (1.1-1) unstable; urgency=low - - * New upstream. - - build shared lib package - - rename devel package to libminc0-dev - - -- Steve M. Robbins <[email protected]> Sat, 25 Jan 2003 18:25:04 -0500 - -minc (1.0-2) unstable; urgency=low - - * libminc-dev: Depend on netcdfg-dev. - - * minc-tools: Use "csh|c-shell" in dependency line, remove dependency - on "awk" on advice from lintian. - - * Update from upstream CVS. - - -- Steve M. Robbins <[email protected]> Wed, 11 Dec 2002 12:27:36 -0500 - -minc (1.0-1) unstable; urgency=low - - * Initial Debian package. Closes: #153629. - - * Patches from upstream CVS: - - libsrc/ParseArgv.h: declare as "extern C" - - progs/mincstats/mincstats.c: fix segfault - - -- Steve M. Robbins <[email protected]> Mon, 29 Jul 2002 16:06:56 -0400 - Copied: trunk/packages/minc/tags/2.1.10-1/debian/changelog (from rev 9795, trunk/packages/minc/trunk/debian/changelog) =================================================================== --- trunk/packages/minc/tags/2.1.10-1/debian/changelog (rev 0) +++ trunk/packages/minc/tags/2.1.10-1/debian/changelog 2012-02-26 08:04:51 UTC (rev 9796) @@ -0,0 +1,337 @@ +minc (2.1.10-1) unstable; urgency=low + + * New upstream. + + * patches/03_mincview.diff: Remove. Script mincview rewritten to use + Imagemagick + + * patches/decompress-whole-file.diff: + * patches/read_file_names-refactor.patch: Remove. Applied upstream. + * rules: Remove use of dh_autoreconf. + + * patches/hdfv2-fixes.patch: New. Ensure using HDF5 v2 API. + + * control: Remove dependency and build-dependency on csh. + + -- Steve M. Robbins <[email protected]> Sun, 26 Feb 2012 01:37:47 -0600 + +minc (2.1.00-5) unstable; urgency=low + + * patches/mincaverage-pathmax.patch: Remove. + * patches/read_file_names-refactor.patch: New. Refactored duplicated + PATH_MAX-using code into library. Need to run autoreconf because + Makefile.am changed. + + * rules: Fix errors and really disable tests on sparc. + + -- Steve M. Robbins <[email protected]> Mon, 20 Feb 2012 15:00:32 -0600 + +minc (2.1.00-4) unstable; urgency=low + + * source/format: Set to 3.0 (quilt), so that patches are applied. + + * patches/mincaverage-pathmax.patch: New. Work around missing PATH_MAX + definition; fixes FTBFS on hurd. + + * rules: Tests are buggy, but do work on most architectures. Disable on + sparc. + + -- Steve M. Robbins <[email protected]> Sun, 19 Feb 2012 21:58:51 -0600 + +minc (2.1.00-3) unstable; urgency=low + + * control: Switch to (serial) libhdf5-dev, to avoid conflict with serial + netcdf. Closes: #658307. + + * control: + * rules: Switch from cdbs to debhelper's dh (compat level 9). + + -- Steve M. Robbins <[email protected]> Sun, 19 Feb 2012 08:53:04 -0600 + +minc (2.1.00-2) unstable; urgency=low + + * patches/decompress-whole-file.diff: New. Always decompress entire + file to support compressed MINC2 files. Closes: #585676. + + -- Steve M. Robbins <[email protected]> Sun, 18 Dec 2011 20:47:03 -0600 + +minc (2.1.00-1) unstable; urgency=low + + * New upstream. + + -- Steve M. Robbins <[email protected]> Tue, 17 Aug 2010 22:26:16 -0500 + +minc (2.0.18+cvs20100518-1) unstable; urgency=low + + * Pull upstream CVS, contains fixes for netcdf 4. Closes: #577060, + #581296. + + * control: replace libhdf5-*-dev (differing by architecture) by + libhdf5-mpi-dev. + + -- Steve M. Robbins <[email protected]> Tue, 18 May 2010 22:53:30 -0500 + +minc (2.0.18-1) unstable; urgency=low + + * New upstream version. + + -- Steve M. Robbins <[email protected]> Mon, 20 Jul 2009 05:24:57 -0500 + +minc (2.0.17-1) unstable; urgency=low + + * New upstream version. + + * patches/04_manpages.diff: + * debian/patches/05_parseargv.diff: Remove; applied upstream. + + -- Steve M. Robbins <[email protected]> Tue, 20 Jan 2009 19:37:41 -0600 + +minc (2.0.16-4) unstable; urgency=low + + * debian/patches/05_parseargv.diff: New. Patch from upstream to fix arg + parsing on 64bits. Closes: #510629. This was also the root cause of + mincheader and mincdiff failing. Closes: #506276. + + * debian/control: Add ${misc:Depends}, since we use debhelper. + + * debian/rules: Do not install test code acr_test, dicom_test. + + -- Steve M. Robbins <[email protected]> Sat, 03 Jan 2009 16:29:06 -0600 + +minc (2.0.16-3) unstable; urgency=low + + * debian/control: Extend previous fix from build-depends to libminc-dev + depends; i.e. use OpenMPI, except for certain architectures that it + doesn't support; in the latter case, use LAM. + + -- Steve M. Robbins <[email protected]> Thu, 30 Oct 2008 01:10:55 -0500 + +minc (2.0.16-2) unstable; urgency=low + + * debian/control: Use OpenMPI, except for certain architectures that it + doesn't support; in the latter case, use LAM. + + -- Steve M. Robbins <[email protected]> Mon, 27 Oct 2008 01:11:21 -0500 + +minc (2.0.16-1) unstable; urgency=low + + * New upstream release. + - debian/patches/02_mincedit-no-escape-chars: Remove. Applied upstream. + + * debian/control: Switch dependencies from libhdf5-serial-dev to + libhdf5-openmpi-dev. + * debian/rules: Add CFLAGS=-I/usr/include/mpi to configure step so that + mpi.h is found. + + * debian/control: Remove tetex-bin from build-depends (was alternative + to texlive-latex-base). Update Standards-Version to 3.8.0 (no + changes). + + * debian/patches/04_manpages.diff: Fix errors in manpages, mainly + removal of trailing TAB characters. + + * debian/rules: Adhere to parallel keyword in DEB_BUILD_OPTIONS. + + -- Steve M. Robbins <[email protected]> Sat, 11 Oct 2008 23:55:42 -0500 + +minc (2.0.15-3) unstable; urgency=low + + [ Charles Plessy ] + * debian/copyright: added upstream contact information. + + [ Steve M. Robbins ] + * debian/patches/02_mincedit-no-escape-chars.diff: New. Patch mincedit + to remove extraneous \n strings. Closes: 486048. + * debian/control: Replace depends on netcdfg-dev by libnetcdf-dev. + + -- Steve M. Robbins <[email protected]> Thu, 19 Jun 2008 07:40:18 -0500 + +minc (2.0.15-2) unstable; urgency=low + + [ David Paleino ] + * debian/rules: + - conditionally add -mieee on Alpha (Closes: #368263) + + [ Steve M. Robbins ] + * debian/rules: Do not run the tests, since they are broken in many + ways; e.g. int functions without a return statement, checking + floating-point values without a tolerance, and some that require a + list of files on the command line but are given none. + Closes: #475808. + + -- Steve M. Robbins <[email protected]> Thu, 05 Jun 2008 09:24:59 -0500 + +minc (2.0.15-1) unstable; urgency=low + + [ Charles Plessy ] + * Changed the doc-base section according to the new policy. + + [ David Paleino ] + * New upstream release + * debian/patches/: + - 01_mincedit-sensible-viewer.diff updated + - 02_testdir-runtests.diff removed, it has been merged upstream + + -- Steve M. Robbins <[email protected]> Sat, 31 May 2008 05:53:26 -0500 + +minc (2.0.14-2) unstable; urgency=low + + * rules: Don't install byte_swap or extract; can use "dd" instead of + these tools. Closes: #459834. + + * control: Package minc-tools depends on libgetopt-tabular-perl. + * rules: Don't install Tabular.pm. + * Getopt-Tabular-0.3/Tabular.pm: Remove. + * patches/04_progs-use-lib.diff: Remove. + * copyright: Remove Getopt-Tabular license text. + + -- Steve M. Robbins <[email protected]> Fri, 11 Jan 2008 00:30:23 -0600 + +minc (2.0.14-1) unstable; urgency=low + + * New upstream version. Closes: #450922. + + * control: Set Maintainer to debian-med-packaging. + Add build-depends for libhdf5-serial-dev, texlive-latex-base. + Rename package libminc0 --> libminc2-1. + Rename package libminc0-dev --> libminc-dev. + Package libminc-dev depends on libhdf5-serial-dev. + Package minc-tools depends on imagemagick. + + * rules: Configure with --enable-minc2 and --enable-acr-nema. + + * Getopt-Tabular-0.3/Tabular.pm: New. Perl module required + for mincpik and xfmflip. Closes: #457074. + + * patches/02_testdir-runtests.diff: New. Fix test scripts. + + * patches/03_mincview.diff: New. Use 'display' from ImageMagick rather + than 'xv' to view images. Closes: #457072. + + * patches/04_progs-use-lib.diff: New. Add "use lib" declaration to find + the private Getopt::Tabular. + + -- Steve M. Robbins <[email protected]> Sun, 06 Jan 2008 20:40:29 -0600 + +minc (1.5-2) NEVER UPLOADED; urgency=low + + * Rewrite build system using cdbs. + - patches/01_mincedit-sensible-viewer.diff: New. Obtained from + existing Debian diff. + + * control: Build-depend on texlive-latex-base | tetex-bin, rather + than just tetex-bin. Update to Standards-Version 3.7.3 (no change + required). Use ${binary:Version} rather than ${Source-Version} + for libminc0-dev dependency on libminc0. Add Homepage and Vcs-Svn + header fields. + + -- Steve M. Robbins <[email protected]> Sat, 29 Dec 2007 15:10:53 -0600 + +minc (1.5-1) unstable; urgency=low + + * New upstream. + + -- Steve M. Robbins <[email protected]> Mon, 13 Nov 2006 23:26:13 -0600 + +minc (1.4.1-1) unstable; urgency=low + + * New upstream. + + -- Steve M. Robbins <[email protected]> Sat, 11 Nov 2006 22:14:54 -0600 + +minc (1.4-4) unstable; urgency=low + + * testdir/create_grid_xfm.c: initialize minc_input_options properly. + Closes: #352183. + + -- Steve M. Robbins <[email protected]> Sat, 18 Feb 2006 17:33:37 -0500 + +minc (1.4-3) unstable; urgency=low + + * Build-depend on csh. Closes: #351826. + + -- Steve M. Robbins <[email protected]> Tue, 7 Feb 2006 20:02:56 -0500 + +minc (1.4-2) unstable; urgency=low + + * Rebuild to pick up new netcdf library, which changed due to + C++ ABI transition (#346312). + + -- Steve M. Robbins <[email protected]> Sun, 5 Feb 2006 13:45:22 -0500 + +minc (1.4-1) unstable; urgency=low + + * New upstream version. + + * Omit dependency on essential package debianutils (for sensible-editor). + Closes: #316425. + + -- Steve M. Robbins <[email protected]> Sun, 3 Jul 2005 20:31:25 -0400 + +minc (1.3-3) unstable; urgency=low + + * progs/mincedit/mincedit: use "sensible-editor" rather than "emacs". + Closes: #292194. + + -- Steve M. Robbins <[email protected]> Thu, 27 Jan 2005 22:21:22 -0500 + +minc (1.3-2) unstable; urgency=low + + * debian/rules: package minc-tools depends on libtext-format-perl + Closes: #278840. + + -- Steve M. Robbins <[email protected]> Sun, 28 Nov 2004 14:33:06 -0500 + +minc (1.3-1) unstable; urgency=low + + * New upstream version. + Re-ran all auto*-tools machinery, as upstream used fairly old versions. + + * configure.in: Don't use AC_CONFIG_LINKS to generate link + volume_io/Include/volume_io to directory volume_io/Include as + autoconf 2.59 chokes on it. Use shell commands instead. + + * volume_io/Include/internal_volume_io.h: Do not include "config.h". + * volume_io/Prog_utils/files.c: Do include "config.h". + * volume_io/Prog_utils/time.c: Restore call to sysconf( _SC_CLK_TCK ), + wrapped in #if HAVE_SYSCONF. + + -- Steve M. Robbins <[email protected]> Sun, 28 Nov 2004 14:22:03 -0500 + +minc (1.2-1) unstable; urgency=low + + * New upstream version. + + * debian/control: minc-tools depend on netcdf-bin (for ncdump). + + -- Steve M. Robbins <[email protected]> Sat, 20 Dec 2003 11:22:09 -0500 + +minc (1.1-1) unstable; urgency=low + + * New upstream. + - build shared lib package + - rename devel package to libminc0-dev + + -- Steve M. Robbins <[email protected]> Sat, 25 Jan 2003 18:25:04 -0500 + +minc (1.0-2) unstable; urgency=low + + * libminc-dev: Depend on netcdfg-dev. + + * minc-tools: Use "csh|c-shell" in dependency line, remove dependency + on "awk" on advice from lintian. + + * Update from upstream CVS. + + -- Steve M. Robbins <[email protected]> Wed, 11 Dec 2002 12:27:36 -0500 + +minc (1.0-1) unstable; urgency=low + + * Initial Debian package. Closes: #153629. + + * Patches from upstream CVS: + - libsrc/ParseArgv.h: declare as "extern C" + - progs/mincstats/mincstats.c: fix segfault + + -- Steve M. Robbins <[email protected]> Mon, 29 Jul 2002 16:06:56 -0400 + Deleted: trunk/packages/minc/tags/2.1.10-1/debian/control =================================================================== --- trunk/packages/minc/trunk/debian/control 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/control 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,70 +0,0 @@ -Source: minc -Homepage: http://www.bic.mni.mcgill.ca/ServicesSoftware/HomePage -Section: science -Priority: optional -Maintainer: Debian Med Packaging Team <[email protected]> -Uploaders: Steve M. Robbins <[email protected]> -Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, csh, - libnetcdf-dev, zlib1g-dev, texlive-latex-base, libhdf5-dev -Standards-Version: 3.9.2 -Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/minc/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/minc/trunk/?rev=0&sc=0 - -Package: minc-tools -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, csh | c-shell, netcdf-bin, libgetopt-tabular-perl, libtext-format-perl, imagemagick -Description: MNI medical image format tools - This package contains tools to manipulate MINC files. - . - The Minc file format is a highly flexible medical image file format - built on top of the NetCDF generalized data format. The format is - simple, self-describing, extensible, portable and N-dimensional, with - programming interfaces for both low-level data access and high-level - volume manipulation. On top of the libraries is a suite of generic - image-file manipulation tools. The format, libraries and tools are - designed for use in a medical-imaging research environment: they are - simple and powerful and make no attempt to provide a pretty interface - to users. - -Package: libminc2-1 -Section: libs -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: MNI medical image format library - This package contains the libraries libminc2 and libvolume_io2. - . - The Minc file format is a highly flexible medical image file format. - Minc version 1 is built on top of the NetCDF generalized data format. - Minc version 2 is built on top of the HDF data format. This library - handles both formats. In each case the format is - simple, self-describing, extensible, portable and N-dimensional, with - programming interfaces for both low-level data access and high-level - volume manipulation. On top of the libraries is a suite of generic - image-file manipulation tools. The format, libraries and tools are - designed for use in a medical-imaging research environment : they are - simple and powerful and make no attempt to provide a pretty interface - to users. - -Package: libminc-dev -Conflicts: libminc0-dev -Replaces: libminc0-dev -Section: libdevel -Architecture: any -Depends: ${misc:Depends}, libminc2-1 (= ${binary:Version}), libnetcdf-dev, libhdf5-dev -Description: MNI medical image format development environment - This package contains the library and headers for libminc2 and - libvolume_io2. - . - The Minc file format is a highly flexible medical image file format. - Minc version 1 is built on top of the NetCDF generalized data format. - Minc version 2 is built on top of the HDF data format. This library - handles both formats. In each case the format is - simple, self-describing, extensible, portable and N-dimensional, with - programming interfaces for both low-level data access and high-level - volume manipulation. On top of the libraries is a suite of generic - image-file manipulation tools. The format, libraries and tools are - designed for use in a medical-imaging research environment : they are - simple and powerful and make no attempt to provide a pretty interface - to users. Copied: trunk/packages/minc/tags/2.1.10-1/debian/control (from rev 9795, trunk/packages/minc/trunk/debian/control) =================================================================== --- trunk/packages/minc/tags/2.1.10-1/debian/control (rev 0) +++ trunk/packages/minc/tags/2.1.10-1/debian/control 2012-02-26 08:04:51 UTC (rev 9796) @@ -0,0 +1,70 @@ +Source: minc +Homepage: http://www.bic.mni.mcgill.ca/ServicesSoftware/HomePage +Section: science +Priority: optional +Maintainer: Debian Med Packaging Team <[email protected]> +Uploaders: Steve M. Robbins <[email protected]> +Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, + libnetcdf-dev, zlib1g-dev, texlive-latex-base, libhdf5-dev +Standards-Version: 3.9.2 +Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/minc/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/minc/trunk/?rev=0&sc=0 + +Package: minc-tools +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, netcdf-bin, libgetopt-tabular-perl, libtext-format-perl, imagemagick +Description: MNI medical image format tools + This package contains tools to manipulate MINC files. + . + The Minc file format is a highly flexible medical image file format + built on top of the NetCDF generalized data format. The format is + simple, self-describing, extensible, portable and N-dimensional, with + programming interfaces for both low-level data access and high-level + volume manipulation. On top of the libraries is a suite of generic + image-file manipulation tools. The format, libraries and tools are + designed for use in a medical-imaging research environment: they are + simple and powerful and make no attempt to provide a pretty interface + to users. + +Package: libminc2-1 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: MNI medical image format library + This package contains the libraries libminc2 and libvolume_io2. + . + The Minc file format is a highly flexible medical image file format. + Minc version 1 is built on top of the NetCDF generalized data format. + Minc version 2 is built on top of the HDF data format. This library + handles both formats. In each case the format is + simple, self-describing, extensible, portable and N-dimensional, with + programming interfaces for both low-level data access and high-level + volume manipulation. On top of the libraries is a suite of generic + image-file manipulation tools. The format, libraries and tools are + designed for use in a medical-imaging research environment : they are + simple and powerful and make no attempt to provide a pretty interface + to users. + +Package: libminc-dev +Conflicts: libminc0-dev +Replaces: libminc0-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libminc2-1 (= ${binary:Version}), libnetcdf-dev, libhdf5-dev +Description: MNI medical image format development environment + This package contains the library and headers for libminc2 and + libvolume_io2. + . + The Minc file format is a highly flexible medical image file format. + Minc version 1 is built on top of the NetCDF generalized data format. + Minc version 2 is built on top of the HDF data format. This library + handles both formats. In each case the format is + simple, self-describing, extensible, portable and N-dimensional, with + programming interfaces for both low-level data access and high-level + volume manipulation. On top of the libraries is a suite of generic + image-file manipulation tools. The format, libraries and tools are + designed for use in a medical-imaging research environment : they are + simple and powerful and make no attempt to provide a pretty interface + to users. Deleted: trunk/packages/minc/tags/2.1.10-1/debian/patches/03_mincview.diff =================================================================== --- trunk/packages/minc/trunk/debian/patches/03_mincview.diff 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/patches/03_mincview.diff 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,14 +0,0 @@ ---- a/progs/mincview/mincview.old 2007-03-29 00:08:53.000000000 -0500 -+++ b/progs/mincview/mincview 2008-01-02 21:10:36.000000000 -0600 -@@ -6,9 +6,8 @@ - # Displays images with patient left on left side of the screen. - - # Constants --set xv_visual = `xdpyinfo | awk '($1=="class:"){visual=$2};(($1=="depth:") && (visual=="TrueColor") && ($2==24)) {found=1}; END {if (found) print "-visual TrueColor"}'` --set VIEWER = "xv" # Any pnm display program that handles a list of files --set VIEWER_OPTIONS = "-geometry 512x512 -fixed -cmap -raw $xv_visual" -+set VIEWER = "display" # Any pnm display program that handles a list of files -+set VIEWER_OPTIONS = "-geometry 512x512" - set PGM_CODE = "P5" - set PPM_CODE = "P6" - set usage = "Usage: $0 <filename.mnc> [<slice number>]" Deleted: trunk/packages/minc/tags/2.1.10-1/debian/patches/decompress-whole-file.diff =================================================================== --- trunk/packages/minc/trunk/debian/patches/decompress-whole-file.diff 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/patches/decompress-whole-file.diff 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,22 +0,0 @@ -Description: Decompress entire externally-compressed file - MINC 1 files were often compressed using gzip or similar. There is code in - the library that decompresses only the initial portion of the file when only - the header is required (e.g. for "mincinfo"). This code is broken for MINC 2 - files, so we work around this by forcing a decompression of the entire file. -Author: Steve Robbins <[email protected]> -Bug: 585676 -Forwarded: http://www.bic.mni.mcgill.ca/pipermail/minc-development/2011-December/000938.html - - ---- a/libsrc/netcdf_convenience.c.orig 2011-12-18 17:17:20.222227060 -0600 -+++ b/libsrc/netcdf_convenience.c 2011-12-18 17:45:40.734965898 -0600 -@@ -264,7 +264,8 @@ - #else /* Unix */ - - -- if (!header_only) { /* Decompress the whole file */ -+ /* Force whole file decompression always. */ -+ if (1) { /* Decompress the whole file */ - - (void) sprintf(whole_command, "exec %s %s > %s 2> /dev/null", - command, infile, outfile); Copied: trunk/packages/minc/tags/2.1.10-1/debian/patches/hdfv2-fixes.patch (from rev 9795, trunk/packages/minc/trunk/debian/patches/hdfv2-fixes.patch) =================================================================== --- trunk/packages/minc/tags/2.1.10-1/debian/patches/hdfv2-fixes.patch (rev 0) +++ trunk/packages/minc/tags/2.1.10-1/debian/patches/hdfv2-fixes.patch 2012-02-26 08:04:51 UTC (rev 9796) @@ -0,0 +1,17 @@ +Description: Enable building with HDF5 1.8 + Fix build problems with HDF5 version 2 API. +Author: Steve Robbins <[email protected]> +Bug: n/a +Forwarded: no + +--- minc-2.1.10.orig/libsrc2/test/datatype-test.c ++++ minc-2.1.10/libsrc2/test/datatype-test.c +@@ -13,7 +13,7 @@ + + /* Turn off automatic error reporting. + */ +- H5Eset_auto(H5E_DEFAULT, NULL); ++ H5Eset_auto(H5E_DEFAULT, NULL, NULL); + + /* Check each file. + */ Deleted: trunk/packages/minc/tags/2.1.10-1/debian/patches/read_file_names-refactor.patch =================================================================== --- trunk/packages/minc/trunk/debian/patches/read_file_names-refactor.patch 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/patches/read_file_names-refactor.patch 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,590 +0,0 @@ -Description: Work around missing PATH_MAX definition - Refactor code of read_file_names() into libminc2, - fix so that it does not depend on PATH_MAX. -Author: Steve Robbins <[email protected]> -Bug: n/a -Forwarded: no - ---- minc-2.1.00.orig/Makefile.am -+++ minc-2.1.00/Makefile.am -@@ -67,6 +67,7 @@ - # not part of the installation. - # - noinst_HEADERS = \ -+ libsrc/read_file_names.h \ - libsrc/minc_basic.h \ - libsrc/minc_config.h \ - libsrc/minc_error.h \ -@@ -425,6 +426,7 @@ - libminc2_la_LDFLAGS = -version-info 2:3:1 - libminc2_la_SOURCES = \ - libsrc/ParseArgv.c \ -+ libsrc/read_file_names.c \ - libsrc/dim_conversion.c \ - libsrc/image_conversion.c \ - libsrc/minc_convenience.c \ ---- /dev/null -+++ minc-2.1.00/libsrc/read_file_names.c -@@ -0,0 +1,99 @@ -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include "read_file_names.h" -+ -+#define FILE_NAME_ALLOC_SIZE 10 -+#define FILE_PATH_MAX 2046 -+ -+ -+ -+/* ----------------------------- MNI Header ----------------------------------- -+@NAME : read_file_names -+@INPUT : filelist - name of file from which to read names -+@OUTPUT : num_files - number of files read in -+@RETURNS : Pointer to a NULL-terminated array of file names -+@DESCRIPTION: Reads in a list of file names from file filelist or stdin if -+ "-" is specified. Returns NULL if an error occurs. If -+ no error occurs, then a pointer to an empty array is -+ returned and num_files is zero. -+@METHOD : -+@GLOBALS : -+@CALLS : -+@CREATED : March 8, 1995 (Peter Neelin) -+@MODIFIED : -+---------------------------------------------------------------------------- */ -+char **read_file_names(char *filelist, int *num_files) -+{ -+ char **files; -+ int array_size; -+ int nfiles; -+ FILE *fp; -+ char line[FILE_PATH_MAX+1]; -+ int length; -+ -+ /* Open the file */ -+ if (strcmp(filelist, "-") == 0) { -+ fp = stdin; -+ } -+ else { -+ fp = fopen(filelist, "r"); -+ if (fp == NULL) { -+ (void) fprintf(stderr, "Error opening file \"%s\"\n", filelist); -+ return NULL; -+ } -+ } -+ -+ /* Allocate an initial array and NULL-terminate it */ -+ array_size = FILE_NAME_ALLOC_SIZE; -+ files = malloc(sizeof(*files) * array_size); -+ if (files == NULL) { -+ (void) fprintf(stderr, "Error allocating memory\n"); -+ return NULL; -+ } -+ nfiles = 0; -+ files[nfiles] = NULL; -+ -+ /* Read in file names */ -+ while (fgets(line, sizeof(line)/sizeof(line[0]), fp) != NULL) { -+ -+ /* Remove a trailing newline and check that there is a name */ -+ length = strlen(line); -+ if ((length > 0) && (line[length-1] == '\n')) { -+ line[length-1] = '\0'; -+ length--; -+ } -+ if (length == 0) continue; -+ -+ /* Make room for names if needed */ -+ while (nfiles >= array_size-1) { -+ array_size += FILE_NAME_ALLOC_SIZE; -+ files = realloc(files, sizeof(*files) * array_size); -+ if (files == NULL) { -+ (void) fprintf(stderr, "Error allocating memory\n"); -+ return NULL; -+ } -+ } -+ -+ /* Save the name, making sure that the list is NULL-terminated */ -+ files[nfiles] = strdup(line); -+ if (files[nfiles] == NULL) { -+ (void) fprintf(stderr, "Error allocating memory\n"); -+ return NULL; -+ } -+ nfiles++; -+ files[nfiles] = NULL; -+ } -+ -+ /* Close the file */ -+ (void) fclose(fp); -+ -+ /* Return the number of files */ -+ *num_files = nfiles; -+ -+ return files; -+} ---- /dev/null -+++ minc-2.1.00/libsrc/read_file_names.h -@@ -0,0 +1,18 @@ -+ -+ -+/* ----------------------------- MNI Header ----------------------------------- -+@NAME : read_file_names -+@INPUT : filelist - name of file from which to read names -+@OUTPUT : num_files - number of files read in -+@RETURNS : Pointer to a NULL-terminated array of file names -+@DESCRIPTION: Reads in a list of file names from file filelist or stdin if -+ "-" is specified. Returns NULL if an error occurs. If -+ no error occurs, then a pointer to an empty array is -+ returned and num_files is zero. -+@METHOD : -+@GLOBALS : -+@CALLS : -+@CREATED : March 8, 1995 (Peter Neelin) -+@MODIFIED : -+---------------------------------------------------------------------------- */ -+char **read_file_names(char *filelist, int *num_files); ---- minc-2.1.00.orig/progs/minccalc/minccalc.c -+++ minc-2.1.00/progs/minccalc/minccalc.c -@@ -121,6 +121,7 @@ - #include <voxel_loop.h> - #include <time_stamp.h> - #include "node.h" -+#include "read_file_names.h" - - /* Constants */ - -@@ -143,7 +144,6 @@ - int input_vector_length, double *input_data[], - int output_num_buffers, int output_vector_length, - double *output_data[], Loop_Info *loop_info); --static char **read_file_names(char *filelist, int *num_files); - static char *read_expression_file(char *filename); - static int get_list_option(char *dst, char *key, int argc, char **argv); - -@@ -516,93 +516,6 @@ - } - - /* ----------------------------- MNI Header ----------------------------------- --@NAME : read_file_names --@INPUT : filelist - name of file from which to read names --@OUTPUT : num_files - number of files read in --@RETURNS : Pointer to a NULL-terminated array of file names --@DESCRIPTION: Reads in a list of file names from file filelist or stdin if -- "-" is specified. Returns NULL if an error occurs. If -- no error occurs, then a pointer to an empty array is -- returned and num_files is zero. --@METHOD : --@GLOBALS : --@CALLS : --@CREATED : March 8, 1995 (Peter Neelin) --@MODIFIED : ------------------------------------------------------------------------------ */ --static char **read_file_names(char *filelist, int *num_files) --{ --#define FILE_NAME_ALLOC_SIZE 10 -- char **files; -- int array_size; -- int nfiles; -- FILE *fp; -- char line[PATH_MAX+1]; -- int length; -- -- /* Open the file */ -- if (strcmp(filelist, "-") == 0) { -- fp = stdin; -- } -- else { -- fp = fopen(filelist, "r"); -- if (fp == NULL) { -- (void) fprintf(stderr, "Error opening file \"%s\"\n", filelist); -- return NULL; -- } -- } -- -- /* Allocate an initial array and NULL-terminate it */ -- array_size = FILE_NAME_ALLOC_SIZE; -- files = malloc(sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles = 0; -- files[nfiles] = NULL; -- -- /* Read in file names */ -- while (fgets(line, sizeof(line)/sizeof(line[0]), fp) != NULL) { -- -- /* Remove a trailing newline and check that there is a name */ -- length = strlen(line); -- if ((length > 0) && (line[length-1] == '\n')) { -- line[length-1] = '\0'; -- length--; -- } -- if (length == 0) continue; -- -- /* Make room for names if needed */ -- while (nfiles >= array_size-1) { -- array_size += FILE_NAME_ALLOC_SIZE; -- files = realloc(files, sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- } -- -- /* Save the name, making sure that the list is NULL-terminated */ -- files[nfiles] = strdup(line); -- if (files[nfiles] == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles++; -- files[nfiles] = NULL; -- } -- -- /* Close the file */ -- (void) fclose(fp); -- -- /* Return the number of files */ -- *num_files = nfiles; -- -- return files; --} -- --/* ----------------------------- MNI Header ----------------------------------- - @NAME : read_expression_file - @INPUT : filename - Name of file from which to read expression - @OUTPUT : (none) ---- minc-2.1.00.orig/progs/mincaverage/mincaverage.c -+++ minc-2.1.00/progs/mincaverage/mincaverage.c -@@ -105,6 +105,7 @@ - #include <ParseArgv.h> - #include <time_stamp.h> - #include <voxel_loop.h> -+#include "read_file_names.h" - - /* Constants */ - -@@ -165,7 +166,6 @@ - double *output_data[], - Loop_Info *loop_info); - static int get_double_list(char *dst, char *key, char *nextarg); --static char **read_file_names(char *filelist, int *num_files); - - /* Argument variables */ - static int clobber = FALSE; -@@ -1010,91 +1010,3 @@ - - return TRUE; - } -- --/* ----------------------------- MNI Header ----------------------------------- --@NAME : read_file_names --@INPUT : filelist - name of file from which to read names --@OUTPUT : num_files - number of files read in --@RETURNS : Pointer to a NULL-terminated array of file names --@DESCRIPTION: Reads in a list of file names from file filelist or stdin if -- "-" is specified. Returns NULL if an error occurs. If -- no error occurs, then a pointer to an empty array is -- returned and num_files is zero. --@METHOD : --@GLOBALS : --@CALLS : --@CREATED : March 8, 1995 (Peter Neelin) --@MODIFIED : ------------------------------------------------------------------------------ */ --static char **read_file_names(char *filelist, int *num_files) --{ --#define FILE_NAME_ALLOC_SIZE 10 -- char **files; -- int array_size; -- int nfiles; -- FILE *fp; -- char line[PATH_MAX+1]; -- int length; -- -- /* Open the file */ -- if (strcmp(filelist, "-") == 0) { -- fp = stdin; -- } -- else { -- fp = fopen(filelist, "r"); -- if (fp == NULL) { -- (void) fprintf(stderr, "Error opening file \"%s\"\n", filelist); -- return NULL; -- } -- } -- -- /* Allocate an initial array and NULL-terminate it */ -- array_size = FILE_NAME_ALLOC_SIZE; -- files = malloc(sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles = 0; -- files[nfiles] = NULL; -- -- /* Read in file names */ -- while (fgets(line, sizeof(line)/sizeof(line[0]), fp) != NULL) { -- -- /* Remove a trailing newline and check that there is a name */ -- length = strlen(line); -- if ((length > 0) && (line[length-1] == '\n')) { -- line[length-1] = '\0'; -- length--; -- } -- if (length == 0) continue; -- -- /* Make room for names if needed */ -- while (nfiles >= array_size-1) { -- array_size += FILE_NAME_ALLOC_SIZE; -- files = realloc(files, sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- } -- -- /* Save the name, making sure that the list is NULL-terminated */ -- files[nfiles] = strdup(line); -- if (files[nfiles] == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles++; -- files[nfiles] = NULL; -- } -- -- /* Close the file */ -- (void) fclose(fp); -- -- /* Return the number of files */ -- *num_files = nfiles; -- -- return files; --} -- ---- minc-2.1.00.orig/progs/mincconcat/mincconcat.c -+++ minc-2.1.00/progs/mincconcat/mincconcat.c -@@ -129,6 +129,7 @@ - #include <ParseArgv.h> - #include <time_stamp.h> - #include <voxel_loop.h> -+#include "read_file_names.h" - - /* Constants */ - #ifndef TRUE -@@ -213,7 +214,6 @@ - static int sort_function(const void *value1, const void *value2); - static void create_concat_file(int inmincid, Concat_Info *concat_info); - static void update_history(int mincid, char *arg_string); --static char **read_file_names(char *filelist, int *num_files); - - /* Globals */ - static int Sort_ascending = TRUE; -@@ -1457,91 +1457,3 @@ - free(string); - - } -- --/* ----------------------------- MNI Header ----------------------------------- --@NAME : read_file_names --@INPUT : filelist - name of file from which to read names --@OUTPUT : num_files - number of files read in --@RETURNS : Pointer to a NULL-terminated array of file names --@DESCRIPTION: Reads in a list of file names from file filelist or stdin if -- "-" is specified. Returns NULL if an error occurs. If -- no error occurs, then a pointer to an empty array is -- returned and num_files is zero. --@METHOD : --@GLOBALS : --@CALLS : --@CREATED : March 8, 1995 (Peter Neelin) --@MODIFIED : ------------------------------------------------------------------------------ */ --static char **read_file_names(char *filelist, int *num_files) --{ --#define FILE_NAME_ALLOC_SIZE 10 -- char **files; -- int array_size; -- int nfiles; -- FILE *fp; -- char line[PATH_MAX+1]; -- int length; -- -- /* Open the file */ -- if (strcmp(filelist, "-") == 0) { -- fp = stdin; -- } -- else { -- fp = fopen(filelist, "r"); -- if (fp == NULL) { -- (void) fprintf(stderr, "Error opening file \"%s\"\n", filelist); -- return NULL; -- } -- } -- -- /* Allocate an initial array and NULL-terminate it */ -- array_size = FILE_NAME_ALLOC_SIZE; -- files = malloc(sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles = 0; -- files[nfiles] = NULL; -- -- /* Read in file names */ -- while (fgets(line, sizeof(line)/sizeof(line[0]), fp) != NULL) { -- -- /* Remove a trailing newline and check that there is a name */ -- length = strlen(line); -- if ((length > 0) && (line[length-1] == '\n')) { -- line[length-1] = '\0'; -- length--; -- } -- if (length == 0) continue; -- -- /* Make room for names if needed */ -- while (nfiles >= array_size-1) { -- array_size += FILE_NAME_ALLOC_SIZE; -- files = realloc(files, sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- } -- -- /* Save the name, making sure that the list is NULL-terminated */ -- files[nfiles] = strdup(line); -- if (files[nfiles] == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles++; -- files[nfiles] = NULL; -- } -- -- /* Close the file */ -- (void) fclose(fp); -- -- /* Return the number of files */ -- *num_files = nfiles; -- -- return files; --} -- ---- minc-2.1.00.orig/progs/mincmath/mincmath.c -+++ minc-2.1.00/progs/mincmath/mincmath.c -@@ -123,6 +123,7 @@ - #include <ParseArgv.h> - #include <time_stamp.h> - #include <voxel_loop.h> -+#include "read_file_names.h" - - /* Constants */ - -@@ -219,7 +220,6 @@ - int output_num_buffers, int output_vector_length, - double *output_data[], - Loop_Info *loop_info); --static char **read_file_names(char *filelist, int *num_files); - - /* Argument variables */ - static int clobber = FALSE; -@@ -929,91 +929,3 @@ - - return; - } -- --/* ----------------------------- MNI Header ----------------------------------- --@NAME : read_file_names --@INPUT : filelist - name of file from which to read names --@OUTPUT : num_files - number of files read in --@RETURNS : Pointer to a NULL-terminated array of file names --@DESCRIPTION: Reads in a list of file names from file filelist or stdin if -- "-" is specified. Returns NULL if an error occurs. If -- no error occurs, then a pointer to an empty array is -- returned and num_files is zero. --@METHOD : --@GLOBALS : --@CALLS : --@CREATED : March 8, 1995 (Peter Neelin) --@MODIFIED : ------------------------------------------------------------------------------ */ --static char **read_file_names(char *filelist, int *num_files) --{ --#define FILE_NAME_ALLOC_SIZE 10 -- char **files; -- int array_size; -- int nfiles; -- FILE *fp; -- char line[PATH_MAX+1]; -- int length; -- -- /* Open the file */ -- if (strcmp(filelist, "-") == 0) { -- fp = stdin; -- } -- else { -- fp = fopen(filelist, "r"); -- if (fp == NULL) { -- (void) fprintf(stderr, "Error opening file \"%s\"\n", filelist); -- return NULL; -- } -- } -- -- /* Allocate an initial array and NULL-terminate it */ -- array_size = FILE_NAME_ALLOC_SIZE; -- files = malloc(sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles = 0; -- files[nfiles] = NULL; -- -- /* Read in file names */ -- while (fgets(line, sizeof(line)/sizeof(line[0]), fp) != NULL) { -- -- /* Remove a trailing newline and check that there is a name */ -- length = strlen(line); -- if ((length > 0) && (line[length-1] == '\n')) { -- line[length-1] = '\0'; -- length--; -- } -- if (length == 0) continue; -- -- /* Make room for names if needed */ -- while (nfiles >= array_size-1) { -- array_size += FILE_NAME_ALLOC_SIZE; -- files = realloc(files, sizeof(*files) * array_size); -- if (files == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- } -- -- /* Save the name, making sure that the list is NULL-terminated */ -- files[nfiles] = strdup(line); -- if (files[nfiles] == NULL) { -- (void) fprintf(stderr, "Error allocating memory\n"); -- return NULL; -- } -- nfiles++; -- files[nfiles] = NULL; -- } -- -- /* Close the file */ -- (void) fclose(fp); -- -- /* Return the number of files */ -- *num_files = nfiles; -- -- return files; --} -- Deleted: trunk/packages/minc/tags/2.1.10-1/debian/patches/series =================================================================== --- trunk/packages/minc/trunk/debian/patches/series 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/patches/series 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,4 +0,0 @@ -01_mincedit-sensible-viewer.diff -03_mincview.diff -decompress-whole-file.diff -read_file_names-refactor.patch Copied: trunk/packages/minc/tags/2.1.10-1/debian/patches/series (from rev 9795, trunk/packages/minc/trunk/debian/patches/series) =================================================================== --- trunk/packages/minc/tags/2.1.10-1/debian/patches/series (rev 0) +++ trunk/packages/minc/tags/2.1.10-1/debian/patches/series 2012-02-26 08:04:51 UTC (rev 9796) @@ -0,0 +1,2 @@ +01_mincedit-sensible-viewer.diff +hdfv2-fixes.patch Deleted: trunk/packages/minc/tags/2.1.10-1/debian/rules =================================================================== --- trunk/packages/minc/trunk/debian/rules 2012-02-20 21:19:43 UTC (rev 9734) +++ trunk/packages/minc/tags/2.1.10-1/debian/rules 2012-02-26 08:04:51 UTC (rev 9796) @@ -1,51 +0,0 @@ -#! /usr/bin/make -f - -%: - dh $@ --parallel --with autotools_dev - - -ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Tests are buggy; disable test on sparc -ifeq ($(ARCH),sparc) - DEB_BUILD_OPTIONS += nocheck -endif - - - -DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema CFLAGS="$(CFLAGS)" - - -override_dh_auto_configure: - dh_autoreconf - dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) - -override_dh_auto_clean: - dh_autoreconf_clean - dh_auto_clean - -ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps - -doc/prog_ref.ps doc/prog_guide.ps: - $(MAKE) -C doc docs - -volume_io/Documentation/volume_io.ps: - $(MAKE) -C volume_io/Documentation docs - -override_dh_install: $(ps_docs) - # minc-tools - rm -f debian/tmp/usr/bin/byte_swap - rm -f debian/tmp/usr/bin/extract - rm -f debian/tmp/usr/bin/acr_test - rm -f debian/tmp/usr/bin/dicom_test - dh_install -pminc-tools --autodest debian/tmp/usr/bin - dh_install -pminc-tools --autodest debian/tmp/usr/share/man - dh_link -pminc-tools \ - /usr/share/man/man1/voxeltoworld.1 \ - /usr/share/man/man1/worldtovoxel.1 - # libminc2-1 - dh_install -plibminc2-1 --autodest debian/tmp/usr/lib/*/lib*.so.* - # libminc-dev - dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so - dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.a - dh_install -plibminc-dev --autodest debian/tmp/usr/include - dh_installdocs -plibminc-dev $(ps_docs) debian/index.html Copied: trunk/packages/minc/tags/2.1.10-1/debian/rules (from rev 9795, trunk/packages/minc/trunk/debian/rules) =================================================================== --- trunk/packages/minc/tags/2.1.10-1/debian/rules (rev 0) +++ trunk/packages/minc/tags/2.1.10-1/debian/rules 2012-02-26 08:04:51 UTC (rev 9796) @@ -0,0 +1,46 @@ +#! /usr/bin/make -f + +%: + dh $@ --parallel --with autotools_dev + + +ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) +# Tests are buggy; disable test on sparc +ifeq ($(ARCH),sparc) + DEB_BUILD_OPTIONS += nocheck +endif + + + +DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema CFLAGS="$(CFLAGS)" + + +override_dh_auto_configure: + dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) + +ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps + +doc/prog_ref.ps doc/prog_guide.ps: + $(MAKE) -C doc docs + +volume_io/Documentation/volume_io.ps: + $(MAKE) -C volume_io/Documentation docs + +override_dh_install: $(ps_docs) + # minc-tools + rm -f debian/tmp/usr/bin/byte_swap + rm -f debian/tmp/usr/bin/extract + rm -f debian/tmp/usr/bin/acr_test + rm -f debian/tmp/usr/bin/dicom_test + dh_install -pminc-tools --autodest debian/tmp/usr/bin + dh_install -pminc-tools --autodest debian/tmp/usr/share/man + dh_link -pminc-tools \ + /usr/share/man/man1/voxeltoworld.1 \ + /usr/share/man/man1/worldtovoxel.1 + # libminc2-1 + dh_install -plibminc2-1 --autodest debian/tmp/usr/lib/*/lib*.so.* + # libminc-dev + dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.so + dh_install -plibminc-dev --autodest debian/tmp/usr/lib/*/lib*.a + dh_install -plibminc-dev --autodest debian/tmp/usr/include + dh_installdocs -plibminc-dev $(ps_docs) debian/index.html _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
