[med-svn] r893 - in trunk/packages/volpack/trunk/debian: . patches
tille at alioth.debian.org
tille at alioth.debian.org
Mon Dec 10 17:53:19 UTC 2007
Author: tille
Date: 2007-12-10 17:53:19 +0000 (Mon, 10 Dec 2007)
New Revision: 893
Added:
trunk/packages/volpack/trunk/debian/libvolpack1-dev.examples
trunk/packages/volpack/trunk/debian/libvolpack1-dev.manpages
trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch
trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch
Removed:
trunk/packages/volpack/trunk/debian/libvolpack-dev.manpages
Modified:
trunk/packages/volpack/trunk/debian/README.Debian
trunk/packages/volpack/trunk/debian/patches/00list
trunk/packages/volpack/trunk/debian/rules
Log:
Added dpatch files, documented rebuilded orig.tar.gz in README.Debian, some fixes
Modified: trunk/packages/volpack/trunk/debian/README.Debian
===================================================================
--- trunk/packages/volpack/trunk/debian/README.Debian 2007-12-09 21:37:11 UTC (rev 892)
+++ trunk/packages/volpack/trunk/debian/README.Debian 2007-12-10 17:53:19 UTC (rev 893)
@@ -4,4 +4,27 @@
The volpack package might be interesting for Debian-Med and provides
additional functionality for the amide image viewer
- -- Michael Hanke <michael.hanke at gmail.com> Fri, 20 Apr 2007 19:37:30 +0200
+The source tarball was rebuilded to enable easy building of dynamically
+and statically linked libraries. The easiest way to do so is to use
+automake and libtool. The patch was forewarde to the author but for
+the moment he prefers to stick to his own building system:
+
+ Date: Wed, 07 Nov 2007 14:02:47 -0800
+ From: Phil Lacroute <lacroute at stanford.edu>
+
+ I'm not entirely happy with the new build procedure since it doesn't work on the
+ environment I use every day, and I haven't had a whole lot of time to look into it. I
+ haven't looked at the GNU build tools in a long time so there's a bit of a learning
+ curve to figure out the issues.
+
+I decided to change the orig.tar.gz tarball because I would consider
+this as a welcome enhancement also for non-Debian users who might be
+interested in just downloading this alternative package. I wanted to
+avoid mixing this up with other patches.
+
+The process how to obtain this tarball is documented in the get-orig-source
+target of debian/rules (which calls the script debian/get-orig-source and
+applies the patch debian/get-orig-source.patch) so it can easily reproduced
+if necessary.
+
+ -- Andreas Tille <tille at debian.org> Mon, 10 Dec 2007 14:16:56 +0200
Deleted: trunk/packages/volpack/trunk/debian/libvolpack-dev.manpages
===================================================================
--- trunk/packages/volpack/trunk/debian/libvolpack-dev.manpages 2007-12-09 21:37:11 UTC (rev 892)
+++ trunk/packages/volpack/trunk/debian/libvolpack-dev.manpages 2007-12-10 17:53:19 UTC (rev 893)
@@ -1 +0,0 @@
-man/src/*.3
Added: trunk/packages/volpack/trunk/debian/libvolpack1-dev.examples
===================================================================
--- trunk/packages/volpack/trunk/debian/libvolpack1-dev.examples (rev 0)
+++ trunk/packages/volpack/trunk/debian/libvolpack1-dev.examples 2007-12-10 17:53:19 UTC (rev 893)
@@ -0,0 +1,4 @@
+examples/README
+examples/*.c
+examples/*.h
+examples/*.den
Added: trunk/packages/volpack/trunk/debian/libvolpack1-dev.manpages
===================================================================
--- trunk/packages/volpack/trunk/debian/libvolpack1-dev.manpages (rev 0)
+++ trunk/packages/volpack/trunk/debian/libvolpack1-dev.manpages 2007-12-10 17:53:19 UTC (rev 893)
@@ -0,0 +1 @@
+man/src/*.3
Modified: trunk/packages/volpack/trunk/debian/patches/00list
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/00list 2007-12-09 21:37:11 UTC (rev 892)
+++ trunk/packages/volpack/trunk/debian/patches/00list 2007-12-10 17:53:19 UTC (rev 893)
@@ -0,0 +1,2 @@
+10_examples.dpatch
+10_vp_global_h.dpatch
Added: trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch (rev 0)
+++ trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch 2007-12-10 17:53:19 UTC (rev 893)
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_examples.dpatch by <tille at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Added missing headers in examples
+
+ at DPATCH@
+
+diff -ubrN volpack-1.0b3/examples.orig/classifyvolume.c volpack-1.0b3/examples/classifyvolume.c
+--- volpack-1.0b3/examples.orig/classifyvolume.c 1994-12-31 20:53:04.000000000 +0100
++++ volpack-1.0b3/examples/classifyvolume.c 2007-08-04 21:30:11.000000000 +0200
+@@ -28,6 +28,7 @@
+ * $Revision: 1.5 $
+ */
+
++#include <stdlib.h>
+ #include "volume.h"
+
+ main(argc, argv)
+diff -ubrN volpack-1.0b3/examples.orig/makeoctree.c volpack-1.0b3/examples/makeoctree.c
+--- volpack-1.0b3/examples.orig/makeoctree.c 1994-12-31 20:53:05.000000000 +0100
++++ volpack-1.0b3/examples/makeoctree.c 2007-08-04 21:30:11.000000000 +0200
+@@ -28,6 +28,7 @@
+ * $Revision: 1.5 $
+ */
+
++#include <stdlib.h>
+ #include "volume.h"
+
+ main()
+diff -ubrN volpack-1.0b3/examples.orig/makevolume.c volpack-1.0b3/examples/makevolume.c
+--- volpack-1.0b3/examples.orig/makevolume.c 1994-12-31 20:53:06.000000000 +0100
++++ volpack-1.0b3/examples/makevolume.c 2007-08-04 21:30:11.000000000 +0200
+@@ -28,6 +28,7 @@
+ * $Revision: 1.5 $
+ */
+
++#include <stdlib.h>
+ #include "volume.h"
+
+ main()
+diff -ubrN volpack-1.0b3/examples.orig/rendervolume.c volpack-1.0b3/examples/rendervolume.c
+--- volpack-1.0b3/examples.orig/rendervolume.c 1995-01-01 01:06:26.000000000 +0100
++++ volpack-1.0b3/examples/rendervolume.c 2007-08-04 21:30:11.000000000 +0200
+@@ -28,6 +28,7 @@
+ * $Revision: 1.5 $
+ */
+
++#include <stdlib.h>
+ #include "volume.h"
+
+ main(argc, argv)
Added: trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch (rev 0)
+++ trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch 2007-12-10 17:53:19 UTC (rev 893)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_vp_global_h.dpatch by <tille at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for vp_global.h
+
+ at DPATCH@
+
+--- volpack-1.0b3/vp_global.h.orig 1994-12-31 00:53:14.000000000 +0100
++++ volpack-1.0b3/vp_global.h 2007-07-29 13:43:03.000000000 +0200
+@@ -168,7 +168,9 @@
+ * Macros. *
+ *******************************************************************/
+
++#ifndef NULL
+ #define NULL 0
++#endif
+
+ #define MAX(a,b) (((a)<(b)) ? (b) : (a))
+ #define MIN(a,b) (((a)>(b)) ? (b) : (a))
Modified: trunk/packages/volpack/trunk/debian/rules
===================================================================
--- trunk/packages/volpack/trunk/debian/rules 2007-12-09 21:37:11 UTC (rev 892)
+++ trunk/packages/volpack/trunk/debian/rules 2007-12-10 17:53:19 UTC (rev 893)
@@ -5,19 +5,19 @@
include /usr/share/cdbs/1/rules/dpatch.mk
## Former stuff from Michael Hanke became unnecessary by implementing automake
-# DEB_CONFIGURE_INVOKE = ./configure --prefix=$(CURDIR)/debian/libvolpack-dev/usr --srcdir=.
+# DEB_CONFIGURE_INVOKE = ./configure --prefix=$(CURDIR)/debian/libvolpack1-dev/usr --srcdir=.
# DEB_INSTALL_CHANGELOGS_ALL := changes
common-binary-post-install-arch::
# Call d-shlibmove to comply with library packaging guide
- d-devlibdeps debian/libvolpack-dev.substvars debian/tmp/usr/lib/libvolpack.so
+ d-devlibdeps debian/libvolpack1-dev.substvars debian/tmp/usr/lib/libvolpack.so
# /bin/sh debian/debug/
cp -a volpack.h debian/tmp
d-shlibmove --commit \
--movedev "debian/tmp/volpack.h" usr/include \
- --movedevdoc "examples/{README,*.c,*.h,*.den}" \
debian/tmp/usr/lib/libvolpack.so
+## --movedevdoc "examples/{README,*.c,*.h,*.den}" \
## --movedev "debian/tmp/usr/lib/libvolpack.a" usr/lib \
get-orig-source:
More information about the debian-med-commit
mailing list