[med-svn] [Git][med-team/orthanc-dicomweb][master] 4 commits: fix #1011886, fix copyrights, and upgrade to Standards-Version: 4.6.1
Sebastien Jodogne (@jodogne-guest)
gitlab at salsa.debian.org
Fri May 27 09:21:13 BST 2022
Sebastien Jodogne pushed to branch master at Debian Med / orthanc-dicomweb
Commits:
0aa6765d by jodogne-guest at 2022-05-27T08:31:39+02:00
fix #1011886, fix copyrights, and upgrade to Standards-Version: 4.6.1
- - - - -
9e8eb514 by jodogne-guest at 2022-05-27T08:37:49+02:00
removed duplicate entry in d/copyright
- - - - -
829d7a20 by jodogne-guest at 2022-05-27T10:05:11+02:00
added lintian override for package-has-unnecessary-activation-of-ldconfig-trigger
- - - - -
d81732e5 by jodogne-guest at 2022-05-27T10:20:29+02:00
Upload to unstable
- - - - -
6 changed files:
- − Resources/Orthanc/Sdk-1.7.0/orthanc/OrthancCPlugin.h
- debian/ThirdPartyDownloads/JavaScriptLibraries.cmake
- debian/changelog
- debian/control
- debian/copyright
- + debian/orthanc-dicomweb.lintian-overrides
Changes:
=====================================
Resources/Orthanc/Sdk-1.7.0/orthanc/OrthancCPlugin.h deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
debian/ThirdPartyDownloads/JavaScriptLibraries.cmake
=====================================
@@ -12,13 +12,25 @@ file(COPY
${CMAKE_SOURCE_DIR}/debian/ThirdPartyDownloads/bootstrap-vue/bootstrap-vue.min.js
${CMAKE_SOURCE_DIR}/debian/ThirdPartyDownloads/bootstrap-vue/bootstrap-vue.min.js.map
${CMAKE_SOURCE_DIR}/debian/ThirdPartyDownloads/vue/vue.min.js
- /usr/share/nodejs/axios/dist/axios.min.js
- /usr/share/nodejs/axios/dist/axios.min.map
/usr/share/nodejs/bootstrap/dist/js/bootstrap.min.js
DESTINATION
${JAVASCRIPT_LIBS_DIR}/js
)
+# The use of "axios.js" as a replacement for "axios.min.js" stems from
+# the fact that the "node-axios" package doesn't ship the file
+# "/usr/share/nodejs/axios/dist/axios.min.map" anymore starting with
+# version 0.26.1+dfsg-2. This closes #1011886.
+file(COPY_FILE
+ /usr/share/nodejs/axios/dist/axios.js
+ ${JAVASCRIPT_LIBS_DIR}/js/axios.min.js
+ )
+
+file(COPY_FILE
+ /usr/share/nodejs/axios/dist/axios.map
+ ${JAVASCRIPT_LIBS_DIR}/js/axios.min.map
+ )
+
file(COPY
${CMAKE_SOURCE_DIR}/debian/ThirdPartyDownloads/bootstrap-vue/bootstrap-vue.min.css
${CMAKE_SOURCE_DIR}/debian/ThirdPartyDownloads/bootstrap-vue/bootstrap-vue.min.css.map
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+orthanc-dicomweb (1.7+dfsg-3) unstable; urgency=medium
+
+ * node-axios package does not provide
+ /usr/share/nodejs/axios/dist/axios.min.map anymore. Closes: #1011886
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Fri, 27 May 2022 08:10:45 +0200
+
orthanc-dicomweb (1.7+dfsg-2) unstable; urgency=medium
* Replace explicit restart of Orthanc by orthanc-restart-trigger
=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends: cmake,
unzip,
uuid-dev,
yui-compressor
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/orthanc-dicomweb
Vcs-Git: https://salsa.debian.org/med-team/orthanc-dicomweb.git
Homepage: https://www.orthanc-server.com/static.php?page=dicomweb
=====================================
debian/copyright
=====================================
@@ -4,14 +4,19 @@ Upstream-Contact: Sebastien Jodogne <s.jodogne at gmail.com>
Source: https://bitbucket.org/sjodogne/orthanc-dicomweb/
Files-Excluded:
Resources/Samples/JavaScript/jquery.min.js
+ Resources/Orthanc/Sdk-1.7.0
Files: *
Copyright: 2012-2016 Sebastien Jodogne <s.jodogne at gmail.com>, University Hospital of Liege (Belgium), and 2017-2021 Osimis S.A. (Belgium)
-License: AGPL-3
+License: AGPL-3.0+
Files: Resources/Orthanc/*
Copyright: 2012-2016 Sebastien Jodogne <s.jodogne at gmail.com>, University Hospital of Liege (Belgium), and 2017-2021 Osimis S.A. (Belgium)
-License: GPL-3 with OpenSSL exception
+License: GPL-3.0+
+
+Files: Resources/Orthanc/CMake/* Resources/Orthanc/Toolchains/*
+Copyright: 2012-2016 Sebastien Jodogne <s.jodogne at gmail.com>, University Hospital of Liege (Belgium), and 2017-2021 Osimis S.A. (Belgium)
+License: LGPL-3.0+
Files: debian/ThirdPartyDownloads/bootstrap-vue/*
Copyright: 2016-2019 BootstrapVue
@@ -31,7 +36,7 @@ License: Expat
Comment: The source for this code can be found at
https://github.com/vuejs/vue
-License: AGPL-3
+License: AGPL-3.0+
This program is free software: you can redistribute it and/or
modify it under the terms of the GNU Affero General Public License
as published by the Free Software Foundation, either version 3 of
@@ -65,24 +70,12 @@ License: Expat
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-License: GPL-3 with OpenSSL exception
+License: GPL-3.0+
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
the Free Software Foundation, either version 3 of the License, or (at
your option) any later version.
.
- In addition, as a special exception, the copyright holders of this
- program give permission to link the code of its release with the
- OpenSSL project's "OpenSSL" library (or with modified versions of it
- that use the same license as the "OpenSSL" library), and distribute
- the linked executables. You must obey the GNU General Public License
- in all respects for all of the code used other than "OpenSSL". If you
- modify file(s) with this exception, you may extend this exception to
- your version of the file(s), but you are not obligated to do so. If
- you do not wish to do so, delete this exception statement from your
- version. If you delete this exception statement from all source files
- in the program, then also delete it here.
- .
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -95,3 +88,23 @@ License: GPL-3 with OpenSSL exception
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file
`/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-3.0+
+ This program is free software: you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ as published by the Free Software Foundation, either version 3 of
+ the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file
+ `/usr/share/common-licenses/LGPL-3'.
=====================================
debian/orthanc-dicomweb.lintian-overrides
=====================================
@@ -0,0 +1,5 @@
+# The package stores the shared library of the plugin into folder
+# "/usr/lib/orthanc/", which is neither "/usr/lib" nor "/lib". So,
+# there is a bug in debhelper that should not auto-generate an
+# ldconfig trigger for this package.
+orthanc-dicomweb: package-has-unnecessary-activation-of-ldconfig-trigger
View it on GitLab: https://salsa.debian.org/med-team/orthanc-dicomweb/-/compare/3e081c327798a3b1f8a4f4ec1a26ee8d57abafeb...d81732e5027832cb1d65d95e8d5ccfe4bf47c476
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc-dicomweb/-/compare/3e081c327798a3b1f8a4f4ec1a26ee8d57abafeb...d81732e5027832cb1d65d95e8d5ccfe4bf47c476
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/20220527/df76c4bb/attachment-0001.htm>
More information about the debian-med-commit
mailing list