[med-svn] r16653 - trunk/packages/vtk-dicom/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2014-04-10 14:52:43 +0000 (Thu, 10 Apr 2014)
New Revision: 16653

Modified:
   trunk/packages/vtk-dicom/trunk/debian/changelog
   trunk/packages/vtk-dicom/trunk/debian/control
   trunk/packages/vtk-dicom/trunk/debian/rules
Log:
some work

Modified: trunk/packages/vtk-dicom/trunk/debian/changelog
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/changelog	2014-04-10 14:48:01 UTC (rev 16652)
+++ trunk/packages/vtk-dicom/trunk/debian/changelog	2014-04-10 14:52:43 UTC (rev 16653)
@@ -1,3 +1,10 @@
+vtk-dicom (0.4.4-3) UNRELEASED; urgency=low
+
+  * Really fix man page generation
+  * Allow easier backport to wheezy
+
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 10 Apr 2014 16:52:11 +0200
+
 vtk-dicom (0.4.4-2) unstable; urgency=low
 
   * Add patch to allow backport to wheezy

Modified: trunk/packages/vtk-dicom/trunk/debian/control
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/control	2014-04-10 14:48:01 UTC (rev 16652)
+++ trunk/packages/vtk-dicom/trunk/debian/control	2014-04-10 14:52:43 UTC (rev 16653)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 9), cmake, libvtk5-dev (>= 5.8), libgdcm2-dev, libdcmtk-dev, help2man
+Build-Depends: debhelper (>= 9), cmake, libvtk5-dev (>= 5.8), libgdcm2-dev, libdcmtk-dev | libdcmtk2-dev, help2man
 Homepage: http://github.com/dgobbi/vtk-dicom/
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/vtk-dicom/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/vtk-dicom/trunk

Modified: trunk/packages/vtk-dicom/trunk/debian/rules
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/rules	2014-04-10 14:48:01 UTC (rev 16652)
+++ trunk/packages/vtk-dicom/trunk/debian/rules	2014-04-10 14:52:43 UTC (rev 16653)
@@ -38,7 +38,7 @@
 
 debian/%.1: debian/common.1.in
 	help2man --help-option=--help --include=$< --version-option=--version --version-string=$(VERSION) \
-    --output=$@ --no-info --no-discard-stderr ./debian/tmp/usr/bin/`basename $@ .1`
+    --output=$@ --no-info --name="vtk-dicom CLI" ./obj-*/bin/`basename $@ .1`
 
 manpages: debian/dicomdump.1 debian/dicomtonifti.1 debian/niftidump.1 debian/niftitodicom.1
 	echo "manpages"
@@ -46,5 +46,8 @@
 override_dh_installman: manpages
 	dh_installman -p$(pkg_bin) debian/*.1
 
+override_dh_clean:
+	dh_clean debian/*.1
+
 get-orig-source:
 	uscan --verbose --rename --force-download