[med-svn] [orthanc-imagej] 03/12: link against libjson-simple-java package
Andreas Tille
tille at debian.org
Tue Apr 19 12:57:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository orthanc-imagej.
commit e76d11de0726f4720eef9c22b632fe0473b21398
Author: Sébastien Jodogne <s.jodogne at chu.ulg.ac.be>
Date: Mon Dec 15 15:47:13 2014 +0000
link against libjson-simple-java package
---
debian/changelog | 4 ++--
debian/control | 9 +++++----
debian/copyright | 19 +------------------
debian/patches/json-simple | 38 ++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 +++++++++
debian/watch | 1 +
7 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c12298e..78aff68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-orthanc-imagej (1.0.0-1) UNRELEASED; urgency=low
+orthanc-imagej (1.0.0+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #772561)
- -- Sebastien Jodogne <s.jodogne at gmail.com> Mon, 08 Dec 2014 16:55:43 +0100
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Mon, 15 Dec 2014 15:55:43 +0100
diff --git a/debian/control b/debian/control
index 0f2f517..b2c49ea 100644
--- a/debian/control
+++ b/debian/control
@@ -8,17 +8,18 @@ Standards-Version: 3.9.6
Build-Depends: cmake (>= 2.8),
default-jdk,
debhelper (>= 9),
- imagej
+ imagej,
+ libjson-simple-java
Vcs-Browser: http://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: https://code.google.com/p/orthanc-imagej/
Package: orthanc-imagej
Architecture: all
-Depends: ${java:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
default-jre | openjdk-7-jre,
- imagej
+ imagej,
+ libjson-simple-java
Recommends: orthanc
Description: ImageJ plugin to import images from Orthanc
This ImageJ plugin allows ImageJ to browse the content of an Orthanc
diff --git a/debian/copyright b/debian/copyright
index de8fa5d..fb2afcb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,16 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: OrthancImageJ
Upstream-Contact: Sebastien Jodogne <s.jodogne at gmail.com>
Source: https://code.google.com/p/orthanc-imagej/
+Files-Excluded: org/*
Files: *
Copyright: 2012-2014 CHU of Liege (Belgium), and Sebastien Jodogne <s.jodogne at gmail.com>
License: GPL-3
-Files: org/*
-Copyright: Yidong Fang, Chris Nokleberg, Dave Hughes
-License: Apache
-
-
License: GPL-3
This program is free software: you can redistribute it and/or modify
@@ -31,16 +27,3 @@ License: GPL-3
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: Apache
- 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
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License.
diff --git a/debian/patches/json-simple b/debian/patches/json-simple
new file mode 100644
index 0000000..303b1ad
--- /dev/null
+++ b/debian/patches/json-simple
@@ -0,0 +1,38 @@
+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
+===================================================================
+--- OrthancImageJ.2.orig/CMakeLists.txt
++++ OrthancImageJ.2/CMakeLists.txt
+@@ -6,7 +6,7 @@ find_package(Java REQUIRED)
+ include(UseJava)
+
+ set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.6" "-target" "1.6")
+-set(CMAKE_JAVA_INCLUDE_PATH /usr/share/java/ij.jar)
++set(CMAKE_JAVA_INCLUDE_PATH /usr/share/java/ij.jar:/usr/share/java/json-simple.jar)
+
+ # 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
+ ${CMAKE_SOURCE_DIR}/com/orthancserver/PreviewPanel.java
+ ${CMAKE_SOURCE_DIR}/com/orthancserver/SelectImageDialog.java
+-
+- # Sources of the "json-simple" toolkit
+- ${CMAKE_SOURCE_DIR}/org/json/simple/ItemList.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/JSONArray.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/JSONAware.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/JSONObject.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/JSONStreamAware.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/JSONValue.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/parser/ContainerFactory.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/parser/ContentHandler.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/parser/JSONParser.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/parser/ParseException.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/parser/Yylex.java
+- ${CMAKE_SOURCE_DIR}/org/json/simple/parser/Yytoken.java
+ )
+
+ # Add the "plugins.config" file that is expected by ImageJ in the JAR file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..33ce5e2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+json-simple
diff --git a/debian/rules b/debian/rules
index c8541ad..36e6248 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,17 @@
#!/usr/bin/make -f
+JSON_SIMPLE_JAR = /usr/share/java/json-simple.jar
+
%:
dh $@ --parallel --builddirectory=Build
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_JAVA_INCLUDE_PATH=${JSON_SIMPLE_JAR}
+
+override_dh_auto_install:
+ dh_auto_install
+ dh_link ${JSON_SIMPLE_JAR} usr/share/imagej/plugins/Orthanc_Import_json-simple.jar
+
override_dh_installchangelogs:
dh_installchangelogs -k NEWS
diff --git a/debian/watch b/debian/watch
index 958b919..dd18396 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
+opts="repacksuffix=+dfsg,dversionmangle=s/\+dfsg//g" \
https://github.com/jodogne/Orthanc/releases .*/download/[^/]+/OrthancImageJ-(\d\S*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc-imagej.git
More information about the debian-med-commit
mailing list