[med-svn] [imagej] 07/09: Do not include the MacAdapter and MacClipboard plugins.

[Carnë Draug]

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

carandraug-guest pushed a commit to branch master
in repository imagej.

commit cc79425ffb7a365bd2a550473a61a56e11a44014
Author: Carnë Draug <carandraug+dev at gmail.com>
Date:   Sat Aug 12 04:28:59 2017 +0100

    Do not include the MacAdapter and MacClipboard plugins.
    
    These are not actually from source, upstream distributes as both
    source and compiled forms, but the build rules simply copy files
    over.  They are MacOS specific plugins.
---
 debian/changelog                      |  5 +++++
 debian/dirs                           |  1 +
 debian/imagej.lintian-overrides       |  6 ++++++
 debian/install                        |  1 -
 debian/patches/drop-mac-plugins.patch | 23 +++++++++++++++++++++++
 debian/patches/series                 |  1 +
 6 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a16ee36..46eb552 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ imagej (1.51p+dfsg-1) UNRELEASED; urgency=medium
     and configures the ImageJ menu.
   * Simplify installation of the imagej wrapper script by making use of
     d/install only.
+  * The MacAdapter.class and MacClipboard.class files have been removed
+    from both ij.jar and the plugins directory.  These are MacOS specific
+    plugins that were distributed in compiled from upstream.  While
+    upstream also distributes the corresponding source, their dependencies
+    are not free software and MacOS specific.
 
  -- Andreas Tille <tille at debian.org>  Sat, 12 Aug 2017 00:29:11 +0200
 
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..db0cbfb
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/imagej/plugins
diff --git a/debian/imagej.lintian-overrides b/debian/imagej.lintian-overrides
new file mode 100644
index 0000000..19058fe
--- /dev/null
+++ b/debian/imagej.lintian-overrides
@@ -0,0 +1,6 @@
+# We want this empty directory so that users, sysadmin, and other
+# packages can drop new plugins inside.  Upstream also comes with this
+# directory.  Upstream did not have it empty but the two plugins
+# inside were MacOS specific, cannot be built from source, and so have
+# been removed.
+imagej: package-contains-empty-directory usr/share/imagej/plugins/
diff --git a/debian/install b/debian/install
index d192ed0..72f194f 100644
--- a/debian/install
+++ b/debian/install
@@ -1,7 +1,6 @@
 debian/extra/luts/*         usr/share/imagej/luts
 debian/extra/microscope.xpm usr/share/pixmaps
 ij.jar                      usr/share/java
-plugins/*.class             usr/share/imagej/plugins
 build/macros/*              usr/share/imagej/macros
 debian/imagej.desktop       usr/share/applications
 debian/extra/imagej         usr/bin
diff --git a/debian/patches/drop-mac-plugins.patch b/debian/patches/drop-mac-plugins.patch
new file mode 100644
index 0000000..b17b673
--- /dev/null
+++ b/debian/patches/drop-mac-plugins.patch
@@ -0,0 +1,23 @@
+Description: Drop the non-buildable and MacOS specific plugins
+ ImageJ is released with two plugins, both of which are specific to
+ MacOS.  These are MacAdapter and MacClipboard. They are distributed
+ in both source and compiled form but during the build, these are not
+ actually built, the *.java files are simply copied into the jar file.
+ This files cannot be built.  MacAdapter makes use of com.apple.eawt
+ (an Apple Java extension for integrating Java programs with the MacOS
+ environment).  MacClipboard makes uses of QuickTime java libraries at
+ runtime.  This patch simply drops those files.  They have non-free
+ dependencies and are useless in a Debian systemm.
+Author: Carnë Draug <carandraug+dev at gmail.com>
+Last-Update: 2017-08-12
+--- a/build.xml
++++ b/build.xml
+@@ -22,8 +22,6 @@
+     <copy file="IJ_Props.txt" todir="build" />
+     <copy file="images/microscope.gif" tofile="build/microscope.gif" />
+     <copy file="images/about.jpg" tofile="build/about.jpg" />
+-	<copy file="plugins/MacAdapter.class" tofile="build/MacAdapter.class" /> 
+-	<copy file="plugins/MacClipboard.class" tofile="build/MacClipboard.class" /> 
+     <copy todir="build/macros"><fileset dir="macros"/></copy>
+     <!-- Build ij.jar. -->
+     <jar jarfile="ij.jar" basedir="build"
diff --git a/debian/patches/series b/debian/patches/series
index e825b6c..11b66c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 exclude-quilt-from-ant.patch
+drop-mac-plugins.patch

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