[med-svn] [Git][med-team/relion][debian/master] 4 commits: Drop unused licenses
Andreas Tille (@tille)
gitlab at salsa.debian.org
Thu Sep 24 13:52:13 BST 2026
Andreas Tille pushed to branch debian/master at Debian Med / relion
Commits:
4c135e94 by Andreas Tille at 2026-09-24T14:24:02+02:00
Drop unused licenses
- - - - -
d4738870 by Andreas Tille at 2026-09-24T14:26:54+02:00
Fix FTBFS with Eigen 5
- - - - -
14b726e0 by Andreas Tille at 2026-09-24T14:27:08+02:00
debian/rules: relion_schemegui is installed without a .py suffix since upstream 5.1.0; adjust the script renaming in override_dh_auto_install.
- - - - -
eecc3a9c by Andreas Tille at 2026-09-24T14:47:55+02:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/copyright
- debian/patches/system-eigen.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-relion (5.1.0+dfsg-1) UNRELEASED; urgency=medium
+relion (5.1.0+dfsg-1) unstable; urgency=medium
[ Pierre Gruet ]
* New upstream version 5.0.1+dfsg:
@@ -56,10 +56,15 @@ relion (5.1.0+dfsg-1) UNRELEASED; urgency=medium
* Add missing build-dependency on python3-setuptools.
* debputy lint --auto-fix (routine-update)
* d/copyright:
+ - Drop unused licenses
- Do not mention removed src/Eigen
- Use link to /usr/share/common-licenses/MPL-2.0 instead of full text
+ * Fix FTBFS with Eigen 5
+ * debian/rules: relion_schemegui is installed without a .py suffix
+ since upstream 5.1.0; adjust the script renaming in
+ override_dh_auto_install.
- -- Andreas Tille <tille at debian.org> Thu, 24 Sep 2026 10:03:37 +0200
+ -- Andreas Tille <tille at debian.org> Thu, 24 Sep 2026 14:27:25 +0200
relion (3.1.3-4) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -94,33 +94,6 @@ Copyright: 2014-2020, Q-Leap Networks GmbH <info at q-leap.de>
2014-2025, Debian Med Packaging Team
License: GPL-2+
-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:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. 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.
- 3. Neither the name of the copyright holder nor the names of its
- contributors 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
- HOLDER 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.
-
License: BSL-1.0
Boost Software License - Version 1.0 - August 17th, 2003
.
@@ -429,7 +402,3 @@ License: EPL
party waives its rights to a jury trial in any resulting litigation.
Comment:
This license is GPL-incompatible.
-
-License: MPL-2
- On Debian systems you can find the full text of the Mozilla Public
- License Version 2.0 at /usr/share/common-licenses/MPL-2.0.
=====================================
debian/patches/system-eigen.patch
=====================================
@@ -6,12 +6,14 @@ Last-Update: 2025-11-05
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -540,6 +540,9 @@ endif(JPEG_FOUND)
+@@ -540,6 +540,11 @@ endif(JPEG_FOUND)
# -----------------------------------------------------------------PYTHON DEPENDENCIES--
+find_package(Eigen3 REQUIRED)
-+add_definitions(${EIGEN3_DEFINITIONS})
++if(TARGET Eigen3::Eigen)
++ get_target_property(EIGEN3_INCLUDE_DIRS Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES)
++endif()
+include_directories(${EIGEN3_INCLUDE_DIRS})
set(CONDA_ENV_NAME "relion-5.1" CACHE STRING "The Conda environment name")
=====================================
debian/rules
=====================================
@@ -43,6 +43,8 @@ override_dh_auto_install:
# Bash wrappers for RELION Python modules; not packaged.
rm $(CURDIR)/debian/tmp/cli/usr/bin/relion_python_*
# Rename scripts to avoid lintian W: script-with-language-extension.
- set -e; for prog in relion_it relion_schemegui; do \
- mv $(CURDIR)/debian/tmp/cli/usr/bin/$$prog.py \
- $(CURDIR)/debian/tmp/gui/usr/bin/$$prog; done
+ mv $(CURDIR)/debian/tmp/cli/usr/bin/relion_it.py \
+ $(CURDIR)/debian/tmp/gui/usr/bin/relion_it
+# relion_schemegui is installed without a .py suffix since upstream 5.1.0.
+ mv $(CURDIR)/debian/tmp/cli/usr/bin/relion_schemegui \
+ $(CURDIR)/debian/tmp/gui/usr/bin/relion_schemegui
View it on GitLab: https://salsa.debian.org/med-team/relion/-/compare/796ce5bb31c5772463c4a68e9b2de5f035f6b108...eecc3a9c00db29d33a320a3238ba81cc3b4c6e34
--
View it on GitLab: https://salsa.debian.org/med-team/relion/-/compare/796ce5bb31c5772463c4a68e9b2de5f035f6b108...eecc3a9c00db29d33a320a3238ba81cc3b4c6e34
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260924/f6faf5c4/attachment-0001.htm>
More information about the debian-med-commit
mailing list