reverted: --- volpack-1.0b3/volpack.h +++ volpack-1.0b3.orig/volpack.h @@ -348,9 +348,7 @@ * Global variables. * *******************************************************************/ +EXTERN char *vpCompilerOptions; -/* Seems not to be used any more - EXTERN char *vpCompilerOptions; - */ /******************************************************************* * Function declarations. * reverted: --- volpack-1.0b3/debian/patches/00list +++ volpack-1.0b3.orig/debian/patches/00list @@ -1,2 +0,0 @@ -10_examples.dpatch -10_vp_global_h.dpatch reverted: --- volpack-1.0b3/debian/patches/10_examples.dpatch +++ volpack-1.0b3.orig/debian/patches/10_examples.dpatch @@ -1,52 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_examples.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Added missing headers in examples - -@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 - #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 - #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 - #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 - #include "volume.h" - - main(argc, argv) reverted: --- volpack-1.0b3/debian/patches/README +++ volpack-1.0b3.orig/debian/patches/README @@ -1,3 +0,0 @@ -0xxx: Grabbed from upstream development. -1xxx: Possibly relevant for upstream adoption. -2xxx: Only relevant for official Debian release. reverted: --- volpack-1.0b3/debian/patches/10_vp_global_h.dpatch +++ volpack-1.0b3.orig/debian/patches/10_vp_global_h.dpatch @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_vp_global_h.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix for vp_global.h - -@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)) diff -u volpack-1.0b3/debian/examples/test.sh volpack-1.0b3/debian/examples/test.sh --- volpack-1.0b3/debian/examples/test.sh +++ volpack-1.0b3/debian/examples/test.sh @@ -1,4 +1,4 @@ -#!/bin/sh -f +#!/bin/bash -f echo "*** makevolume ***" time makevolume diff -u volpack-1.0b3/debian/compat volpack-1.0b3/debian/compat --- volpack-1.0b3/debian/compat +++ volpack-1.0b3/debian/compat @@ -1 +1 @@ -5 +7 diff -u volpack-1.0b3/debian/control volpack-1.0b3/debian/control --- volpack-1.0b3/debian/control +++ volpack-1.0b3/debian/control @@ -1,19 +1,19 @@ Source: volpack Section: libs -Priority: extra +Priority: optional Maintainer: Debian-Med Packaging Team -XS-DM-Upload-Allowed: Yes +DM-Upload-Allowed: yes Uploaders: Michael Hanke , Andreas Tille -Build-Depends: cdbs, debhelper (>= 5), m4, autotools-dev, dpatch, d-shlibs -Standards-Version: 3.7.2 +Build-Depends: cdbs, debhelper (>= 7), m4, autotools-dev, quilt, d-shlibs +Standards-Version: 3.8.3 Homepage: http://graphics.stanford.edu/software/volpack/ -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/volpack/ -Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/volpack/ +Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/volpack/?rev=0&sc=0 +Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/volpack/trunk/ Package: libvolpack1 Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: fast volume rendering library VolPack is a software library for fast, high-quality volume rendering with this features: @@ -30,7 +30,7 @@ Package: libvolpack1-dev Architecture: any Section: libdevel -Depends: libvolpack1 (= ${binary:Version}), ${devlibs:Depends} +Depends: libvolpack1 (= ${binary:Version}), ${devlibs:Depends}, ${misc:Depends} Provides: libvolpack-dev Conflicts: libvolpack-dev Description: fast volume rendering library diff -u volpack-1.0b3/debian/copyright volpack-1.0b3/debian/copyright --- volpack-1.0b3/debian/copyright +++ volpack-1.0b3/debian/copyright @@ -5,11 +5,11 @@ Upstream Author: Philippe Lacroute -As a request from Andreas Tille to explicitely mention the license +As a request from Andreas Tille to explicitly mention the license inside the download archive upstream has agreed so for future versions. For the moment there is the web site http://graphics.stanford.edu/software/bsd-license.html -which explicitely states: +which explicitly states: In an effort to simplify our licensing terms and facilitate the widest possible use of our software, as of August 23, 2007 we have switched to the BSD license for all future downloads of our software. diff -u volpack-1.0b3/debian/changelog volpack-1.0b3/debian/changelog --- volpack-1.0b3/debian/changelog +++ volpack-1.0b3/debian/changelog @@ -1,3 +1,16 @@ +volpack (1.0b3-3) unstable; urgency=low + + * debian/control: + - Fixed Vcs-Svn (missing svn/) + - Updated Standards-Version to 3.8.3 (added README.source) + * examples/test.sh: s?bin/sh?bin/bash? because the script + uses the bash internal time + Closes: #535875 + * Changed patch system to quilt + * cleaned up debian/rules from useless comments + + -- Andreas Tille Thu, 01 Oct 2009 22:25:16 +0200 + volpack (1.0b3-2) unstable; urgency=low * Added section: header to source package diff -u volpack-1.0b3/debian/rules volpack-1.0b3/debian/rules --- volpack-1.0b3/debian/rules +++ volpack-1.0b3/debian/rules @@ -2,11 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -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/libvolpack1-dev/usr --srcdir=. -# DEB_INSTALL_CHANGELOGS_ALL := changes +include /usr/share/cdbs/1/rules/patchsys-quilt.mk common-binary-post-install-arch:: # Call d-shlibmove to comply with library packaging guide @@ -18,7 +14,4 @@ debian/tmp/usr/lib/libvolpack.so -## --movedevdoc "examples/{README,*.c,*.h,*.den}" \ -## --movedev "debian/tmp/usr/lib/libvolpack.a" usr/lib \ - get-orig-source: . debian/get-orig-source only in patch2: unchanged: --- volpack-1.0b3.orig/debian/README.source +++ volpack-1.0b3/debian/README.source @@ -0,0 +1,4 @@ +This packages uses the quilt patch system. Please read +/usr/share/doc/quilt/README.source for more information. + + -- Andreas Tille Mon, 31 Aug 2009 14:50:19 +0200 only in patch2: unchanged: --- volpack-1.0b3.orig/debian/patches/10_vp_global_h.patch +++ volpack-1.0b3/debian/patches/10_vp_global_h.patch @@ -0,0 +1,15 @@ +Author: Andreas Tille +Description: Fix for vp_global.h + +--- volpack-1.0b3.orig/vp_global.h ++++ volpack-1.0b3/vp_global.h +@@ -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)) only in patch2: unchanged: --- volpack-1.0b3.orig/debian/patches/series +++ volpack-1.0b3/debian/patches/series @@ -0,0 +1,2 @@ +10_examples.patch +10_vp_global_h.patch only in patch2: unchanged: --- volpack-1.0b3.orig/debian/patches/10_examples.patch +++ volpack-1.0b3/debian/patches/10_examples.patch @@ -0,0 +1,47 @@ +Author: Andreas Tille +Description: Added missing headers in examples + +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 + #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 + #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 + #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 + #include "volume.h" + + main(argc, argv)