[med-svn] r11567 - in trunk/packages/conquest-dicom-server/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-07-05 10:18:23 +0000 (Thu, 05 Jul 2012)
New Revision: 11567

Removed:
   trunk/packages/conquest-dicom-server/trunk/debian/patches/fix_int32.patch
Modified:
   trunk/packages/conquest-dicom-server/trunk/debian/control
   trunk/packages/conquest-dicom-server/trunk/debian/patches/series
   trunk/packages/conquest-dicom-server/trunk/debian/rules
Log:
Fix d/rules clean target

Modified: trunk/packages/conquest-dicom-server/trunk/debian/control
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/control	2012-07-05 10:04:33 UTC (rev 11566)
+++ trunk/packages/conquest-dicom-server/trunk/debian/control	2012-07-05 10:18:23 UTC (rev 11567)
@@ -4,7 +4,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <malat at debian.org>
 Priority: extra
-Build-Depends: debhelper (>= 9), liblua5.1-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 9), liblua5.1-dev, libsqlite3-dev, autotools-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/conquest-dicom-server/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/conquest-dicom-server/trunk/

Deleted: trunk/packages/conquest-dicom-server/trunk/debian/patches/fix_int32.patch
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/patches/fix_int32.patch	2012-07-05 10:04:33 UTC (rev 11566)
+++ trunk/packages/conquest-dicom-server/trunk/debian/patches/fix_int32.patch	2012-07-05 10:18:23 UTC (rev 11567)
@@ -1,35 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- conquest-dicom-server (1.14.16-1) unstable; urgency=low
- .
-   * Initial release (Closes: #)
-Author: Mathieu Malaterre <malat at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- conquest-dicom-server-1.14.16.orig/cctypes.h
-+++ conquest-dicom-server-1.14.16/cctypes.h
-@@ -119,6 +119,7 @@ typedef long INT32;            /* Defaul
- #endif //HAVE_LIBJPEG
- #else //!defined(__GNUC__)
- typedef	signed		int	INT32;
-+#define XMD_H
- #endif //!defined(__GNUC__)
- #endif //_MSC_VER != 1200
- #endif //__BORLANDC__

Modified: trunk/packages/conquest-dicom-server/trunk/debian/patches/series
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/patches/series	2012-07-05 10:04:33 UTC (rev 11566)
+++ trunk/packages/conquest-dicom-server/trunk/debian/patches/series	2012-07-05 10:18:23 UTC (rev 11567)
@@ -1,2 +1 @@
-#fix_int32.patch
 debianlayout.patch

Modified: trunk/packages/conquest-dicom-server/trunk/debian/rules
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 10:04:33 UTC (rev 11566)
+++ trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 10:18:23 UTC (rev 11567)
@@ -1,23 +1,25 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
 %:
-	dh $@ --parallel
+	dh $@ --with autotools_dev
 
+override_dh_auto_configure:
+	(cd jasper-1.900.1-6ct && autoreconf -i --force)
+	dh_auto_configure --sourcedirectory=jasper-1.900.1-6ct -- --disable-libjpeg
+	dh_auto_configure --sourcedirectory=jpeg-6c
+
 jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a:
-	(cd jasper-1.900.1-6ct && ./configure --disable-libjpeg)
 	$(MAKE) -C jasper-1.900.1-6ct
 
 jpeg-6c/libjpeg.a:
-	(cd jpeg-6c && ./configure)
 	$(MAKE) -C jpeg-6c
 
 dgate: jpeg-6c/libjpeg.a jasper-1.900.1-6ct/src/libjasper/.libs/libjasper.a
 	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
 
@@ -34,14 +36,15 @@
 	dh_install debian/dgate.conf etc/apache2/mods-available
 	dh_install debian/dgate.load etc/apache2/mods-available
 
+override_dh_auto_clean:
+	dh_auto_clean --sourcedirectory=jasper-1.900.1-6ct
+	dh_auto_clean --sourcedirectory=jpeg-6c
+
 override_dh_clean:
-	(cd jpeg-6c && $(MAKE) clean)
-	-(cd jasper-1.900.1-6ct && $(MAKE) clean)
-	-rm dgate
-
-override_dh_auto_clean:
 	dh_clean dicom.ini
 	dh_clean dicom.sql
+	#mv dicom.ini.bak dicom.ini
+	-rm dgate
 
 get-orig-source:
 	./debian/get-orig-source