[med-svn] [Git][med-team/amide][master] 14 commits: d/control: remove libxml-parser-perl from build dependencies.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Wed Aug 23 14:31:43 BST 2023
Étienne Mollier pushed to branch master at Debian Med / amide
Commits:
0a4c2896 by Étienne Mollier at 2023-08-23T13:01:57+02:00
d/control: remove libxml-parser-perl from build dependencies.
As discussed during Debian Reunion Hamburg, this is a possible
leftover from an earlier vendoring of the intltool package. Removing
it doesn't hurt, and also represents one step to crossbuildability.
Thanks: Helmut Grohne
- - - - -
78536902 by Étienne Mollier at 2023-08-23T14:11:50+02:00
d/clean: remove two leftover files.
Closes: #1044105
- - - - -
a01b6154 by Étienne Mollier at 2023-08-23T14:12:38+02:00
d/rules: copy amide.xml instead of moving it.
The file will be reusable for any subsequent clean and rebuild cycle.
Closes: #1049767
- - - - -
df140529 by Étienne Mollier at 2023-08-23T14:14:33+02:00
d/control: declare compliance to standards version 4.6.2.
- - - - -
0c465ece by Étienne Mollier at 2023-08-23T14:23:56+02:00
d/NEWS: remove: message relevant for stretch to buster upgrade.
- - - - -
c6d84387 by Étienne Mollier at 2023-08-23T14:33:26+02:00
10_Makefile.am.patch: declare forwarding not needed.
- - - - -
8a1c9aed by Étienne Mollier at 2023-08-23T14:33:46+02:00
10_configure.ac.patch: declare forwarding not needed.
- - - - -
981e2698 by Étienne Mollier at 2023-08-23T14:40:11+02:00
typos.patch: new: fix typos caught by lintian.
- - - - -
d8b94cc5 by Étienne Mollier at 2023-08-23T14:42:41+02:00
d/u/metadata: update to new upstream coordinates.
- - - - -
cc235b60 by Étienne Mollier at 2023-08-23T15:02:55+02:00
d/copyright: highlight use of GFDL-1.1 _or later_.
Also give precise references to the later GFDL versions texts on the
Debian systems, and clarify in comment that this is the "no invariant
sections" derivative license which is DFSG compatible (contrary to the
plain version).
- - - - -
e5be4f99 by Étienne Mollier at 2023-08-23T15:08:30+02:00
d/copyright: update upstream copyright year.
- - - - -
b294730d by Étienne Mollier at 2023-08-23T15:08:51+02:00
d/copyright: fix attribution of files originating from gimp.
- - - - -
b377955a by Étienne Mollier at 2023-08-23T15:11:20+02:00
d/copyright: update debian contributors.
- - - - -
032e109e by Étienne Mollier at 2023-08-23T15:30:58+02:00
ready to upload to unstable.
- - - - -
11 changed files:
- − debian/NEWS
- debian/changelog
- + debian/clean
- debian/control
- debian/copyright
- debian/patches/10_Makefile.am.patch
- debian/patches/10_configure.ac.patch
- debian/patches/series
- + debian/patches/typos.patch
- debian/rules
- debian/upstream/metadata
Changes:
=====================================
debian/NEWS deleted
=====================================
@@ -1,10 +0,0 @@
-amide (1.0.5-9) unstable; urgency=medium
-
- With this new version amide dropped support for gconf. Since
- libgconf will be removed from Debian(buster) the old
- configuration will no longer be loaded and must be manually
- converted (i.e. amide must be configured from scratch).
- The new configuration is stored in $HOME/.amiderc in INI file
- format.
-
- -- Gert Wollny <gewo at debian.org> Fri, 12 Jan 2018 10:55:43 +0100
=====================================
debian/changelog
=====================================
@@ -1,3 +1,31 @@
+amide (1.0.6-2) unstable; urgency=medium
+
+ * d/control: remove libxml-parser-perl from build dependencies.
+ As discussed during Debian Reunion Hamburg, this is a possible
+ leftover from an earlier vendoring of the intltool package. Removing
+ it doesn't hurt, and also allows crossbuildability.
+ Thanks to Helmut Grohne
+ * d/clean: remove two leftover files. (Closes: #1044105)
+ * d/rules: copy amide.xml instead of moving it.
+ The file will be reusable for any subsequent clean and rebuild cycle.
+ (Closes: #1049767)
+ * d/control: declare compliance to standards version 4.6.2.
+ * d/NEWS: remove: message relevant for stretch to buster upgrade.
+ * 10_Makefile.am.patch: declare forwarding not needed.
+ * 10_configure.ac.patch: declare forwarding not needed.
+ * typos.patch: new: fix typos caught by lintian.
+ * d/u/metadata: update to new upstream coordinates.
+ * d/copyright: highlight use of GFDL-1.1 _or later_.
+ Also give precise references to the later GFDL versions texts on the
+ Debian systems, and clarify in comment that this is the "no invariant
+ sections" derivative license which is DFSG compatible (contrary to the
+ plain version).
+ * d/copyright: update upstream copyright year.
+ * d/copyright: fix attribution of files originating from gimp.
+ * d/copyright: update debian contributors.
+
+ -- Étienne Mollier <emollier at debian.org> Wed, 23 Aug 2023 15:21:20 +0200
+
amide (1.0.6-1) unstable; urgency=medium
* New upstream, and new upstream version.
=====================================
debian/clean
=====================================
@@ -0,0 +1,2 @@
+amide-current/po/.intltool-merge-cache.lock
+amide-current/help/C/index.docbook
=====================================
debian/control
=====================================
@@ -9,7 +9,6 @@ Build-Depends: libtool,
debhelper-compat (= 13),
appstream-util,
intltool,
- libxml-parser-perl,
libgtk2.0-dev,
libxml2-dev,
libgnomecanvas2-dev,
@@ -21,7 +20,7 @@ Build-Depends: libtool,
libavformat-dev,
libavutil-dev,
yelp-tools
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/amide
Vcs-Git: https://salsa.debian.org/med-team/amide.git
Homepage: https://github.com/ferdymercury/amide/
=====================================
debian/copyright
=====================================
@@ -3,7 +3,7 @@ Source: https://github.com/ferdymercury/amide
Upstream-Name: amide
Files: *
-Copyright: Copyright (©) 2007 by Andy Loening <loening at alum.mit.edu>
+Copyright: Copyright (©) 2007-2017 by Andy Loening <loening at alum.mit.edu>
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,7 +26,9 @@ Files: amide-current/attic/amitk_xif_sel.h
amide-current/attic/amitk_xif_sel.c
amide-current/src/amitk_dial.h
amide-current/src/amitk_dial.c
-Copyright: Copyright (©) 2007 by Andy Loening <loening at alum.mit.edu>
+Copyright: Copyright (C) 1995-1997 Peter Mattis
+ Copyright (C) 1995-1997 Spencer Kimball
+ Copyright (C) 1995-1997 Josh MacDonald
License: LGPL-2+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -48,7 +50,7 @@ License: LGPL-2+
Files: amide-current/doc/reference/amitk-docs.sgml
Copyright: Copyright (©) 2007 by Andy Loening <loening at alum.mit.edu>
-License: GFDL-1.1
+License: GFDL-1.1+
Permission is granted to copy, distribute and/or modify
this document under the terms of the GNU Free
Documentation License, Version 1.1 or any later
@@ -62,10 +64,17 @@ License: GFDL-1.1
MA 02110-1301, USA.
.
On Debian systems, the complete text of the GNU Free Documentation License
- can be found in `/usr/share/common-licenses/GFDL`
+ version 1.2 can be found in `/usr/share/common-licenses/GFDL-1.2` and the
+ complete text of the GNU Free Documentation License version 1.3 can be found
+ in `/usr/share/common-licenses/GFDL-1.3`.
+Comment:
+ This is the "no invariants section" version of the license, which is dfsg
+ compliant.
Files: debian/*
Copyright: 2008, Dominique Belhachemi <domibel at cs.tu-berlin.de>
+ 2011-2022, Andreas Tille <tille at debian.org>
+ 2022-2023, Étienne Mollier <emollier at debian.org>
License: GPL-2+
The Debian packaging is licensed under the GPL-2 or any later version,
see `/usr/share/common-licenses/GPL-2'
=====================================
debian/patches/10_Makefile.am.patch
=====================================
@@ -3,7 +3,7 @@ Date: Thu, 24 Mar 2011 15:02:45 +0100
Last-Changed: Mon, 24 Feb 2014 15:30:19 +0100
Description: Make sure -lavcodec and -lavutil
is propagated to the linker
-
+Forwarded: not-needed
--- amide.orig/amide-current/src/Makefile.am
+++ amide/amide-current/src/Makefile.am
=====================================
debian/patches/10_configure.ac.patch
=====================================
@@ -2,6 +2,7 @@ Author: Andreas Tille <tille at debian.org>
Date: Thu, 24 Mar 2011 15:02:45 +0100
Last-Changed: Mon, 24 Feb 2014 15:30:19 +0100
Description: Do not try linking to non-default dirs
+Forwarded: not-needed
--- amide.orig/amide-current/configure.ac
+++ amide/amide-current/configure.ac
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@ libav10.patch
remove-autdated-gnome-macros.patch
debian-djdecode.patch
ffmpeg-5.patch
+typos.patch
=====================================
debian/patches/typos.patch
=====================================
@@ -0,0 +1,157 @@
+Description: fix typos caught by lintian.
+Author: Étienne Mollier <emollier at debian.org>
+Forwarded: no
+Last-Update: 2023-08-23
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- amide.orig/amide-current/po/zh_CN.po
++++ amide/amide-current/po/zh_CN.po
+@@ -1345,7 +1345,7 @@
+
+ #: ../src/amitk_study.c:489
+ #, c-format
+-msgid "inappropriate zoom (%5.3f) for study, reseting to 1.0"
++msgid "inappropriate zoom (%5.3f) for study, resetting to 1.0"
+ msgstr ""
+
+ #: ../src/amitk_study.c:924 ../src/amitk_study.c:1025
+@@ -1824,7 +1824,7 @@
+ #: ../src/dcmtk_interface.cc:898
+ #, c-format
+ msgid ""
+-"Detected discontinous frames in data set %s - frame start times will be "
++"Detected discontinuous frames in data set %s - frame start times will be "
+ "incorrect"
+ msgstr ""
+
+@@ -3240,7 +3240,7 @@
+ "Median filters work relatively well at preserving edges while\n"
+ "removing speckle noise.\n"
+ "\n"
+-"This filter is the 1D median filter, so the neighboorhood used for\n"
++"This filter is the 1D median filter, so the neighborhood used for\n"
+ "determining the median will be of the given kernel size, and the\n"
+ "data set will be filtered 3x (once for each direction)."
+ msgstr ""
+@@ -4644,7 +4644,7 @@
+ msgstr "计算ROI的统计信息(_R)"
+
+ #: ../src/ui_study_menus.c:296
+-msgid "caculate ROI statistics"
++msgid "calculate ROI statistics"
+ msgstr "计算ROI的统计信息"
+
+ #: ../src/ui_study_menus.c:306
+--- amide.orig/amide-current/po/zh_TW.po
++++ amide/amide-current/po/zh_TW.po
+@@ -1437,7 +1437,7 @@
+
+ #: ../src/amitk_study.c:469
+ #, c-format
+-msgid "inappropriate zoom (%5.3f) for study, reseting to 1.0"
++msgid "inappropriate zoom (%5.3f) for study, resetting to 1.0"
+ msgstr "不適當的縮放 (%5.3f) 用於檢驗，重置為 1.0"
+
+ #: ../src/amitk_study.c:907 ../src/amitk_study.c:1008
+@@ -1724,7 +1724,7 @@
+
+ #: ../src/dcmtk_interface.cc:1028
+ #, c-format
+-msgid "Detected discontinous frames in data set %s - frame start times will be incorrect"
++msgid "Detected discontinuous frames in data set %s - frame start times will be incorrect"
+ msgstr "在資料集 %s 中偵測到不連續的影格 - 影格起始時間將不正確"
+
+ #: ../src/dcmtk_interface.cc:1031
+@@ -3040,7 +3040,7 @@
+ msgid ""
+ "Median filters work relatively well at preserving edges while\n"
+ "removing speckle noise.\n\n"
+-"This filter is the 1D median filter, so the neighboorhood used for\n"
++"This filter is the 1D median filter, so the neighborhood used for\n"
+ "determining the median will be of the given kernel size, and the\n"
+ "data set will be filtered 3x (once for each direction)."
+ msgstr ""
+@@ -4516,7 +4516,7 @@
+ msgstr "計算 _ROI 統計資訊"
+
+ #: ../src/ui_study.c:387
+-msgid "caculate ROI statistics"
++msgid "calculate ROI statistics"
+ msgstr "計算 ROI 統計資訊"
+
+ #: ../src/ui_study.c:391
+--- amide.orig/amide-current/src/amitk_study.c
++++ amide/amide-current/src/amitk_study.c
+@@ -489,7 +489,7 @@
+
+ /* sanity check */
+ if (AMITK_STUDY_ZOOM(study) < EPSILON) {
+- amitk_append_str_with_newline(&error_buf,_("inappropriate zoom (%5.3f) for study, reseting to 1.0"),
++ amitk_append_str_with_newline(&error_buf,_("inappropriate zoom (%5.3f) for study, resetting to 1.0"),
+ AMITK_STUDY_ZOOM(study));
+ amitk_study_set_zoom(study, 1.0);
+ }
+--- amide.orig/amide-current/src/dcmtk_interface.cc
++++ amide/amide-current/src/dcmtk_interface.cc
+@@ -1272,7 +1272,7 @@
+ } /* i_file loop */
+
+ if (screwed_up_timing)
+- amitk_append_str_with_newline(perror_buf, _("Detected discontinous frames in data set %s - frame durations have been adjusted to remove interframe time gaps"), AMITK_OBJECT_NAME(ds));
++ amitk_append_str_with_newline(perror_buf, _("Detected discontinuous frames in data set %s - frame durations have been adjusted to remove interframe time gaps"), AMITK_OBJECT_NAME(ds));
+
+ if (screwed_up_thickness)
+ amitk_append_str_with_newline(perror_buf, _("Slice thickness (%5.3f mm) not equal to slice spacing (%5.3f mm) in data set %s - will use slice spacing for thickness"), old_thickness, true_thickness, AMITK_OBJECT_NAME(ds));
+--- amide.orig/amide-current/src/fads.c
++++ amide/amide-current/src/fads.c
+@@ -1233,7 +1233,7 @@
+ if (status == GSL_ENOPROG)
+ g_print("--- previous iteration was not making progress towards a solution ---\n");
+ else if (status == GSL_ERUNAWAY)
+- g_print("--- previous iteration ran away, reseting to last good value ---\n");
++ g_print("--- previous iteration ran away, resetting to last good value ---\n");
+ #endif
+ if (status == GSL_ERUNAWAY) {
+ /* need to recompute ec's */
+@@ -2242,7 +2242,7 @@
+ if (status == GSL_ENOPROG)
+ g_print("--- previous iteration was not making progress towards a solution ---\n");
+ else if (status == GSL_ERUNAWAY)
+- g_print("--- previous iteration ran away, reseting to last good value ---\n");
++ g_print("--- previous iteration ran away, resetting to last good value ---\n");
+ #endif
+ if (status == GSL_ERUNAWAY) {
+ /* need to recompute ec's */
+--- amide.orig/amide-current/src/legacy.c
++++ amide/amide-current/src/legacy.c
+@@ -678,7 +678,7 @@
+
+ /* sanity check */
+ if (AMITK_STUDY_ZOOM(study) < EPSILON) {
+- amitk_append_str_with_newline(perror_buf,"inappropriate zoom (%5.3f) for study, reseting to 1.0",
++ amitk_append_str_with_newline(perror_buf,"inappropriate zoom (%5.3f) for study, resetting to 1.0",
+ AMITK_STUDY_ZOOM(study));
+ amitk_study_set_zoom(study, 1.0);
+ }
+--- amide.orig/amide-current/src/tb_filter.c
++++ amide/amide-current/src/tb_filter.c
+@@ -67,7 +67,7 @@
+ N_("Median filters work relatively well at preserving edges while\n"
+ "removing speckle noise.\n"
+ "\n"
+- "This filter is the 1D median filter, so the neighboorhood used for\n"
++ "This filter is the 1D median filter, so the neighborhood used for\n"
+ "determining the median will be of the given kernel size, and the\n"
+ "data set will be filtered 3x (once for each direction).");
+
+--- amide.orig/amide-current/src/ui_study.c
++++ amide/amide-current/src/ui_study.c
+@@ -426,7 +426,7 @@
+ { "FilterWizard",NULL,N_("_Filter Active Data Set"),NULL,N_("allows you to filter the active data set"),G_CALLBACK(ui_study_cb_filter_selected)},
+ { "LineProfile",NULL,N_("Generate Line _Profile"),NULL,N_("allows generating a line profile between two fiducial marks"),G_CALLBACK(ui_study_cb_profile_selected)},
+ { "MathWizard",NULL,N_("Perform _Math on Data Set(s)"),NULL,N_("perform simple math operations on a data set or between data sets"),G_CALLBACK(ui_study_cb_data_set_math_selected)},
+- { "RoiStats",NULL,N_("Calculate _ROI Statistics"),NULL,N_("caculate ROI statistics"),G_CALLBACK(ui_study_cb_roi_statistics)},
++ { "RoiStats",NULL,N_("Calculate _ROI Statistics"),NULL,N_("calculate ROI statistics"),G_CALLBACK(ui_study_cb_roi_statistics)},
+
+ /* Flythrough Submenu */
+ #if (AMIDE_FFMPEG_SUPPORT || AMIDE_LIBFAME_SUPPORT)
=====================================
debian/rules
=====================================
@@ -7,7 +7,7 @@ export ACLOCAL = aclocal -I m4
dh $@ --no-parallel --sourcedirectory=amide-current/
override_dh_auto_configure:
- mv amide-current/help/C/amide.xml amide-current/help/C/index.docbook
+ cp -v amide-current/help/C/amide.xml amide-current/help/C/index.docbook
dh_auto_configure --sourcedirectory=amide-current/ -- \
--disable-amide-debug \
--config-cache \
=====================================
debian/upstream/metadata
=====================================
@@ -14,4 +14,7 @@ Reference:
Registry:
- Name: OMICtools
Entry: NA
-Repository: http://hg.code.sf.net/p/amide/code
+Repository: https://github.com/ferdymercury/amide.git
+Repository-Browse: https://github.com/ferdymercury/amide
+Bug-Database: https://github.com/ferdymercury/amide/issues
+Bug-Submit: https://github.com/ferdymercury/amide/issues/new
View it on GitLab: https://salsa.debian.org/med-team/amide/-/compare/66d5f81612637d45ecbee6fc4fe6d0adbbaeb921...032e109e5b18ccc33c0b610c79db22eae43f59c4
--
View it on GitLab: https://salsa.debian.org/med-team/amide/-/compare/66d5f81612637d45ecbee6fc4fe6d0adbbaeb921...032e109e5b18ccc33c0b610c79db22eae43f59c4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230823/6c102d0d/attachment-0001.htm>
More information about the debian-med-commit
mailing list