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

[Mathieu Malaterre]

Author: malat
Date: 2012-07-05 10:33:03 +0000 (Thu, 05 Jul 2012)
New Revision: 11568

Modified:
   trunk/packages/conquest-dicom-server/trunk/debian/control
   trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source
   trunk/packages/conquest-dicom-server/trunk/debian/rules
Log:
Need to fix the autoreconf stuff

Modified: trunk/packages/conquest-dicom-server/trunk/debian/control
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/control	2012-07-05 10:18:23 UTC (rev 11567)
+++ trunk/packages/conquest-dicom-server/trunk/debian/control	2012-07-05 10:33:03 UTC (rev 11568)
@@ -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, autotools-dev
+Build-Depends: debhelper (>= 9), liblua5.1-dev, libsqlite3-dev, autotools-dev, dh-autoreconf
 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/

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:18:23 UTC (rev 11567)
+++ trunk/packages/conquest-dicom-server/trunk/debian/get-orig-source	2012-07-05 10:33:03 UTC (rev 11568)
@@ -33,6 +33,10 @@
 # no real source:
 rm ${FOLDER}/*.pdf
 
+# make distclean
+(cd ${FOLDER}/jasper-1.900.1-6ct && make distclean)
+(cd ${FOLDER}/jpeg-6c && make distclean)
+
 GZIP="--best --no-name" tar cvfz ${TARFILE} ${FOLDER} 
 rm -rf ${FOLDER}
 rm ${UPSTREAM}

Modified: trunk/packages/conquest-dicom-server/trunk/debian/rules
===================================================================
--- trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 10:18:23 UTC (rev 11567)
+++ trunk/packages/conquest-dicom-server/trunk/debian/rules	2012-07-05 10:33:03 UTC (rev 11568)
@@ -5,6 +5,8 @@
 	dh $@ --with autotools_dev
 
 override_dh_auto_configure:
+	# see bug #673254
+	#dh_autoreconf --sourcedirectory=jasper-1.900.1-6ct -- -i --force
 	(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
@@ -37,6 +39,7 @@
 	dh_install debian/dgate.load etc/apache2/mods-available
 
 override_dh_auto_clean:
+	#dh_autoreconf_clean --sourcedirectory=jasper-1.900.1-6ct
 	dh_auto_clean --sourcedirectory=jasper-1.900.1-6ct
 	dh_auto_clean --sourcedirectory=jpeg-6c