[med-svn] r6449 - in trunk/packages/dcmtk/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-04-04 09:10:00 +0000 (Mon, 04 Apr 2011)
New Revision: 6449

Added:
   trunk/packages/dcmtk/trunk/debian/patches/removedocsfromall.patch
Modified:
   trunk/packages/dcmtk/trunk/debian/patches/series
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Remove targets from the build-indep from the all target

Added: trunk/packages/dcmtk/trunk/debian/patches/removedocsfromall.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/removedocsfromall.patch	                        (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/patches/removedocsfromall.patch	2011-04-04 09:10:00 UTC (rev 6449)
@@ -0,0 +1,22 @@
+Index: dcmtk-3.6.0/doxygen/Makefile.in
+===================================================================
+--- dcmtk-3.6.0.orig/doxygen/Makefile.in	2011-04-04 11:01:37.000000000 +0200
++++ dcmtk-3.6.0/doxygen/Makefile.in	2011-04-04 11:01:48.000000000 +0200
+@@ -15,8 +15,6 @@
+ DCMTK_VERSION = $(PACKAGE_VERSION)$(PACKAGE_VERSION_SUFFIX)
+ 
+ 
+-all: html man
+-
+ html:
+ 	sed -e "s/@DCMTK_VERSION@/$(DCMTK_VERSION)/" -e "s/@DOXYGEN_DATA_DIR@/./" -e "s/@DOXYGEN_INPUT_DIR@/../" htmldocs.cfg > htmldocs.tmp
+ 	$(DOXYGEN) htmldocs.tmp
+@@ -35,8 +33,6 @@
+ 	done
+ 
+ 
+-install: install-man install-html
+-
+ install-man:
+ 	$(configdir)/mkinstalldirs $(DESTDIR)$(man1dir)
+ 	for file in manpages/man1/*.1 ; do \

Modified: trunk/packages/dcmtk/trunk/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/series	2011-04-04 04:40:06 UTC (rev 6448)
+++ trunk/packages/dcmtk/trunk/debian/patches/series	2011-04-04 09:10:00 UTC (rev 6449)
@@ -5,3 +5,4 @@
 07_doxygen.patch
 png_tiff.patch
 prefs.patch
+removedocsfromall.patch

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2011-04-04 04:40:06 UTC (rev 6448)
+++ trunk/packages/dcmtk/trunk/debian/rules	2011-04-04 09:10:00 UTC (rev 6449)
@@ -109,6 +109,7 @@
 	dh_testdir
 
 	$(MAKE) html
+	$(MAKE) man
 
 	touch build-indep-stamp
 
@@ -142,6 +143,7 @@
 	dh_installdirs -i
 
 	$(MAKE) install-html DESTDIR=$(PKGDIR_DCMTK_DOC)
+	$(MAKE) install-man DESTDIR=$(PKGDIR_DCMTK_DOC)
 
 install-arch: build-arch
 	dh_testdir