[med-svn] r11569 - trunk/packages/conquest-dicom-server/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2012-07-05 10:37:50 +0000 (Thu, 05 Jul 2012)
New Revision: 11569

Modified:
   trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source
   trunk/packages/conquest-dicom-server/trunk/debian/rules
Log:
Cleanup orig from pdf/zip. Fix remainings lintian warnings

Modified: trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source	2012-07-05 10:33:03 UTC (rev 11568)
+++ trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source	2012-07-05 10:37:50 UTC (rev 11569)
@@ -32,7 +32,11 @@
 
 # no real source:
 rm ${FOLDER}/*.pdf
+rm ${FOLDER}/jasper-1.900.1-6ct/doc/*.pdf
 
+# zip file:
+rm ${FOLDER}/jpeg-6c/jpeg-6c-changesmvh2.zip
+
 # make distclean
 (cd ${FOLDER}/jasper-1.900.1-6ct && make distclean)
 (cd ${FOLDER}/jpeg-6c && make distclean)

Modified: trunk/packages/conquest-dicom-server/trunk/debian/rules
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 10:33:03 UTC (rev 11568)
+++ trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 10:37:50 UTC (rev 11569)
@@ -21,7 +21,6 @@
 	g++ $(CPPFLAGS) $(CXXFLAGS) -Ijasper-1.900.1-6ct/src/libjasper/include -Ijpeg-6c -I/usr/include/lua5.1 -DUNIX -DNATIVE_ENDIAN=1 -DHAVE_LIBJASPER -DHAVE_LIBJPEG -DUSESQLITE -Wno-write-strings total.cpp -o dgate -lpthread -llua5.1 -lsqlite3 jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a -Wno-multichar $(LDFLAGS)
 
 override_dh_auto_build: dgate
-	#cp dicom.ini dicom.ini.bak
 	cp dicom.ini.sqlite dicom.ini
 	cp dicom.sql.sqlite dicom.sql
 
@@ -44,10 +43,14 @@
 	dh_auto_clean --sourcedirectory=jpeg-6c
 
 override_dh_clean:
+	-rm dgate
 	dh_clean dicom.ini
 	dh_clean dicom.sql
-	#mv dicom.ini.bak dicom.ini
-	-rm dgate
+	# autoreconf ?
+	dh_clean jasper-1.900.1-6ct/config.log
+	dh_clean jasper-1.900.1-6ct/config.status
+	dh_clean jpeg-6c/config.log
+	dh_clean jpeg-6c/config.status
 
 get-orig-source:
 	./debian/get-orig-source