[med-svn] [imagej] 05/10: Remove core ImageJ macros from the macros directory

[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 c15ed55e3bd5812484ea296fa6e6061d9416ab29
Author: Carnë Draug <carandraug+dev at gmail.com>
Date:   Thu Aug 24 14:06:07 2017 +0100

    Remove core ImageJ macros from the macros directory
---
 debian/changelog                |  2 ++
 debian/dirs                     |  1 +
 debian/imagej.install           |  1 -
 debian/imagej.lintian-overrides | 14 +++++++++-----
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61084b4..7842345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ imagej (1.51p+dfsg-1) UNRELEASED; urgency=medium
     plugins that were distributed in compiled from upstream.  While
     upstream also distributes the corresponding source, their dependencies
     are not free software and MacOS specific.
+  * The ImageJ macros have been removed from the macros directory since
+    they already are in the ij.jar file.
   * The pixmap file microscope.xpm has been removed and replaced with an
     higher quality icon in the hicolor icon theme directory, the same as
     the upstream binary distribution.
diff --git a/debian/dirs b/debian/dirs
index f1c5378..8114c28 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,3 @@
+usr/share/imagej/macros
 usr/share/imagej/plugins
 usr/share/imagej/luts
diff --git a/debian/imagej.install b/debian/imagej.install
index e5dd570..6a9af5d 100644
--- a/debian/imagej.install
+++ b/debian/imagej.install
@@ -1,4 +1,3 @@
 debian/extra/imagej1.png    usr/share/icons/hicolor/128x128/apps
-build/macros/*              usr/share/imagej/macros
 debian/imagej.desktop       usr/share/applications
 debian/extra/imagej         usr/bin
diff --git a/debian/imagej.lintian-overrides b/debian/imagej.lintian-overrides
index 7ccabd4..0aa2e7f 100644
--- a/debian/imagej.lintian-overrides
+++ b/debian/imagej.lintian-overrides
@@ -1,8 +1,12 @@
 # We want this empty directories so that users, sysadmin, and other
-# packages can drop new plugins and luts inside.  Upstream binary
-# releases also comes with this directories.  Upstream did not have
-# them empty but: the two plugins inside were MacOS specific, cannot
-# be built from source, and so have been removed; the luts are for
-# some reason not included in the source release.
+# packages can drop new macros, plugins, and luts inside.  Upstream
+# binary releases also comes with this directories.  Upstream did not
+# have them empty but: the two plugins inside were MacOS specific,
+# cannot be built from source, and so have been removed; the luts are
+# for some reason not included in the source release; the macros that
+# are part of the source release are included in the jar file while
+# the ones in the directory are like the luts, missing in the source
+# release.
+imagej: package-contains-empty-directory usr/share/imagej/macros/
 imagej: package-contains-empty-directory usr/share/imagej/plugins/
 imagej: package-contains-empty-directory usr/share/imagej/luts/

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