[med-svn] r19302 - trunk/packages/orthanc/trunk/debian

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-06-03 09:14:14 +0000 (Wed, 03 Jun 2015)
New Revision: 19302

Modified:
   trunk/packages/orthanc/trunk/debian/copyright
Log:
fixes to debian/copyright

Modified: trunk/packages/orthanc/trunk/debian/copyright
===================================================================
--- trunk/packages/orthanc/trunk/debian/copyright	2015-05-31 00:31:07 UTC (rev 19301)
+++ trunk/packages/orthanc/trunk/debian/copyright	2015-06-03 09:14:14 UTC (rev 19302)
@@ -9,49 +9,40 @@
 	OrthancExplorer/libs/jquery-1.7.2*
 	OrthancExplorer/libs/jquery.mobile*1.1.0* 
 
-Files: * UnitTestsSources/* Core/Compression/ZipWriter.* Resources/EmbedResources.py
+Files: *
 Copyright: 2012-2015 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
 License: GPL-3+ with OpenSSL exception
 
-Files: OrthancCppClient/SharedLibrary/AUTOGENERATED/* OrthancCppClient/SharedLibrary/Laaw/*
-Copyright: 2010-2013 Jomago - Alain Mazy, Benjamin Golinvaux, Sebastien Jodogne
+Files: Resources/Samples/* Plugins/Samples/*
+Copyright: 2012-2015 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
 License: GPL-3+
 
-Files: debian/ThirdPartyDownloads/mongoose-3.8.tgz
-Copyright: Copyright (c) 2004-2013 Sergey Lyubka
-License: MIT
-
 Files: Core/SQLite/*
 Copyright: 2012-2015 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, and 2012 The Chromium Authors
 License: BSD-3-clause
 
-Files: Core/HttpClient.h Core/HttpClient.cpp
-Copyright: 2012-2015 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
-License: MIT
-
-Files: Resources/Samples/* Plugins/Samples/*
-Copyright: 2012-2015 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
-License: GPL-3+
-
-Files: OrthancServer/FromDcmtkBridge.cpp OrthancServer/Internals/DicomImageDecoder.cpp
+Files: OrthancServer/Internals/DicomImageDecoder.cpp OrthancServer/ParsedDicomFile.cpp
 Copyright: 2012-2015 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, 2006-2011 Mathieu Malaterre, and 1993-2005 CREATIS
 License: GPL-3+ with OpenSSL exception
 
-Files: OrthancServer/DicomProtocol/DicomUserConnection.cpp OrthancServer/Internals/CommandDispatcher.cpp OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/Internals/StoreScp.cpp OrthancServer/DicomProtocol/DicomUserConnection.cpp
+Files: OrthancServer/DicomDirWriter.cpp OrthancServer/DicomProtocol/DicomUserConnection.cpp OrthancServer/Internals/CommandDispatcher.cpp OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/Internals/StoreScp.cpp
 Copyright: 2012-2015 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, and 1994-2011 OFFIS e.V.
 License: GPL-3+ with OpenSSL exception
 
+
+
+
 Files: OrthancExplorer/libs/jqm.page.params.js
 Copyright: 2011 Kin Blas
 License: BSD-3-clause
 
 Files: OrthancExplorer/libs/jqtree.css OrthancExplorer/libs/jqtree-icons.png OrthancExplorer/libs/tree.jquery.js
 Copyright: 2012 Marco Braak
-License: Apache
+License: Apache-2
 
 Files: OrthancExplorer/libs/jquery.blockui.js
 Copyright: 2007-2010 M. Alsup
-License: MIT
+License: MIT or GPL-2
 
 Files: OrthancExplorer/libs/jquery-file-upload/*
 Copyright: 2012 Sebastian Tschan
@@ -61,34 +52,48 @@
 Copyright: 2011 jQuery UI Project <http://jqueryui.com/about>
 License: MIT or GPL-2
 
+Files: OrthancExplorer/libs/jquery.mobile.simpledialog*
+Copyright: JTSage
+License: CC-BY
+
 Files: OrthancExplorer/libs/slimbox2.js OrthancExplorer/libs/slimbox2/*
 Copyright: 2007-2010 Christophe Beyls <http://www.digitalia.be>
 License: MIT
 
-Files: OrthancExplorer/libs/jquery.mobile.simpledialog*
-Copyright: JTSage
-License: CC-BY
 
-Files: Resources/CMake/GoogleLogConfiguration.h
+
+
+Files: Resources/CMake/GoogleLogConfiguration*.h Resources/Patches/glog-visual-studio-port.h
 Copyright: 2008 Google Inc.
 License: BSD-3-clause
 
-Files: Resources/ThirdParty/minizip/*
-Copyright: 1998-2010 Gilles Vollant, and 2009-2010 Mathias Svensson
-License: zlib
+Files: Resources/Samples/WebApplications/DrawingDicomizer/drawing.js
+Copyright: 2010 William Malone <www.williammalone.com>
+License: Apache-2
 
 Files: Resources/ThirdParty/base64/*
 Copyright: 2004-2008 Rene Nyffenegger
 License: zlib
 
+Files: Resources/ThirdParty/md5/*
+Copyright: 1999, 2002 Aladdin Enterprises
+License: zlib
+
+Files: Resources/ThirdParty/minizip/*
+Copyright: 1998-2010 Gilles Vollant, and 2009-2010 Mathias Svensson
+License: zlib
+
 Files: Resources/ThirdParty/VisualStudio/*
 Copyright: 2006-2008 Alexander Chemeris
 License: BSD-3-clause
 
-Files: Resources/ThirdParty/md5/*
-Copyright: 1999, 2002 Aladdin Enterprises
-License: zlib
 
+
+
+Files: debian/ThirdPartyDownloads/mongoose-3.8.tgz
+Copyright: Copyright (c) 2004-2013 Sergey Lyubka
+License: MIT
+
 Files: debian/JS/jquery.mobile-1.1.0/*
 Copyright: 2011 jQuery Project
 License: MIT or GPL-2
@@ -98,6 +103,8 @@
 License: MIT
 
 
+
+
 License: GPL-3+ with OpenSSL exception
  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
@@ -217,7 +224,7 @@
  (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: Apache
+License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at