[med-svn] r4796 - trunk/packages/dicom3tools/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2010-05-16 08:23:52 +0000 (Sun, 16 May 2010)
New Revision: 4796

Modified:
   trunk/packages/dicom3tools/trunk/debian/changelog
   trunk/packages/dicom3tools/trunk/debian/rules
Log:
Prepare for new snapshot + simplify rules file

Modified: trunk/packages/dicom3tools/trunk/debian/changelog
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/changelog	2010-05-12 14:13:37 UTC (rev 4795)
+++ trunk/packages/dicom3tools/trunk/debian/changelog	2010-05-16 08:23:52 UTC (rev 4796)
@@ -1,3 +1,9 @@
+dicom3tools (1.0~20100510-3) unstable; urgency=low
+
+  * New upstream (fix pnmtodc)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 11 May 2010 11:39:07 +0200
+
 dicom3tools (1.0~20100206-2) unstable; urgency=low
 
   * Add jpegdump command line tool for dumping jpeg structure.

Modified: trunk/packages/dicom3tools/trunk/debian/rules
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/rules	2010-05-12 14:13:37 UTC (rev 4795)
+++ trunk/packages/dicom3tools/trunk/debian/rules	2010-05-16 08:23:52 UTC (rev 4796)
@@ -28,6 +28,9 @@
 
 CFLAGS = -Wall -g
 
+DCLIST = -name andump\* -o -name ancreate\* -o -name dcencap\* -o -name dccp\* -o -name dctoraw\* -o -name dcjpeg\* -o -name pnmtodc\* -o -name dcjls\* -o -name dcj2k\* -o -name dcunjpeg\* -o -name dcunjls\* -o -name bmpdump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\*
+DCLIST = -name andump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\*
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -73,7 +76,7 @@
 	# remove empty man page
 	find $(CURDIR)/debian/dicom3tools -type f -size 0 -print | xargs rm
 	# now that we have removed empty man page, we need to remove associated binaries
-	for file in ancp andiff antodc.all binpatch bmpdump dcanon dcburn dccmp dccomb dcdecmpr dcdiff dclutburn \
+	for file in ancp andiff antodc.all binpatch dcanon dcburn dccmp dccomb dcdecmpr dcdiff dclutburn \
 							dclutmix dcmvhier.8only dcmvhier.all dcortho dcostosr dcpost dcproj dcrmsfx.all \
 							dcsrmrg dcsub dcswab dctopgm8 dcunjpeg.all dumptiff dumpwhat gentodc.dat.all \
 							jpegsplit pbmswbit pgmtobmp pnmpred pnmtoraw pqsplit rawarith rawdiff rawmask rawnjl; do \
@@ -93,8 +96,8 @@
 	#find $(CURDIR)/debian/dicom3tools/usr/share/man/man1 -type f -exec sed -i -e 's/-/\\-/g' {} \;
 	# Can't use above -> manpage-has-bad-whatis-entry
 	# Remove (except special list from official upstream releases) :
-	find $(CURDIR)/debian/dicom3tools/usr/bin -type f -not \( -name andump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* \) -print | xargs rm; \
-	find $(CURDIR)/debian/dicom3tools/usr/share/man -type f -not \( -name andump\* -o -name jpegdump\* -o -name dcdirdmp\* -o -name dcdump\* -o -name dcentvfy\* -o -name dcfile\* -o -name dchist\* -o -name dciodvfy\* -o -name dckey\* -o -name dcsort\* -o -name dcsrdump\* -o -name dcstats\* -o -name dctable\* \) -print | xargs rm; \
+	find $(CURDIR)/debian/dicom3tools/usr/bin -type f -not \( $(DCLIST) \) -print | xargs rm;
+	find $(CURDIR)/debian/dicom3tools/usr/share/man -type f -not \( $(DCLIST) \) -print | xargs rm;
 	# Remove all static lib
 	rm -rf $(CURDIR)/debian/dicom3tools/usr/lib