[med-svn] r7885 - in trunk/packages/amide/trunk/debian: . patches
Dominique Belhachemi
domibel at alioth.debian.org
Tue Sep 20 01:55:00 UTC 2011
Author: domibel
Date: 2011-09-20 01:54:59 +0000 (Tue, 20 Sep 2011)
New Revision: 7885
Modified:
trunk/packages/amide/trunk/debian/changelog
trunk/packages/amide/trunk/debian/control
trunk/packages/amide/trunk/debian/deletable.files
trunk/packages/amide/trunk/debian/patches/10_all.diff
trunk/packages/amide/trunk/debian/rules
trunk/packages/amide/trunk/debian/watch
Log:
* New upstream release
* update watch file to scan 1.x branch
* fix vcs field
Modified: trunk/packages/amide/trunk/debian/changelog
===================================================================
--- trunk/packages/amide/trunk/debian/changelog 2011-09-19 20:06:47 UTC (rev 7884)
+++ trunk/packages/amide/trunk/debian/changelog 2011-09-20 01:54:59 UTC (rev 7885)
@@ -1,3 +1,11 @@
+amide (1.0.0-1) unstable; urgency=low
+
+ * New upstream release
+ * update watch file to scan 1.x branch
+ * fix vcs field
+
+ -- Dominique Belhachemi <domibel at debian.org> Sat, 17 Sep 2011 21:07:29 -0400
+
amide (0.9.3-1) unstable; urgency=low
* New upstream version
Modified: trunk/packages/amide/trunk/debian/control
===================================================================
--- trunk/packages/amide/trunk/debian/control 2011-09-19 20:06:47 UTC (rev 7884)
+++ trunk/packages/amide/trunk/debian/control 2011-09-20 01:54:59 UTC (rev 7885)
@@ -2,16 +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>,
- Andreas Tille <tille at debian.org>
+Uploaders: Dominique Belhachemi <domibel at debian.org>, Andreas Tille <tille at debian.org>
DM-Upload-Allowed: yes
Build-Depends: gnome-doc-utils, gtk-doc-tools, libtool, automake, intltool,
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, 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
+Standards-Version: 3.9.2
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/amide/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/amide/trunk/
Homepage: http://amide.sourceforge.net/
Modified: trunk/packages/amide/trunk/debian/deletable.files
===================================================================
--- trunk/packages/amide/trunk/debian/deletable.files 2011-09-19 20:06:47 UTC (rev 7884)
+++ trunk/packages/amide/trunk/debian/deletable.files 2011-09-20 01:54:59 UTC (rev 7885)
@@ -1,77 +1,77 @@
mkinstalldirs
+pixmaps/compartmental_models.fig.bak
pixmaps/icons.fig.bak
-pixmaps/compartmental_models.fig.bak
-doc/reference/tmpl/amitk_line_profile.sgml.bak
-doc/reference/tmpl/amide_gnome.sgml.bak
-doc/reference/tmpl/amitk_canvas.sgml.bak
-doc/reference/tmpl/amitk_threshold.sgml.bak
-doc/reference/tmpl/amitk_data_set_USHORT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_DOUBLE_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_SSHORT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_SBYTE_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_tree_view.sgml.bak
-doc/reference/tmpl/amitk_data_set_DOUBLE_2D_SCALING.sgml.bak
doc/reference/tmpl/amitk_progress_dialog.sgml.bak
-doc/reference/tmpl/tb_math.sgml.bak
-doc/reference/tmpl/amitk_raw_data.sgml.bak
-doc/reference/tmpl/amitk_raw_data_USHORT.sgml.bak
+doc/reference/tmpl/amitk_roi_ISOCONTOUR_2D.sgml.bak
+doc/reference/tmpl/amitk_object_dialog.sgml.bak
+doc/reference/tmpl/amitk_canvas_object.sgml.bak
doc/reference/tmpl/amitk_raw_data_FLOAT.sgml.bak
-doc/reference/tmpl/amitk_data_set_UBYTE_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_tree_view.sgml.bak
+doc/reference/tmpl/amitk_common.sgml.bak
+doc/reference/tmpl/amitk_space.sgml.bak
+doc/reference/tmpl/amitk_color_table_menu.sgml.bak
+doc/reference/tmpl/amitk_raw_data_variable_type.sgml.bak
doc/reference/tmpl/amitk_data_set_SBYTE_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_filter.sgml.bak
+doc/reference/tmpl/tb_math.sgml.bak
+doc/reference/tmpl/amitk_data_set_UINT_1D_SCALING.sgml.bak
+doc/reference/tmpl/amide.sgml.bak
+doc/reference/tmpl/amitk_roi_FREEHAND_3D.sgml.bak
doc/reference/tmpl/amitk_data_set_USHORT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_point.sgml.bak
-doc/reference/tmpl/amitk-unused.sgml.bak
-doc/reference/tmpl/amitk_raw_data_SSHORT.sgml.bak
-doc/reference/tmpl/amitk_data_set_UINT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_roi_variable_type.sgml.bak
-doc/reference/tmpl/amitk_data_set_SSHORT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_preferences.sgml.bak
doc/reference/tmpl/amitk_data_set_variable_type.sgml.bak
-doc/reference/tmpl/amitk_data_set_SINT_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_fiducial_mark.sgml.bak
-doc/reference/tmpl/amitk_data_set_SINT_1D_SCALING.sgml.bak
doc/reference/tmpl/amitk_roi_BOX.sgml.bak
-doc/reference/tmpl/amitk_common.sgml.bak
-doc/reference/tmpl/amitk_data_set_UBYTE_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_roi_CYLINDER.sgml.bak
-doc/reference/tmpl/amitk_object_dialog.sgml.bak
-doc/reference/tmpl/amitk_raw_data_variable_type.sgml.bak
-doc/reference/tmpl/amitk_data_set_UINT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_roi_ISOCONTOUR_3D.sgml.bak
-doc/reference/tmpl/amitk_data_set_FLOAT_2D_SCALING.sgml.bak
doc/reference/tmpl/amitk_color_table.sgml.bak
-doc/reference/tmpl/amitk_roi_FREEHAND_3D.sgml.bak
-doc/reference/tmpl/amitk_data_set.sgml.bak
-doc/reference/tmpl/amitk_data_set_SSHORT_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_UINT_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_line_profile.sgml.bak
+doc/reference/tmpl/amitk_data_set_USHORT_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_DOUBLE_1D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_DOUBLE_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_roi.sgml.bak
+doc/reference/tmpl/amitk_roi_ELLIPSOID.sgml.bak
doc/reference/tmpl/tb_export_data_set.sgml.bak
+doc/reference/tmpl/amitk_data_set_SSHORT_1D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_roi_CYLINDER.sgml.bak
+doc/reference/tmpl/amitk_data_set_FLOAT_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_raw_data_UINT.sgml.bak
+doc/reference/tmpl/amitk_data_set_UBYTE_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_raw_data_SSHORT.sgml.bak
+doc/reference/tmpl/amitk_raw_data_DOUBLE.sgml.bak
+doc/reference/tmpl/amitk_data_set_SINT_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_window_edit.sgml.bak
+doc/reference/tmpl/amitk_fiducial_mark.sgml.bak
doc/reference/tmpl/amitk_study.sgml.bak
+doc/reference/tmpl/amitk_raw_data.sgml.bak
+doc/reference/tmpl/amitk_data_set_SSHORT_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_SBYTE_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_point.sgml.bak
+doc/reference/tmpl/amitk-unused.sgml.bak
+doc/reference/tmpl/amitk_raw_data_UBYTE.sgml.bak
+doc/reference/tmpl/amitk_raw_data_SBYTE.sgml.bak
doc/reference/tmpl/stamp-amitk_type_builtins.sgml.bak
-doc/reference/tmpl/amitk_data_set_FLOAT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_canvas_object.sgml.bak
-doc/reference/tmpl/amitk_type.sgml.bak
-doc/reference/tmpl/amitk_data_set_FLOAT_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_raw_data_DOUBLE.sgml.bak
+doc/reference/tmpl/amitk_threshold.sgml.bak
+doc/reference/tmpl/amitk_roi_ISOCONTOUR_3D.sgml.bak
+doc/reference/tmpl/amitk_roi_FREEHAND_2D.sgml.bak
+doc/reference/tmpl/amitk_volume.sgml.bak
+doc/reference/tmpl/amitk_preferences.sgml.bak
+doc/reference/tmpl/amitk_data_set_SSHORT_0D_SCALING.sgml.bak
doc/reference/tmpl/amitk_space_edit.sgml.bak
-doc/reference/tmpl/amitk_raw_data_UINT.sgml.bak
-doc/reference/tmpl/amide.sgml.bak
-doc/reference/tmpl/amitk_roi_ELLIPSOID.sgml.bak
-doc/reference/tmpl/amitk_raw_data_UBYTE.sgml.bak
+doc/reference/tmpl/amitk_data_set_SINT_1D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_raw_data_USHORT.sgml.bak
+doc/reference/tmpl/amitk_data_set_SINT_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_UBYTE_1D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_UBYTE_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_DOUBLE_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_FLOAT_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_object.sgml.bak
+doc/reference/tmpl/amitk_data_set_SBYTE_2D_SCALING.sgml.bak
doc/reference/tmpl/amitk_type_builtins.sgml.bak
-doc/reference/tmpl/amitk_data_set_UBYTE_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_color_table_menu.sgml.bak
-doc/reference/tmpl/amitk_space.sgml.bak
+doc/reference/tmpl/amitk_data_set.sgml.bak
+doc/reference/tmpl/amitk_roi_variable_type.sgml.bak
doc/reference/tmpl/amitk_marshal.sgml.bak
-doc/reference/tmpl/amitk_roi_FREEHAND_2D.sgml.bak
-doc/reference/tmpl/amitk_data_set_USHORT_0D_SCALING.sgml.bak
+doc/reference/tmpl/amide_gnome.sgml.bak
+doc/reference/tmpl/amitk_data_set_UINT_0D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_filter.sgml.bak
+doc/reference/tmpl/amitk_canvas.sgml.bak
doc/reference/tmpl/amitk_raw_data_SINT.sgml.bak
-doc/reference/tmpl/amitk_roi.sgml.bak
-doc/reference/tmpl/amitk_raw_data_SBYTE.sgml.bak
-doc/reference/tmpl/amitk_data_set_SINT_0D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_data_set_SBYTE_2D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_object.sgml.bak
-doc/reference/tmpl/amitk_window_edit.sgml.bak
-doc/reference/tmpl/amitk_data_set_DOUBLE_1D_SCALING.sgml.bak
-doc/reference/tmpl/amitk_roi_ISOCONTOUR_2D.sgml.bak
-doc/reference/tmpl/amitk_volume.sgml.bak
-doc/reference/tmpl/amitk_data_set_UINT_2D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_data_set_FLOAT_1D_SCALING.sgml.bak
+doc/reference/tmpl/amitk_type.sgml.bak
+doc/reference/tmpl/amitk_data_set_USHORT_2D_SCALING.sgml.bak
Modified: trunk/packages/amide/trunk/debian/patches/10_all.diff
===================================================================
--- trunk/packages/amide/trunk/debian/patches/10_all.diff 2011-09-19 20:06:47 UTC (rev 7884)
+++ trunk/packages/amide/trunk/debian/patches/10_all.diff 2011-09-20 01:54:59 UTC (rev 7885)
@@ -1,54 +1,6 @@
---- 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
---- 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
---- amide-0.9.3.orig/src/Makefile.am
-+++ amide-0.9.3/src/Makefile.am
-@@ -23,13 +23,11 @@
- $(GSL_CFLAGS) \
- $(LIBFAME_CFLAGS) \
- $(AMIDE_GTK_CFLAGS) \
-- $(AMIDE_DEBUG_CFLAGS) \
- $(AMIDE_CHECK_OBSOLETE_CFLAGS) \
- $(AMIDE_LIBDCMDATA_CFLAGS) \
-- -I/usr/local/include \
- $(XMEDCON_CFLAGS) \
-- $(FFMPEG_CFLAGS)
--
-+ $(LIBAVCODEC_CFLAGS) \
-+ -DG_DISABLE_DEPRECATED
-
-
- ## c++ gets the same includes
-@@ -41,12 +39,11 @@
- # to be behind the DCMTK stuff
- amide_LDADD = \
- $(GSL_LIBS) \
-- $(LIBFAME_LIBS) \
- $(AMIDE_LIBECAT_LIBS) \
- $(AMIDE_LIBVOLPACK_LIBS) \
- $(AMIDE_GTK_LIBS) \
- $(XMEDCON_LIBS) \
-- $(FFMPEG_LIBS) \
-+ $(LIBAVCODEC_LIBS) \
- $(AMIDE_LIBDCMDATA_LIBS) \
- $(AMIDE_LDADD_WIN32)
-
---- amide-0.9.3.orig/configure.in
-+++ amide-0.9.3/configure.in
-@@ -69,7 +69,7 @@
+--- amide-1.0.0.orig/configure.in
++++ amide-1.0.0/configure.in
+@@ -69,7 +69,7 @@ if test $CC = "gcc"; then
read continue_with_bad_gcc
if test $continue_with_bad_gcc = "y"; then
echo "removing optimizations to reduce potential of compiler error"
@@ -57,7 +9,7 @@
else
exit 1
fi
-@@ -92,8 +92,8 @@
+@@ -92,8 +92,8 @@ fi
dnl check for various libraries and programs that we might need
AM_PATH_GSL(1.1.1, FOUND_LIBGSL=yes, FOUND_LIBGSL=no)
@@ -68,18 +20,18 @@
AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=yes, FOUND_XMEDCON=no)
-@@ -101,8 +101,8 @@
+@@ -101,8 +101,8 @@ AM_PATH_XMEDCON(0.10.0, FOUND_XMEDCON=ye
dnl switch to C++ for DCMTK library stuff - also, if pthread is on the platform, probably need that
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="")
--AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -ldcmdata -lofstd -loflog -lz $THREAD_LIBS"
+-AMIDE_LIBDCMDATA_LIBS="-L/usr/local/dicom/lib -L/usr/lib64/dcmtk -L/usr/lib/dcmtk -ldcmdata -loflog -lofstd -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 @@
+@@ -249,7 +249,7 @@ if (test $enable_libmdc = yes) && (test
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
@@ -88,10 +40,57 @@
AC_SUBST(XMEDCON_LIBS)
else
echo "compiling without xmedcon/libmdc file support"
-@@ -455,6 +455,3 @@
+@@ -455,6 +455,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
+@@ -23,12 +23,11 @@ AM_CFLAGS = \
+ $(GSL_CFLAGS) \
+ $(LIBFAME_CFLAGS) \
+ $(AMIDE_GTK_CFLAGS) \
+- $(AMIDE_DEBUG_CFLAGS) \
+ $(AMIDE_CHECK_OBSOLETE_CFLAGS) \
+ $(AMIDE_LIBDCMDATA_CFLAGS) \
+- -I/usr/local/include \
+ $(XMEDCON_CFLAGS) \
+- $(FFMPEG_CFLAGS)
++ $(LIBAVCODEC_CFLAGS) \
++ -DG_DISABLE_DEPRECATED
+
+
+
+@@ -41,12 +40,11 @@ bin_PROGRAMS = amide
+ # to be behind the DCMTK stuff
+ amide_LDADD = \
+ $(GSL_LIBS) \
+- $(LIBFAME_LIBS) \
+ $(AMIDE_LIBECAT_LIBS) \
+ $(AMIDE_LIBVOLPACK_LIBS) \
+ $(AMIDE_GTK_LIBS) \
+ $(XMEDCON_LIBS) \
+- $(FFMPEG_LIBS) \
++ $(LIBAVCODEC_LIBS) \
+ $(AMIDE_LIBDCMDATA_LIBS) \
+ $(AMIDE_LDADD_WIN32)
+
+--- amide-1.0.0.orig/etc/amide.desktop.in
++++ amide-1.0.0/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
Modified: trunk/packages/amide/trunk/debian/rules
===================================================================
--- trunk/packages/amide/trunk/debian/rules 2011-09-19 20:06:47 UTC (rev 7884)
+++ trunk/packages/amide/trunk/debian/rules 2011-09-20 01:54:59 UTC (rev 7885)
@@ -88,8 +88,10 @@
find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
+ find -name Makefile.in | xargs rm -f
+ - rm configure ltmain.sh aclocal.m4 m4/intltool.m4 m4/libtool.m4 po/Makefile.in.in
+ - rm config.log intltool-merge.in intltool-extract.in intltool-update.in
-
# Fix permissions
if [ -r debian/executable.files ] ; then \
find -type d -print0 | xargs -0 -r chmod 755 ;\
@@ -109,6 +111,7 @@
install: build
dh_testdir
dh_testroot
+ dh_clean
dh_prep
dh_installdirs
Modified: trunk/packages/amide/trunk/debian/watch
===================================================================
--- trunk/packages/amide/trunk/debian/watch 2011-09-19 20:06:47 UTC (rev 7884)
+++ trunk/packages/amide/trunk/debian/watch 2011-09-20 01:54:59 UTC (rev 7885)
@@ -1,9 +1,6 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
# See uscan(1) for format
# Compulsory line, this is a version 3 file
version=3
-http://sf.net/amide/amide-(0.*)\.tgz
+http://sf.net/amide/amide-(1.*)\.tgz
More information about the debian-med-commit
mailing list