[med-svn] r6378 - in trunk/packages/amide/trunk/debian: . patches source
Andreas Tille
tille at alioth.debian.org
Thu Mar 24 15:09:20 UTC 2011
Author: tille
Date: 2011-03-24 15:09:19 +0000 (Thu, 24 Mar 2011)
New Revision: 6378
Added:
trunk/packages/amide/trunk/debian/source/
trunk/packages/amide/trunk/debian/source/format
Removed:
trunk/packages/amide/trunk/debian/get-orig-source
trunk/packages/amide/trunk/debian/patches/20_fix_add_needed.diff
Modified:
trunk/packages/amide/trunk/debian/changelog
trunk/packages/amide/trunk/debian/compat
trunk/packages/amide/trunk/debian/control
trunk/packages/amide/trunk/debian/patches/10_all.diff
trunk/packages/amide/trunk/debian/patches/series
trunk/packages/amide/trunk/debian/rules
Log:
New upstream version and changes of patchset according to this version, added myself to Uploaders, removed unneeded get-orig-source, Bumped Standards-Version and Dephelper compat level
Modified: trunk/packages/amide/trunk/debian/changelog
===================================================================
--- trunk/packages/amide/trunk/debian/changelog 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/changelog 2011-03-24 15:09:19 UTC (rev 6378)
@@ -1,3 +1,21 @@
+amide (0.9.3-1) unstable; urgency=low
+
+ * New upstream version
+ * Removed debian/get-orig-source which is not needed because
+ uscan works perfectly and thus use uscan in debian/rules
+ * debian/control:
+ - Standards-Version: 3.9.1 (no changes needed)
+ - Debhelper 8
+ - Build-Depends: libdcmtk2-dev (instead of libdcmtk1-dev)
+ * debian/source/format: 3.0 (quilt)
+ * debian/rules: Deleted some useless comments
+ * debian/patches/20_fix_add_needed.diff: Removed because applied
+ upstream
+ * debian/patches/10_all.diff: Make sure -lavcodec and -lavutil
+ is propagated to the linker
+
+ -- Andreas Tille <tille at debian.org> Thu, 24 Mar 2011 15:02:45 +0100
+
amide (0.9.2-1.1) unstable; urgency=low
* Non-maintainer upload.
Modified: trunk/packages/amide/trunk/debian/compat
===================================================================
--- trunk/packages/amide/trunk/debian/compat 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/compat 2011-03-24 15:09:19 UTC (rev 6378)
@@ -1 +1 @@
-7
+8
Modified: trunk/packages/amide/trunk/debian/control
===================================================================
--- trunk/packages/amide/trunk/debian/control 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/control 2011-03-24 15:09:19 UTC (rev 6378)
@@ -2,14 +2,15 @@
Section: graphics
Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
+Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>,
+ Andreas Tille <tille at debian.org>
DM-Upload-Allowed: yes
Build-Depends: gnome-doc-utils, gtk-doc-tools, libtool, automake, intltool,
- quilt, debhelper (>= 7), autotools-dev, scrollkeeper, libxml-parser-perl, m4,
+ quilt, debhelper (>= 8), autotools-dev, scrollkeeper, libxml-parser-perl, m4,
pkg-config, libgtk2.0-dev, libxml2-dev, libgnomecanvas2-dev,
- libgnomeui-dev, libgsl0-dev, libmdc2-dev, libdcmtk1-dev, libvolpack1-dev,
- libavcodec-dev
-Standards-Version: 3.8.3
+ libgnomeui-dev, libgsl0-dev, libmdc2-dev, libdcmtk2-dev, libvolpack1-dev,
+ libavcodec-dev, libavformat-dev
+Standards-Version: 3.9.1
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/amide/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/amide/trunk/
Homepage: http://amide.sourceforge.net/
Deleted: trunk/packages/amide/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/amide/trunk/debian/get-orig-source 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/get-orig-source 2011-03-24 15:09:19 UTC (rev 6378)
@@ -1,4 +0,0 @@
-PACKAGE=amide
-
-wget -c http://downloads.sourceforge.net/project/amide/amide/0.9.2/amide-0.9.2.tgz?use_mirror=cdnetworks-us-2
-cp amide-0.9.2.tgz amide_0.9.2.orig.tar.gz
Modified: trunk/packages/amide/trunk/debian/patches/10_all.diff
===================================================================
--- trunk/packages/amide/trunk/debian/patches/10_all.diff 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/patches/10_all.diff 2011-03-24 15:09:19 UTC (rev 6378)
@@ -1,53 +1,21 @@
-Index: amide-0.9.2/etc/amide.desktop.in
-===================================================================
---- amide-0.9.2.orig/etc/amide.desktop.in 2009-12-20 15:28:21.000000000 -0500
-+++ amide-0.9.2/etc/amide.desktop.in 2009-12-20 15:33:46.000000000 -0500
+--- amide-0.9.3.orig/etc/amide.desktop.in
++++ amide-0.9.3/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
-Index: amide-0.9.2/src/mpeg_encode.c
-===================================================================
---- amide-0.9.2.orig/src/mpeg_encode.c 2009-12-20 15:28:21.000000000 -0500
-+++ amide-0.9.2/src/mpeg_encode.c 2009-12-20 15:33:46.000000000 -0500
-@@ -141,7 +141,7 @@
- /* -------------------------------------------------------- */
- #ifdef AMIDE_FFMPEG_SUPPORT
-
--#include <ffmpeg/libavcodec/avcodec.h>
-+#include <libavcodec/avcodec.h>
-
-
- typedef struct {
-Index: amide-0.9.2/src/ui_common.c
-===================================================================
---- amide-0.9.2.orig/src/ui_common.c 2009-12-20 15:28:21.000000000 -0500
-+++ amide-0.9.2/src/ui_common.c 2009-12-20 15:33:46.000000000 -0500
-@@ -46,7 +46,7 @@
- #include <medcon.h>
- #endif
- #ifdef AMIDE_FFMPEG_SUPPORT
--#include <ffmpeg/libavcodec/avcodec.h>
-+#include <libavcodec/avcodec.h>
- #endif
- #ifdef AMIDE_LIBFAME_SUPPORT
- #include <fame_version.h>
-Index: amide-0.9.2/Makefile.am
-===================================================================
---- amide-0.9.2.orig/Makefile.am 2009-12-20 15:28:21.000000000 -0500
-+++ amide-0.9.2/Makefile.am 2009-12-20 15:33:46.000000000 -0500
+--- amide-0.9.3.orig/Makefile.am
++++ amide-0.9.3/Makefile.am
@@ -1,5 +1,4 @@
ACLOCAL_AMFLAGS = \
- -I /usr/local/share/aclocal \
-I m4
if DISABLE_DOC
-Index: amide-0.9.2/src/Makefile.am
-===================================================================
---- amide-0.9.2.orig/src/Makefile.am 2009-12-20 15:28:21.000000000 -0500
-+++ amide-0.9.2/src/Makefile.am 2009-12-20 15:35:20.000000000 -0500
+--- amide-0.9.3.orig/src/Makefile.am
++++ amide-0.9.3/src/Makefile.am
@@ -23,13 +23,11 @@
$(GSL_CFLAGS) \
$(LIBFAME_CFLAGS) \
@@ -78,25 +46,9 @@
$(AMIDE_LIBDCMDATA_LIBS) \
$(AMIDE_LDADD_WIN32)
-Index: amide-0.9.2/configure.in
-===================================================================
---- amide-0.9.2.orig/configure.in 2009-12-20 15:28:21.000000000 -0500
-+++ amide-0.9.2/configure.in 2009-12-20 15:35:30.000000000 -0500
-@@ -43,10 +43,10 @@
- dnl also, need the -headerpad_max_install_name to allow switching
- dnl the library paths with strings that have longer lengths
- case "$host_os" in
--darwin*) CFLAGS="-g -O2 -Wall"
-+darwin*) CFLAGS="-O2 -Wall"
- LDFLAGS="-headerpad_max_install_names";;
--*) CFLAGS="-g -O6 -Wall"
-- CXXFLAGS="-g -O6 -Wall";;
-+*) CFLAGS="-O6 -Wall"
-+ CXXFLAGS="-O6 -Wall";;
- esac
-
- if test $CC = "gcc"; then
-@@ -63,7 +63,7 @@
+--- amide-0.9.3.orig/configure.in
++++ amide-0.9.3/configure.in
+@@ -69,7 +69,7 @@
read continue_with_bad_gcc
if test $continue_with_bad_gcc = "y"; then
echo "removing optimizations to reduce potential of compiler error"
@@ -105,7 +57,7 @@
else
exit 1
fi
-@@ -86,14 +86,14 @@
+@@ -92,8 +92,8 @@
dnl check for various libraries and programs that we might need
AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
@@ -115,15 +67,19 @@
+AC_CHECK_LIB(volpack, vpGetErrorString, FOUND_VOLPACK=yes, FOUND_VOLPACK=no, -lm)
AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
+
+@@ -101,8 +101,8 @@
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
- AC_LANG_CPLUSPLUS
+ dnl autoconf doesn't have a nice macro for checking for c++ libraries, therefore the below:
AC_CHECK_LIB(pthread, pthread_mutex_init, THREAD_LIBS="-lpthread", THREAD_LIBS="")
--AC_CHECK_LIB(dcmdata, main, FOUND_DCMDATA=yes, FOUND_DCMDATA=no, -lofstd -lz -L/usr/local/dicom/lib -L/sw/lib $THREAD_LIBS)
-+AC_CHECK_LIB(dcmdata, main, FOUND_DCMDATA=yes, FOUND_DCMDATA=no, -lofstd -lz $THREAD_LIBS)
-
- dnl trying to phase out libfame use in favor of ffmpeg
- PKG_CHECK_MODULES(FFMPEG, libavcodec >= 51.45.0, FOUND_FFMPEG=yes, FOUND_FFMPEG=no);
-@@ -193,7 +193,7 @@
+-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -ldcmdata -lofstd -loflog -lz $THREAD_LIBS"
+-AMIDE_LIBDCMDATA_CFLAGS="-I/usr/local/dicom/include"
++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}"
+@@ -249,7 +249,7 @@
AC_DEFINE(AMIDE_LIBMDC_SUPPORT, 1, Define to compile with (X)MedCon)
dnl 2007.10.28 - new xmedcon's should be using glib2/gtk2, dont' have to overwrite XMEDCON_LIBS
@@ -131,64 +87,8 @@
+ dnl XMEDCON_LIBS="-lmdc"
AC_SUBST(XMEDCON_LIBS)
else
- echo "Compiling without xmedcon/libmdc file support"
-@@ -224,29 +224,27 @@
- enable_ffmpeg="$enableval",
- enable_ffmpeg=yes)
-
-+ PKG_CHECK_MODULES(LIBAVCODEC, libavcodec)
-+# PKG_CHECK_MODULES(LIBAVFORMAT, libavformat)
-+# PKG_CHECK_MODULES(LIBSWSCALE, libswscale)
-+# PKG_CHECK_MODULES(LIBAVUTIL, libavutil)
-+
-+ AC_SUBST(LIBAVCODEC_LIBS)
-+ AC_SUBST(LIBAVCODEC_CFLAGS)
-+# AC_SUBST(LIBAVFORMAT_LIBS)
-+# AC_SUBST(LIBAVFORMAT_CFLAGS)
-+# AC_SUBST(LIBSWSCALE_LIBS)
-+# AC_SUBST(LIBSWSCALE_CFLAGS)
-+# AC_SUBST(LIBAVUTIL_LIBS)
-+# AC_SUBST(LIBAVUTIL_CFLAGS)
-+
- if (test $enable_ffmpeg = yes) && (test $FOUND_FFMPEG = yes); then
- echo "Compiling with ffmpeg (libavcodec) mpeg encoding support "
- AC_DEFINE(AMIDE_FFMPEG_SUPPORT, 1, Define to compile with ffmpeg)
- AC_SUBST(FFMPEG_LIBS)
- AC_SUBST(FFMPEG_CFLAGS)
- else
-- echo "Compiling without ffmpeg (libavcodec) mpeg encoding support"
--
-- dnl Let people compile with libfame mpeg movie generation if not using ffmpeg
-- AM_PATH_LIBFAME(0.9.1, FOUND_LIBFAME=yes, FOUND_LIBFAME=no)
-- dnl AC_CHECK_LIB(libfame, fame_init, FOUND_LIBFAME=yes, FOUND_LIBFAME=no)
-- AC_ARG_ENABLE(
-- libfame,
-- [ --enable-libfame Compile in libfame mpeg encoding support if not using ffmpeg [default=no]],
-- enable_libfame="$enableval",
-- enable_libfame=no)
--
-- if (test $enable_libfame = yes) && (test $FOUND_LIBFAME = yes); then
-- echo "Compiling with libfame mpeg encoding support "
-- AC_DEFINE(AMIDE_LIBFAME_SUPPORT, 1, Define to compile with Libfame)
-- else
-- echo "Compiling without libfame mpeg encoding support"
-- fi
-+ echo "Compiling without ffmpeg support"
- fi
-
- dnl Let people compile without the DCMTK library
-@@ -258,8 +256,8 @@
-
- if (test $enable_libdcmdata = yes) && (test $FOUND_DCMDATA = yes); then
- echo "Compiling with DCMTK support for DICOM files"
-- AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -ldcmdata -lofstd -lz $THREAD_LIBS"
-- 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"
-+ AMIDE_LIBDCMDATA_LIBS="-ldcmdata -lofstd -lz $THREAD_LIBS"
-+ AMIDE_LIBDCMDATA_CFLAGS="-I/usr/include/dcmtk/dcmdata"
- AC_SUBST(AMIDE_LIBDCMDATA_LIBS)
- AC_SUBST(AMIDE_LIBDCMDATA_CFLAGS)
- AC_DEFINE(AMIDE_LIBDCMDATA_SUPPORT, 1, Define to compile with DCMTK)
-@@ -391,6 +389,3 @@
+ echo "compiling without xmedcon/libmdc file support"
+@@ -455,6 +455,3 @@
dnl help/C/Makefile
dnl help/es/Makefile
Deleted: trunk/packages/amide/trunk/debian/patches/20_fix_add_needed.diff
===================================================================
--- trunk/packages/amide/trunk/debian/patches/20_fix_add_needed.diff 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/patches/20_fix_add_needed.diff 2011-03-24 15:09:19 UTC (rev 6378)
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -96,7 +96,7 @@ AC_CHECK_LIB(pthread, pthread_mutex_init
- AC_CHECK_LIB(dcmdata, main, FOUND_DCMDATA=yes, FOUND_DCMDATA=no, -lofstd -lz $THREAD_LIBS)
-
- dnl trying to phase out libfame use in favor of ffmpeg
--PKG_CHECK_MODULES(FFMPEG, libavcodec >= 51.45.0, FOUND_FFMPEG=yes, FOUND_FFMPEG=no);
-+PKG_CHECK_MODULES(FFMPEG, libavcodec >= 51.45.0 libavutil, FOUND_FFMPEG=yes, FOUND_FFMPEG=no);
-
- dnl Let people compile without debugging information
- AC_ARG_ENABLE(
-@@ -224,7 +224,7 @@ AC_ARG_ENABLE(
- enable_ffmpeg="$enableval",
- enable_ffmpeg=yes)
-
-- PKG_CHECK_MODULES(LIBAVCODEC, libavcodec)
-+ PKG_CHECK_MODULES(LIBAVCODEC, libavcodec libavutil)
- # PKG_CHECK_MODULES(LIBAVFORMAT, libavformat)
- # PKG_CHECK_MODULES(LIBSWSCALE, libswscale)
- # PKG_CHECK_MODULES(LIBAVUTIL, libavutil)
Modified: trunk/packages/amide/trunk/debian/patches/series
===================================================================
--- trunk/packages/amide/trunk/debian/patches/series 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/patches/series 2011-03-24 15:09:19 UTC (rev 6378)
@@ -1,2 +1 @@
10_all.diff
-20_fix_add_needed.diff
Modified: trunk/packages/amide/trunk/debian/rules
===================================================================
--- trunk/packages/amide/trunk/debian/rules 2011-03-24 14:46:38 UTC (rev 6377)
+++ trunk/packages/amide/trunk/debian/rules 2011-03-24 15:09:19 UTC (rev 6378)
@@ -35,7 +35,7 @@
endif
get-orig-source:
- /bin/sh $(CURDIR)/debian/get-orig-source
+ uscan --verbose --force-download
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
@@ -75,17 +75,7 @@
touch $@
-#config.status: patch configure
-# dh_testdir
- # Add here commands to configure the package.
- #aclocal -I macros
- #libtoolize -f -c
- #automake -f -a -c
- #autoconf -f
-# ./configure $(CONFIGURE_FLAGS)
-
-
clean: clean-patched unpatch
clean-patched:
@@ -122,7 +112,6 @@
dh_prep
dh_installdirs
- # Add here commands to install the package into debian/amide.
$(MAKE) DESTDIR=$(CURDIR)/debian/amide install
install -d debian/amide/usr/share/pixmaps
cp debian/amide_logo_small.xpm debian/amide/usr/share/pixmaps/amide_logo_small.xpm
Added: trunk/packages/amide/trunk/debian/source/format
===================================================================
--- trunk/packages/amide/trunk/debian/source/format (rev 0)
+++ trunk/packages/amide/trunk/debian/source/format 2011-03-24 15:09:19 UTC (rev 6378)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the debian-med-commit
mailing list