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 be434ec10ddc713d52cfbd7080fcddfb7e375b3b Author: Mathieu Malaterre <[email protected]> Date: Thu Jul 5 10:18:23 2012 +0000 Fix d/rules clean target git-svn-id: svn+ssh://svn.debian.org/svn/debian-med/trunk/packages/conquest-dicom-server/trunk@11567 d8681a01-af0d-0410-a158-b4166a59cfaa --- debian/control | 2 +- debian/patches/fix_int32.patch | 35 ----------------------------------- debian/patches/series | 1 - debian/rules | 23 +++++++++++++---------- 4 files changed, 14 insertions(+), 47 deletions(-) diff --git a/debian/control b/debian/control index d8ce8e2..746759f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Maintainer: Debian Med Packaging Team <[email protected]. DM-Upload-Allowed: yes Uploaders: Mathieu Malaterre <[email protected]> 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/ diff --git a/debian/patches/fix_int32.patch b/debian/patches/fix_int32.patch deleted file mode 100644 index bbbd049..0000000 --- a/debian/patches/fix_int32.patch +++ /dev/null @@ -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 <[email protected]> - ---- -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__ diff --git a/debian/patches/series b/debian/patches/series index 423ba44..bd9e7f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -#fix_int32.patch debianlayout.patch diff --git a/debian/rules b/debian/rules index e029269..9a6de27 100755 --- a/debian/rules +++ b/debian/rules @@ -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 @@ override_dh_install: dh_install debian/dgate.conf etc/apache2/mods-available dh_install debian/dgate.load etc/apache2/mods-available -override_dh_clean: - (cd jpeg-6c && $(MAKE) clean) - -(cd jasper-1.900.1-6ct && $(MAKE) clean) - -rm dgate - override_dh_auto_clean: + dh_auto_clean --sourcedirectory=jasper-1.900.1-6ct + dh_auto_clean --sourcedirectory=jpeg-6c + +override_dh_clean: dh_clean dicom.ini dh_clean dicom.sql + #mv dicom.ini.bak dicom.ini + -rm dgate get-orig-source: ./debian/get-orig-source -- Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/conquest-dicom-server.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
