[med-svn] r18028 - in trunk/packages/orthanc/trunk/debian: . upstream

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2014-09-15 12:48:10 +0000 (Mon, 15 Sep 2014)
New Revision: 18028

Added:
   trunk/packages/orthanc/trunk/debian/upstream/
   trunk/packages/orthanc/trunk/debian/upstream/metadata
Removed:
   trunk/packages/orthanc/trunk/debian/upstream
Modified:
   trunk/packages/orthanc/trunk/debian/changelog
   trunk/packages/orthanc/trunk/debian/copyright
Log:
fixes

Modified: trunk/packages/orthanc/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc/trunk/debian/changelog	2014-09-15 12:37:17 UTC (rev 18027)
+++ trunk/packages/orthanc/trunk/debian/changelog	2014-09-15 12:48:10 UTC (rev 18028)
@@ -1,6 +1,7 @@
 orthanc (0.8.3+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version: 0.8.3
+    Closes: #761640
   * Upgrade Mongoose version: 3.1 to 3.8
   * Packaging of the plugin SDK
 

Modified: trunk/packages/orthanc/trunk/debian/copyright
===================================================================
--- trunk/packages/orthanc/trunk/debian/copyright	2014-09-15 12:37:17 UTC (rev 18027)
+++ trunk/packages/orthanc/trunk/debian/copyright	2014-09-15 12:48:10 UTC (rev 18028)
@@ -9,14 +9,10 @@
 	OrthancExplorer/libs/jquery-1.7.2*
 	OrthancExplorer/libs/jquery.mobile*1.1.0* 
 
-Files: debian/*
+Files: * UnitTestsSources/* Core/Compression/ZipWriter.* Resources/EmbedResources.py Resources/Samples/*
 Copyright: 2012-2014 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
 License: GPL-3 with OpenSSL exception
 
-Files: * UnitTests/* Core/Compression/ZipWriter.* Resources/EmbedResources.py Resources/Samples/* Resources/Archives/*
-Copyright: 2012-2014 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
 License: GPL-3
@@ -27,7 +23,7 @@
 
 Files: Core/SQLite/*
 Copyright: 2012-2014 CHU of Liege (Belgium), Sebastien Jodogne <s.jodogne at gmail.com>, and 2012 The Chromium Authors
-License: BSD
+License: BSD-3-clause
 
 Files: Core/HttpClient.h Core/HttpClient.cpp
 Copyright: 2012-2014 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
@@ -43,7 +39,7 @@
 
 Files: OrthancExplorer/libs/jqm.page.params.js
 Copyright: 2011 Kin Blas
-License: BSD
+License: BSD-3-clause
 
 Files: OrthancExplorer/libs/jqtree.css OrthancExplorer/libs/jqtree-icons.png OrthancExplorer/libs/tree.jquery.js
 Copyright: 2012 Marco Braak
@@ -67,7 +63,7 @@
 
 Files: Resources/CMake/GoogleLogConfiguration.h
 Copyright: 2008 Google Inc.
-License: BSD
+License: BSD-3-clause
 
 Files: Resources/ThirdParty/minizip/*
 Copyright: 1998-2010 Gilles Vollant, and 2009-2010 Mathias Svensson
@@ -75,11 +71,11 @@
 
 Files: Resources/ThirdParty/base64/*
 Copyright: 2004-2008 Rene Nyffenegger
-License: BSD
+License: BSD-3-clause
 
 Files: Resources/ThirdParty/VisualStudio/*
 Copyright: 2006-2008 Alexander Chemeris
-License: BSD
+License: BSD-3-clause
 
 Files: Resources/ThirdParty/md5/*
 Copyright:  1999, 2002 Aladdin Enterprises
@@ -157,7 +153,7 @@
  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-License: BSD
+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:

Deleted: trunk/packages/orthanc/trunk/debian/upstream
===================================================================
--- trunk/packages/orthanc/trunk/debian/upstream	2014-09-15 12:37:17 UTC (rev 18027)
+++ trunk/packages/orthanc/trunk/debian/upstream	2014-09-15 12:48:10 UTC (rev 18028)
@@ -1,6 +0,0 @@
-Reference:
-  Author: S. Jodogne and C. Bernard and M. Devillers and E. Lenaerts and P. Coucke
-  Title: "Orthanc -- A Lightweight, RESTful DICOM Server for Healthcare and Medical Research"
-  Type: book
-  Booktitle: Proc. of the International Symposium on Biomedical Imaging
-  Year: 2013

Added: trunk/packages/orthanc/trunk/debian/upstream/metadata
===================================================================
--- trunk/packages/orthanc/trunk/debian/upstream/metadata	                        (rev 0)
+++ trunk/packages/orthanc/trunk/debian/upstream/metadata	2014-09-15 12:48:10 UTC (rev 18028)
@@ -0,0 +1,6 @@
+Reference:
+  Author: S. Jodogne and C. Bernard and M. Devillers and E. Lenaerts and P. Coucke
+  Title: "Orthanc -- A Lightweight, RESTful DICOM Server for Healthcare and Medical Research"
+  Type: book
+  Booktitle: Proc. of the International Symposium on Biomedical Imaging
+  Year: 2013