Author: tille Date: 2013-08-26 12:51:14 +0000 (Mon, 26 Aug 2013) New Revision: 14529
Modified: trunk/packages/amide/trunk/debian/changelog trunk/packages/amide/trunk/debian/patches/10_all.diff Log: Adapt patch to new upstream version Modified: trunk/packages/amide/trunk/debian/changelog =================================================================== --- trunk/packages/amide/trunk/debian/changelog 2013-08-26 08:41:44 UTC (rev 14528) +++ trunk/packages/amide/trunk/debian/changelog 2013-08-26 12:51:14 UTC (rev 14529) @@ -1,3 +1,9 @@ +amide (1.0.4-1) UNRELEASED; urgency=low + + * New upstream version (adapted patch) + + -- Andreas Tille <[email protected]> Mon, 26 Aug 2013 14:53:06 +0200 + amide (1.0.1-1) unstable; urgency=low * debian/README.source: removed because it is redundant Modified: trunk/packages/amide/trunk/debian/patches/10_all.diff =================================================================== --- trunk/packages/amide/trunk/debian/patches/10_all.diff 2013-08-26 08:41:44 UTC (rev 14528) +++ trunk/packages/amide/trunk/debian/patches/10_all.diff 2013-08-26 12:51:14 UTC (rev 14529) @@ -1,5 +1,12 @@ ---- amide-1.0.0.orig/configure.in -+++ amide-1.0.0/configure.in +Author: Andreas Tille <[email protected]> +Date: Thu, 24 Mar 2011 15:02:45 +0100 +LastChanged: Mon, 26 Aug 2013 14:53:06 +0200 +Description: debian/patches/10_all.diff: Make sure -lavcodec and -lavutil + is propagated to the linker + + +--- a/configure.in ++++ b/configure.in @@ -69,7 +69,7 @@ if test $CC = "gcc"; then read continue_with_bad_gcc if test $continue_with_bad_gcc = "y"; then @@ -29,8 +36,8 @@ +AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -loflog -lavcodec -lavutil -lz $THREAD_LIBS" +AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata" dnl 2010.02.20 AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include/dcmtk/dcmdata -I/usr/local/dicom/include/dcmtk/ofstd -I/usr/local/dicom/include -I/usr/include/dcmtk/dcmdata -I/usr/local/include/dcmtk/ofstd -I/sw/include/dcmtk/dcmdata -I/sw/include/dcmtk/ofstd -I/sw/include/dcmtk" - saved_ldflags="${LDFLAGS}" - saved_cxxflags="${CXXFLAGS}" + saved_libs="${LIBS}" + LIBS="${LIBS} ${AMIDE_LIBDCMDATA_LIBS}" @@ -249,7 +249,7 @@ if (test $enable_libmdc = yes) && (test AC_DEFINE(AMIDE_LIBMDC_SUPPORT, 1, Define to compile with (X)MedCon) @@ -40,23 +47,15 @@ AC_SUBST(XMEDCON_LIBS) else echo "compiling without xmedcon/libmdc file support" -@@ -455,6 +455,3 @@ AC_OUTPUT +@@ -453,6 +453,3 @@ AC_OUTPUT dnl help/C/Makefile dnl help/es/Makefile -dnl Move the spec file so it won't get eaten by make distclean -echo "Moving SPEC file to base directory" -mv etc/amide.spec ./ ---- amide-1.0.0.orig/Makefile.am -+++ amide-1.0.0/Makefile.am -@@ -1,5 +1,4 @@ - ACLOCAL_AMFLAGS = \ -- -I /usr/local/share/aclocal \ - -I m4 - - if DISABLE_DOC ---- amide-1.0.0.orig/src/Makefile.am -+++ amide-1.0.0/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -23,12 +23,11 @@ AM_CFLAGS = \ $(GSL_CFLAGS) \ $(LIBFAME_CFLAGS) \ @@ -86,11 +85,11 @@ $(AMIDE_LIBDCMDATA_LIBS) \ $(AMIDE_LDADD_WIN32) ---- amide-1.0.0.orig/etc/amide.desktop.in -+++ amide-1.0.0/etc/amide.desktop.in +--- a/etc/amide.desktop.in ++++ b/etc/amide.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _GenericName=Medical Image Examiner _Name=Amide - _Comment=A Medical Image Data Examiner + _Comment=analysis tool for medical images _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
