[med-svn] r4125 - in trunk/packages/volpack/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Sat Oct 3 07:17:10 UTC 2009
Author: tille
Date: 2009-10-03 07:17:08 +0000 (Sat, 03 Oct 2009)
New Revision: 4125
Added:
trunk/packages/volpack/trunk/debian/README.source
trunk/packages/volpack/trunk/debian/patches/10_examples.patch
trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.patch
trunk/packages/volpack/trunk/debian/patches/series
Removed:
trunk/packages/volpack/trunk/debian/patches/00list
trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch
trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch
trunk/packages/volpack/trunk/debian/patches/README
Modified:
trunk/packages/volpack/trunk/debian/changelog
trunk/packages/volpack/trunk/debian/control
trunk/packages/volpack/trunk/debian/rules
Log:
Switched patch system to quilt, some lintian issues
Added: trunk/packages/volpack/trunk/debian/README.source
===================================================================
--- trunk/packages/volpack/trunk/debian/README.source (rev 0)
+++ trunk/packages/volpack/trunk/debian/README.source 2009-10-03 07:17:08 UTC (rev 4125)
@@ -0,0 +1,4 @@
+This packages uses the quilt patch system. Please read
+/usr/share/doc/quilt/README.source for more information.
+
+ -- Andreas Tille <tille at debian.org> Mon, 31 Aug 2009 14:50:19 +0200
Modified: trunk/packages/volpack/trunk/debian/changelog
===================================================================
--- trunk/packages/volpack/trunk/debian/changelog 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/changelog 2009-10-03 07:17:08 UTC (rev 4125)
@@ -2,10 +2,12 @@
* debian/control:
- Fixed Vcs-Svn (missing svn/)
- - Updated Standards-Version to 3.8.3 (no changes needed)
+ - 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 <tille at debian.org> Thu, 01 Oct 2009 22:25:16 +0200
Modified: trunk/packages/volpack/trunk/debian/control
===================================================================
--- trunk/packages/volpack/trunk/debian/control 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/control 2009-10-03 07:17:08 UTC (rev 4125)
@@ -4,7 +4,7 @@
Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Michael Hanke <michael.hanke at gmail.com>, Andreas Tille <tille at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), m4, autotools-dev, dpatch, d-shlibs
+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/?rev=0&sc=0
@@ -13,7 +13,7 @@
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
Deleted: trunk/packages/volpack/trunk/debian/patches/00list
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/00list 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/patches/00list 2009-10-03 07:17:08 UTC (rev 4125)
@@ -1,2 +0,0 @@
-10_examples.dpatch
-10_vp_global_h.dpatch
Deleted: trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/patches/10_examples.dpatch 2009-10-03 07:17:08 UTC (rev 4125)
@@ -1,52 +0,0 @@
-#! /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_examples.patch
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/10_examples.patch (rev 0)
+++ trunk/packages/volpack/trunk/debian/patches/10_examples.patch 2009-10-03 07:17:08 UTC (rev 4125)
@@ -0,0 +1,47 @@
+Author: Andreas Tille <tille at debian.org>
+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 <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)
Deleted: trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.dpatch 2009-10-03 07:17:08 UTC (rev 4125)
@@ -1,20 +0,0 @@
-#! /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))
Added: trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.patch
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.patch (rev 0)
+++ trunk/packages/volpack/trunk/debian/patches/10_vp_global_h.patch 2009-10-03 07:17:08 UTC (rev 4125)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+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))
Deleted: trunk/packages/volpack/trunk/debian/patches/README
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/README 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/patches/README 2009-10-03 07:17:08 UTC (rev 4125)
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
Added: trunk/packages/volpack/trunk/debian/patches/series
===================================================================
--- trunk/packages/volpack/trunk/debian/patches/series (rev 0)
+++ trunk/packages/volpack/trunk/debian/patches/series 2009-10-03 07:17:08 UTC (rev 4125)
@@ -0,0 +1,2 @@
+10_examples.patch
+10_vp_global_h.patch
Modified: trunk/packages/volpack/trunk/debian/rules
===================================================================
--- trunk/packages/volpack/trunk/debian/rules 2009-10-03 06:32:22 UTC (rev 4124)
+++ trunk/packages/volpack/trunk/debian/rules 2009-10-03 07:17:08 UTC (rev 4125)
@@ -2,12 +2,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.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
-
common-binary-post-install-arch::
# Call d-shlibmove to comply with library packaging guide
d-devlibdeps debian/libvolpack1-dev.substvars debian/tmp/usr/lib/libvolpack.so
@@ -17,8 +13,5 @@
--movedev "debian/tmp/volpack.h" usr/include \
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
More information about the debian-med-commit
mailing list