[Debian-med-packaging] [mrtrix] 03/03: Update packaging.
Michael Hanke
mih at moszumanska.debian.org
Sun Mar 9 06:43:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
mih pushed a commit to branch master
in repository mrtrix.
commit d3b6f184bce3a5b0fc2b9a7c4cdbe7497d3242c3
Author: Michael Hanke <michael.hanke at gmail.com>
Date: Sat Mar 8 21:09:51 2014 +0100
Update packaging.
---
debian/changelog | 9 +++++
debian/compat | 2 +-
debian/control | 4 +--
debian/copyright | 9 ++---
debian/patches/debian_build_cfg | 56 ++++++++++--------------------
debian/patches/lucid-dsc-patch-octave_deps | 2 +-
6 files changed, 37 insertions(+), 45 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9c85506..43958fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mrtrix (0.2.12-1) unstable; urgency=low
+
+ * New upstream version.
+ * Bump'ed debian/compat to 9 for hardening.
+ * Updated copyright.
+ * Minimized debian/patches.
+
+ -- Michael Hanke <mih at debian.org> Sat, 08 Mar 2014 20:47:57 +0100
+
mrtrix (0.2.11-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 30536d4..5e70e66 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mrtrix
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~),
+Build-Depends: debhelper (>= 9~),
liboctave-dev,
libgsl0-dev,
python,
@@ -31,7 +31,7 @@ Description: diffusion-weighted MRI white matter tractography
Package: mrtrix-doc
Section: doc
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
Description: documentation for mrtrix
Set of tools to perform diffusion-weighted MRI white matter tractography of the
brain in the presence of crossing fibres, using Constrained Spherical
diff --git a/debian/copyright b/debian/copyright
index 2c73310..b2a8836 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,11 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: MRtrix
-Upstream-Source: http://www.brain.org.au/software/mrtrix
+Upstream-Contact: Donald Tournier <jdtournier at gmail.com>
+Source: http://www.brain.org.au/software/mrtrix
Files: *
-Copyright: Copyright 2008-2010 Brain Research Institute, Melbourne, Australia
+Copyright: Copyright 2008-2014 Brain Research Institute, Melbourne, Australia
Written by J-Donald Tournier
License: GPL-3
On Debian systems the full text of the GNU General Public License can be found
@@ -21,7 +22,7 @@ License: Public Domain
Files: debian/*
-Copyright: Copyright 2010, Michael Hanke <michael.hanke at gmail.com>
+Copyright: Copyright 2010-2014, Michael Hanke <michael.hanke at gmail.com>
License: GPL-3
On Debian systems the full text of the GNU General Public License can be found
in the `/usr/share/common-licenses/GPL-3' file.
diff --git a/debian/patches/debian_build_cfg b/debian/patches/debian_build_cfg
index 1c54967..f378ce1 100644
--- a/debian/patches/debian_build_cfg
+++ b/debian/patches/debian_build_cfg
@@ -1,9 +1,6 @@
Description: Change buildsystem setup for Debian
We cannot use --march, because we need to support many of them -- not even
'native', as it will over-optimize for the build machine.
- We set an RPATH to let binaries find the private shared lib. This is
- safe, because the shared library is built by and shipped in the same package
- as the binaries.
Forwarded: not-needed
Author: Michael Hanke <michael.hanke at gmail.com>
--- a/sysconf/linux.py
@@ -12,41 +9,26 @@ Author: Michael Hanke <michael.hanke at gmail.com>
lib_suffix = '.so'
cpp = [ 'g++', '-c', '$flags$', '$gtk$', '$path$', '$src$', '-o', '$obj$' ]
--cpp_flags = [ '-Wall', '-march=native', '-fPIC', '-fno-strict-aliasing', '-DGL_GLEXT_PROTOTYPES', '-DUSE_TR1' ]
-+cpp_flags = [ '-Wall', '-fPIC', '-fno-strict-aliasing', '-DGL_GLEXT_PROTOTYPES', '-DUSE_TR1' ]
+-cpp_flags = [ '-Wall', '-pedantic', '-march=native', '-fPIC', '-fno-strict-aliasing', '-DGL_GLEXT_PROTOTYPES', '-DUSE_TR1' ]
++cpp_flags = [ '-Wall', '-pedantic', '-fPIC', '-fno-strict-aliasing', '-DGL_GLEXT_PROTOTYPES', '-DUSE_TR1' ]
ld = [ 'g++', '$flags$', '$path$', '$obj$', '$mrtrix$', '$gsl$', '$gtk$', '$lz$', '-o', '$bin$' ]
- ld_flags = []
-@@ -16,7 +16,7 @@
- ld_lib_flags = []
-
- cpp_flags_debug = cpp_flags + [ '-g' ]
--ld_flags_debug = ld_flags + [ '-g' ]
-+ld_flags_debug = ld_flags + [ '-g', '-Wl,--rpath=/usr/lib/mrtrix/lib' ]
- ld_lib_flags_debug = ld_lib_flags + [ '-g' ]
-
- cpp_flags_profile = [ '-pg' ] + cpp_flags_debug
+ ld_flags = [ '-Wl,-rpath,$ORIGIN/../lib' ]
--- a/build
+++ b/build
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2
-+#!/usr/bin/python
-
- import platform, sys, os, time, threading, subprocess, shutil, stat
-
-@@ -177,12 +177,12 @@
- if verbose:
- print svn_revision
- svn_revision = '#define SVN_REVISION ' + svn_revision + '\n'
-+ if svn_revision != open(svn_revision_file).read():
-+ with open(svn_revision_file, 'wb') as fd:
-+ fd.write (svn_revision)
- except:
- pass
-
--if svn_revision != open(svn_revision_file).read():
-- with open(svn_revision_file, 'wb') as fd:
-- fd.write (svn_revision)
-
-
-
+@@ -180,6 +180,15 @@
+ ld_flags = ld_flags_profile
+ ld_lib_flags = ld_lib_flags_profile
+
++# honor the environment
++try:
++ # the splitting is needed because the command is submitted as a list
++ # and we need individual options -- it may not be that simple though...
++ env_flags = os.environ['LDFLAGS'].split()
++ ld_flags.extend(env_flags)
++ ld_lib_flags.extend(env_flags)
++except:
++ pass
+
+ # used to set install_name on MacOSX:
+ ld_lib_flags = [ entry.replace ('LIBNAME', libname) for entry in ld_lib_flags ]
diff --git a/debian/patches/lucid-dsc-patch-octave_deps b/debian/patches/lucid-dsc-patch-octave_deps
index 1ca4932..81774a3 100644
--- a/debian/patches/lucid-dsc-patch-octave_deps
+++ b/debian/patches/lucid-dsc-patch-octave_deps
@@ -5,7 +5,7 @@ index 30536d4..f23e8d1 100644
@@ -3,7 +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~),
+ Build-Depends: debhelper (>= 9~),
- liboctave-dev,
+ octave3.2-headers | octave-headers,
libgsl0-dev,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mrtrix.git
More information about the Debian-med-packaging
mailing list