[med-svn] [Git][med-team/mricron][master] 16 commits: Import Debian changes 0.20140804.1~dfsg.1-3.1

Graham Inggs gitlab at salsa.debian.org
Sun Oct 25 18:24:18 GMT 2020 


Graham Inggs pushed to branch master at Debian Med / mricron


Commits:
26d5554f by Graham Inggs at 2020-10-25T15:18:29+02:00
Import Debian changes 0.20140804.1~dfsg.1-3.1

mricron (0.20140804.1~dfsg.1-3.1) unstable; urgency=medium

  * Non-maintainer upload
  * Close comments to be compatible with FPC 3.2 (Closes: #968126)

- - - - -
1e1b35d6 by Andreas Tille at 2020-10-25T15:20:53+02:00
Move citation data from blends task to packaging

- - - - -
ec4049ec by Graham Inggs at 2020-10-25T15:23:17+02:00
Update changelog

- - - - -
14488464 by Graham Inggs at 2020-10-25T15:26:36+02:00
Adopt package on behalf of Debian Med Team

- - - - -
f527f84f by Graham Inggs at 2020-10-25T16:19:58+02:00
Run wrap-and-sort

- - - - -
119d9681 by Graham Inggs at 2020-10-25T17:50:07+02:00
Minimize Lazarus and FPC build dependencies

- - - - -
a08f0af9 by Graham Inggs at 2020-10-25T17:51:00+02:00
Switch to debhelper 13

- - - - -
5f1e1db7 by Graham Inggs at 2020-10-25T17:51:48+02:00
Set Rules-Requires-Root: no

- - - - -
ab8cf8fd by Graham Inggs at 2020-10-25T17:54:44+02:00
Add debian/clean to prevent FTBFSx2

- - - - -
dde1134d by Graham Inggs at 2020-10-25T19:19:56+02:00
Fix clearing the executable bit of examples

- - - - -
e18ccda2 by Graham Inggs at 2020-10-25T19:20:00+02:00
Drop obsolete patches

- - - - -
ef82ba4e by Graham Inggs at 2020-10-25T19:20:00+02:00
Remove duplicate Section fields from debian/control

- - - - -
fc188854 by Graham Inggs at 2020-10-25T19:20:00+02:00
Update debian/copyright

- - - - -
ffd0da04 by Graham Inggs at 2020-10-25T19:20:00+02:00
Update debian/watch

- - - - -
9d83f6ae by Graham Inggs at 2020-10-25T19:20:00+02:00
Bump-Standards version to 4.5.0

- - - - -
10084827 by Graham Inggs at 2020-10-25T19:22:02+02:00
Prepare for upload to unstable

- - - - -


19 changed files:

- − .gitignore
- debian/changelog
- + debian/clean
- − debian/compat
- debian/control
- debian/copyright
- debian/mricron-data.install
- debian/mricron.install
- debian/mricron.links
- debian/mricron.manpages
- + debian/patches/fpc-3.2.patch
- − debian/patches/lazarus_compat
- − debian/patches/lucid-dsc-patch-lazarus_deps
- debian/patches/series
- − debian/patches/series-lucid
- − debian/patches/series-maverick
- − debian/patches/series-squeeze
- debian/rules
- debian/watch


Changes:

=====================================
.gitignore deleted
=====================================
@@ -1 +0,0 @@
-.pc


=====================================
debian/changelog
=====================================
@@ -1,3 +1,33 @@
+mricron (0.20140804.1~dfsg.1-4) unstable; urgency=medium
+
+  * Team upload
+
+  [ Andreas Tille ]
+  * Move citation data from blends task to packaging
+
+  [ Graham Inggs ]
+  * Adopt package on behalf of Debian Med Team
+  * Run wrap-and-sort
+  * Minimize Lazarus and FPC build dependencies
+  * Switch to debhelper 13
+  * Set Rules-Requires-Root: no
+  * Add debian/clean to prevent FTBFSx2
+  * Fix clearing the executable bit of examples
+  * Drop obsolete patches
+  * Remove duplicate Section fields from debian/control
+  * Update debian/copyright, thanks Lintian
+  * Update debian/watch (Closes: #852777)
+  * Bump-Standards version to 4.5.0, no changes
+
+ -- Graham Inggs <ginggs at debian.org>  Sun, 25 Oct 2020 17:21:21 +0000
+
+mricron (0.20140804.1~dfsg.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Close comments to be compatible with FPC 3.2 (Closes: #968126)
+
+ -- Graham Inggs <ginggs at debian.org>  Sun, 16 Aug 2020 10:52:31 +0000
+
 mricron (0.20140804.1~dfsg.1-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+dcm2nii/dcm2niigui.res


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-12


=====================================
debian/control
=====================================
@@ -1,33 +1,27 @@
 Source: mricron
-Maintainer: NeuroDebian Team <team at neuro.debian.net>
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Michael Hanke <mih at debian.org>,
            Yaroslav Halchenko <debian at onerussian.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 12~),
-               lcl-utils,
-               lcl-gtk2 | lcl-gtk,
-               lcl-units,
-               fp-utils,
-               fp-units-gfx,
+Build-Depends: debhelper-compat (= 13),
                fp-units-misc,
-               lazarus-src,
-               libgtk2.0-dev,
-               imagemagick
-Standards-Version: 4.3.0
+               imagemagick,
+               lcl-gtk2,
+               lcl-units,
+               lcl-utils,
+               libgtk2.0-dev
+Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/med-team/mricron
 Vcs-Git: https://salsa.debian.org/med-team/mricron.git
 Homepage: https://www.nitrc.org/projects/mricron
 
 Package: mricron
 Architecture: any
-Section: science
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         mricron-data
+Depends: mricron-data, ${misc:Depends}, ${shlibs:Depends}
 Recommends: pigz
-Suggests: mricron-doc,
-          fsl
+Suggests: fsl, mricron-doc
 Description: magnetic resonance image conversion, viewing and analysis
  This is a GUI-based visualization and analysis tool for (functional) magnetic
  resonance imaging. MRIcron can be used to create 2D or 3D renderings of
@@ -42,7 +36,6 @@ Description: magnetic resonance image conversion, viewing and analysis
 
 Package: mricron-data
 Architecture: all
-Section: science
 Depends: ${misc:Depends}
 Description: data files for MRIcron
  This is a GUI-based visualization and analysis tool for (functional) magnetic


=====================================
debian/copyright
=====================================
@@ -1,34 +1,11 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: MRIcron
 Upstream-Contact: Chris Rorden
-Source: http://www.nitrc.org/frs/?group_id=152
+Source: https://github.com/neurolabusc/MRIcron/releases
 
 Files: *
 Copyright: Copyright 2006-2010, Chris Rorden
 License: BSD-3-clause
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-  .
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-  .
-  Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.  Neither the names of the
-  copyright owners nor the names of this project (MRIcron) may be used to
-  endorse or promote products derived from this software without specific prior
-  written permission.
-  .
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 Files: fpmath/*
@@ -36,8 +13,8 @@ Copyright: Copyright 2007, Jean Debord
   Copyright 2001, Michael Hopper
   Copyright (C) 1997 - 2002, Takuji Nishimura and Makoto Matsumoto
 License: LGPL-2.1+
-  On Debian systems the full text of the GNU Lesser General Public License can be
-  found in the `/usr/share/common-licenses/LGPL-2.1' file.
+  On Debian systems the full text of the GNU Lesser General Public License
+  can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
   .
   This is a copy of "TPMATH -- MATHEMATICAL LIBRARY FOR PASCAL COMPILERS",
   available from:
@@ -46,7 +23,7 @@ License: LGPL-2.1+
 
 Files: fpmath/uranmt.pas
 Copyright: Copyright 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
-License: BSD
+License: BSD-3-clause
 
 
 Files: rgb/*
@@ -75,13 +52,14 @@ License: Modified_LGPL
     do so. If you do not wish to do so, delete this exception statement
     from your version.
   .
-  On Debian systems the full text of the GNU Lesser Public License can be
-  found in the `/usr/share/common-licenses/LGPL-2' file.
+  On Debian systems the full text of the GNU Lesser General Public License
+  can be found in the `/usr/share/common-licenses/LGPL-2' file.
 
 
-Files: common/{DiskSpaceKludge,GraphicsMathLibrary}.pas
+Files: common/DiskSpaceKludge.pas
+       common/GraphicsMathLibrary.pas
 Copyright: Copyright 1982-1998, Earl F. Glynn
-License: BSD
+License: BSD-3-clause
   The original author gave approval to ship these files under the same terms as
   MRIcron itself (see above for the full license text).
 
@@ -94,10 +72,35 @@ License: GPL
   This is a heavily modified version of gzio.pas that is available in the
   'fpc-source' package.
   .
-  On Debian systems the full text of the GNU Lesser Public License can be
+  On Debian systems the full text of the GNU General Public License can be
   found in the `/usr/share/common-licenses/GPL-2' file.
 
 
 Files: debian/*
 Copyright: Copyright 2010, Michael Hanke <michael.hanke at gmail.com>
-License: BSD
+License: BSD-3-clause
+
+License: BSD-3-clause
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+  .
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+  .
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.  Neither the names of the
+  copyright owners nor the names of this project (MRIcron) may be used to
+  endorse or promote products derived from this software without specific prior
+  written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


=====================================
debian/mricron-data.install
=====================================
@@ -1,2 +1,2 @@
-templates usr/share/mricron
 lut usr/share/mricron
+templates usr/share/mricron


=====================================
debian/mricron.install
=====================================
@@ -1,7 +1,7 @@
-mricron usr/lib/mricron
-debian/wrapper/mricron usr/bin
-dcm2nii/dcm2niigui usr/bin
 dcm2nii/dcm2nii usr/bin
-npm/mricron-npm usr/bin
-mricron.xpm usr/share/pixmaps
+dcm2nii/dcm2niigui usr/bin
 debian/*.desktop usr/share/applications
+debian/wrapper/mricron usr/bin
+mricron usr/lib/mricron
+mricron.xpm usr/share/pixmaps
+npm/mricron-npm usr/bin


=====================================
debian/mricron.links
=====================================
@@ -1,2 +1,2 @@
-/usr/share/man/man1/mricron.1.gz /usr/share/man/man1/mricron-npm.1.gz
 /usr/share/man/man1/mricron.1.gz /usr/share/man/man1/dcm2niigui.1.gz
+/usr/share/man/man1/mricron.1.gz /usr/share/man/man1/mricron-npm.1.gz


=====================================
debian/mricron.manpages
=====================================
@@ -1,2 +1,2 @@
-debian/mricron.1
 debian/dcm2nii.1
+debian/mricron.1


=====================================
debian/patches/fpc-3.2.patch
=====================================
@@ -0,0 +1,28 @@
+Description: Close comments to be compatible with FPC 3.2
+Bug-Debian: https://bugs.debian.org/968126
+Forwarded: no
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2020-08-11
+
+--- a/common/distr.pas
++++ b/common/distr.pas
+@@ -558,7 +558,7 @@
+ 	pp:=pNormalOld(y);  y0:=abs(y-y0);
+ 	end;
+ result:=y;
+-end;   (**)
++end;   *)
+ function pGammaInv(f:longint;p:extended):extended;
+ var  pp,y,y0,a,b,a0       :extended;
+ 
+--- a/npm/firthThds.pas
++++ b/npm/firthThds.pas
+@@ -638,7 +638,7 @@
+ 
+     freemem(finalloglik);
+ 
+-end; (**)
++end; *)
+ 
+ 
+ 


=====================================
debian/patches/lazarus_compat deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Make code compatible with Debian's lazarus version
- This modification has been suggested by the upstream code.
-Forwarded: not-needed
-Author: Michael Hanke <michael.hanke at gmail.com>
---- a/rgb/rgbgtkroutines.pas
-+++ b/rgb/rgbgtkroutines.pas
-@@ -33,7 +33,7 @@
- uses
-   SysUtils, Classes, LCLType,
- {$IFDEF LCLgtk2}
--   //gtkDef,     //<- uncomment for older versions of Lazarus
-+   gtkDef,     //<- uncomment for older versions of Lazarus
-    glib2, gdk2,gtk2Def, gtk2Proc,
- {$ELSE}  //LCLgtk1
-   glib, gdk, gtkDef, gtkProc,


=====================================
debian/patches/lucid-dsc-patch-lazarus_deps deleted
=====================================
@@ -1,18 +0,0 @@
-Description: Patch for Ubuntu 10.04 lucid that comes with an older lazarus
- version with different package names.
-Author: Michael Hanke <michael.hanke at gmail.com>
-Forwarded: not-needed
-
---- a/debian/control
-+++ b/debian/control
-@@ -3,9 +3,7 @@ Priority: extra
- Maintainer: NeuroDebian Team <team at neuro.debian.net>
- Uploaders: Michael Hanke <mih at debian.org>, Yaroslav Halchenko <debian at onerussian.com>
- Build-Depends: debhelper (>= 7.0.50~),
-- lcl-utils,
-- lcl-gtk2 | lcl-gtk,
-- lcl-units,
-+ lazarus (>=0.9.28),
-  fp-utils,
-  fp-units-gfx,
-  fp-units-misc,


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ lazarus_modern
 debian_paths
 debian_version
 stricter_fpc.patch
+fpc-3.2.patch


=====================================
debian/patches/series-lucid deleted
=====================================
@@ -1 +0,0 @@
-lazarus_compat


=====================================
debian/patches/series-maverick deleted
=====================================
@@ -1 +0,0 @@
-lazarus_compat


=====================================
debian/patches/series-squeeze deleted
=====================================
@@ -1 +0,0 @@
-lazarus_compat


=====================================
debian/rules
=====================================
@@ -30,7 +30,7 @@ override_dh_auto_build:
 override_dh_compress:
 	dh_compress -X.voi
 	-find debian/mricron-data/usr/share/mricron/ -type f -exec chmod -x {} \;
-	-find debian/mricron-doc/usr/share/doc/mricron-doc/examples -type f -exec chmod -x {} \;
+	-find debian/mricron-doc/usr/share/doc/mricron/examples -type f -exec chmod -x {} \;
 
 override_dh_dwz:
 	echo "Lazarus code does not export debug symbols"
@@ -53,4 +53,3 @@ get-orig-source: get-latest-source
 get-latest-source:
 	wget http://www.mccauslandcenter.sc.edu/CRNL/sw/mricron/source.zip
 	bash debian/repack.sh source.zip
-


=====================================
debian/watch
=====================================
@@ -1,5 +1,3 @@
 version=4
-
-opts=dversionmangle=s/.*/0.No-Release/ \
-  https://people.debian.org/~eriberto/ FakeWatchNoUpstreamReleaseForThisPackage-(\d\S+)\.gz
-
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/mricron-$1\.tar\.gz/ \
+  https://github.com/neurolabusc/MRIcron/tags .*/v?(\d\S+)\.tar\.gz



View it on GitLab: https://salsa.debian.org/med-team/mricron/-/compare/b2a24ec11d9068698e895ea319b71a7d4b4a1ddf...100848275143d7800b025302d261d11094df71bf

-- 
View it on GitLab: https://salsa.debian.org/med-team/mricron/-/compare/b2a24ec11d9068698e895ea319b71a7d4b4a1ddf...100848275143d7800b025302d261d11094df71bf
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/20201025/36492c51/attachment-0001.html>

More information about the debian-med-commit mailing list