[med-svn] [conquest-dicom-server] 13/30: Need to fix the autoreconf stuff

[Pablo Lorenzzoni]

This is an automated email from the git hooks/post-receive script.

spectra pushed a commit to branch master
in repository conquest-dicom-server.

commit 5a0507e87471fc5f9d6d24619fe1aa4af12690cf
Author: Mathieu Malaterre <malat at debian.org>
Date:   Thu Jul 5 10:33:03 2012 +0000

    Need to fix the autoreconf stuff
    
    git-svn-id: svn+ssh://svn.debian.org/svn/debian-med/trunk/packages/conquest-dicom-server/trunk@11568 d8681a01-af0d-0410-a158-b4166a59cfaa
---
 debian/control         | 2 +-
 debian/get-orig-source | 4 ++++
 debian/rules           | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 746759f..e65d710 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 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/
diff --git a/debian/get-orig-source b/debian/get-orig-source
index ebc3465..b3ac329 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -33,6 +33,10 @@ rm ${FOLDER}/ActiveFormProj1.ocx
 # 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}
diff --git a/debian/rules b/debian/rules
index 9a6de27..8dcad2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ override_dh_install:
 	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
 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git