[med-svn] [Git][med-team/sight][master] 7 commits: hardcoding FHS paths in /usr/bin/vrrender

Sat Apr 25 13:49:42 BST 2020


Étienne Mollier pushed to branch master at Debian Med / sight


Commits:
b629ecaf by Etienne Mollier at 2020-04-25T10:56:21+02:00
hardcoding FHS paths in /usr/bin/vrrender

not sure how to do it the "orthodox" way with CMake, the build
environment flashes dynamically the existing template.  So bringing
the fix after dh_install instead.

- - - - -
e41770c6 by Etienne Mollier at 2020-04-25T11:16:44+02:00
redirecting manpages to package having binaries

- - - - -
e8deab6f by Etienne Mollier at 2020-04-25T11:21:39+02:00
removed now unneeded ld flags

This is per lintian warning debian-rules-uses-as-needed-linker-flag

- - - - -
32d75a60 by Etienne Mollier at 2020-04-25T11:37:20+02:00
updated lintian flagged copyright notice

actually, the file changed license from BSD to LGPL-3+ since last
time said copyright entry was filled.

- - - - -
e2e55c6c by Etienne Mollier at 2020-04-25T13:27:12+02:00
d/changelog: team upload

- - - - -
782ce88b by Etienne Mollier at 2020-04-25T14:36:24+02:00
dedicated section to the LGPL-3+ snippet

- - - - -
8a19ad86 by Etienne Mollier at 2020-04-25T14:48:07+02:00
updated changelog entries accordingly

- - - - -


4 changed files:

- debian/changelog
- debian/copyright
- debian/sight.manpages → debian/libsight.manpages
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+sight (19.0.0-6) UNRELEASED; urgency=medium
+
+  [ Etienne Mollier ]
+  * Team upload.
+  * Hardcoded $me and $rootdir into the vrrender launcher for usrmerge support
+    Closes: #958089
+  * Changed manpages location to follow binaries embedded in libsight
+  * Updated a copyright entry from BSD to LGPL-3+ per current header
+  * Removed now unneeded ld flags per lintian warning
+
+ -- Etienne Mollier <etienne.mollier at mailoo.org>  Sat, 25 Apr 2020 14:47:51 +0200
+
 sight (19.0.0-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/copyright
=====================================
@@ -4,6 +4,24 @@ Source: https://git.ircad.fr/Sight/sight
 
 Files: *
 Copyright: 2009-2019 IRCAD
+License: LGPL-3+
+
+Files: debian/*
+Copyright: 2015 Corentin Desfarges <corentin.desfarges.dev at gmail.com>
+           2016-2019 Flavien Bridault <fbridault at ircad.fr>
+License: GPL-3+
+ The Debian packaging information is under the GPL, version 3 or later.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3' and the
+ complete text of the GNU Lesser General Public License can be found in
+ `/usr/share/common-licenses/LGPL'.
+
+Files: CMake/cppunit/cppunit_main.cpp
+Copyright: 2004-2018 IRCAD France
+           2012-2018 IHU Strasbourg
+License: LGPL-3+
+
 License: LGPL-3+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -23,22 +41,6 @@ License: LGPL-3+
  On Debian systems, the complete text of the GNU Library General
  Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
-Files: debian/*
-Copyright: 2015 Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-           2016-2019 Flavien Bridault <fbridault at ircad.fr>
-License: GPL-3+
- The Debian packaging information is under the GPL, version 3 or later.
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3' and the
- complete text of the GNU Lesser General Public License can be found in
- `/usr/share/common-licenses/LGPL'.
-
-Files: CMake/cppunit/cppunit_main.cpp
-Copyright: 2004-2010 IRCAD
-License: BSD
- On Debian systems, the full text can be found in the file "/usr/share/common-licenses/BSD"
-
 Files: SrcLib/core/fwZip/*/minizip/*
 Copyright: 1998-2010 Gilles Vollant
            2009-2010 Mathias Svensson


=====================================
debian/sight.manpages → debian/libsight.manpages
=====================================


=====================================
debian/rules
=====================================
@@ -11,7 +11,7 @@ include /usr/share/dpkg/pkg-info.mk
 CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 %:
 	dh $@
@@ -26,3 +26,9 @@ endif
 
 override_dh_shlibdeps:
 	dh_shlibdeps -v -l/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/sight:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/Bundles:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/gui_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/io_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ctrlSelection_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ioITK_0-1/
+
+override_dh_install:
+	dh_install
+	sed -i -e 's@^me=.*$$@me=/usr/bin@' \
+		-e 's@^rootdir=.*$$@rootdir=/usr@' \
+		debian/vrrender/usr/bin/vrrender



View it on GitLab: https://salsa.debian.org/med-team/sight/-/compare/afedd80f42f627e63792a73de104f2b5466e12ab...8a19ad86e724f7e27576741d29a6abedcb9f9e56

-- 
View it on GitLab: https://salsa.debian.org/med-team/sight/-/compare/afedd80f42f627e63792a73de104f2b5466e12ab...8a19ad86e724f7e27576741d29a6abedcb9f9e56
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/20200425/06ea978c/attachment-0001.html>
