[med-svn] [orthanc-imagej] 05/12: Orthanc ImageJ 1.1

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository orthanc-imagej.

commit a2a35c908c170f4e71d9c7e3990b9121770472ae
Author: Sébastien Jodogne <s.jodogne at chu.ulg.ac.be>
Date:   Fri Apr 15 10:25:52 2016 +0000

    Orthanc ImageJ 1.1
---
 debian/changelog           |  7 ++++---
 debian/control             | 14 +++++++-------
 debian/copyright           |  2 +-
 debian/patches/json-simple | 10 +++++-----
 debian/watch               |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f3f6bf..35c6a2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-orthanc-imagej (1.0.0+dfsg-2) UNRELEASED; urgency=medium
+orthanc-imagej (1.1+dfsg-1) UNRELEASED; urgency=medium
 
-  * Updated URLs to the project, the code repository and the downloads
+  * New upstream version.
+  * Updated URLs to the project, the code repository and the downloads.
 
- -- Sebastien Jodogne <s.jodogne at gmail.com>  Thu, 30 Jul 2015 10:19:28 +0200
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 15 Apr 2016 11:44:54 +0200
 
 orthanc-imagej (1.0.0+dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c601eff..b4cebdc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Uploaders: Sebastien Jodogne <s.jodogne at gmail.com>,
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Build-Depends: cmake (>= 2.8),
                default-jdk,
                debhelper (>= 9),
                imagej,
                libjson-simple-java
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-imagej/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-imagej/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-imagej/trunk/
 Homepage: http://www.orthanc-server.com/static.php?page=imagej
 
@@ -27,9 +27,9 @@ Description: ImageJ plugin to import images from Orthanc
  Orthanc is a lightweight, RESTful DICOM server for healthcare and
  medical research.
  .
- This plugin hopefully greatly simplifies the indexation of DICOM
- images when dealing with ImageJ (e.g. for quality control of DICOM
- modalities, or for pedagogical use). There is also no need to carry
- on any complex network configuration, since the plugin directly uses
- the REST API of Orthanc. This makes its installation and its use
+ This plugin simplifies the indexation of DICOM images if using
+ ImageJ (e.g. for quality control of DICOM modalities, or for
+ pedagogical use). There is also no need to carry on any complex
+ network configuration, since the plugin directly uses the REST
+ API of Orthanc. This makes its installation and its use
  quite straightforward.
diff --git a/debian/copyright b/debian/copyright
index a8d9b0d..5a11a28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: https://bitbucket.org/sjodogne/orthanc-imagej/
 Files-Excluded: org/*
 
 Files: *
-Copyright: 2012-2014 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
+Copyright: 2012-2016 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
 License: GPL-3
 
 
diff --git a/debian/patches/json-simple b/debian/patches/json-simple
index 303b1ad..097d359 100644
--- a/debian/patches/json-simple
+++ b/debian/patches/json-simple
@@ -2,10 +2,10 @@ Description: Patch to link against Debian's libjson-simple-java package
 Author: Sebastien Jodogne <s.jodogne at gmail.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancImageJ.2/CMakeLists.txt
+Index: OrthancImageJ-1.1/CMakeLists.txt
 ===================================================================
---- OrthancImageJ.2.orig/CMakeLists.txt
-+++ OrthancImageJ.2/CMakeLists.txt
+--- OrthancImageJ-1.1.orig/CMakeLists.txt
++++ OrthancImageJ-1.1/CMakeLists.txt
 @@ -6,7 +6,7 @@ find_package(Java REQUIRED)
  include(UseJava)
  
@@ -15,10 +15,10 @@ Index: OrthancImageJ.2/CMakeLists.txt
  
  # The name of an ImageJ plugin must contain an underscore
  # http://imagejdocu.tudor.lu/doku.php?id=howto:plugins:howto_create_an_imagej_plugin_jar_file
-@@ -18,20 +18,6 @@ add_jar(Orthanc_Import
-   ${CMAKE_SOURCE_DIR}/com/orthancserver/OrthancConnection.java
+@@ -19,20 +19,6 @@ add_jar(Orthanc_Import
    ${CMAKE_SOURCE_DIR}/com/orthancserver/PreviewPanel.java
    ${CMAKE_SOURCE_DIR}/com/orthancserver/SelectImageDialog.java
+   ${CMAKE_SOURCE_DIR}/com/orthancserver/HttpsTrustModifier.java
 -
 -  # Sources of the "json-simple" toolkit
 -  ${CMAKE_SOURCE_DIR}/org/json/simple/ItemList.java
diff --git a/debian/watch b/debian/watch
index 323e4e8..1407b5b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g" \
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g,downloadurlmangle=s/\/browse\.php\?path=//g,repack,compression=xz" \
 http://www.orthanc-server.com/browse.php?path=/imagej downloads/get\.php\?path=/imagej/OrthancImageJ-(\d\S*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc-imagej.git