This is an automated email from the git hooks/post-receive script. carandraug-guest pushed a commit to branch master in repository imagej.
commit 1597529a56bbecb9556561cdd7240edc10a564e5 Author: Carnë Draug <[email protected]> Date: Tue Sep 26 14:24:29 2017 +0100 d/patches/*: drop patches for issues fixed on new upstream release --- debian/patches/drop-mac-plugins.patch | 2 +- debian/patches/exclude-quilt-from-ant.patch | 20 ---------------- debian/patches/fix-javadocs-syntax.patch | 36 ----------------------------- debian/patches/link-javadocs.patch | 2 +- debian/patches/series | 3 --- debian/patches/specify-javac-encoding.patch | 28 ---------------------- 6 files changed, 2 insertions(+), 89 deletions(-) diff --git a/debian/patches/drop-mac-plugins.patch b/debian/patches/drop-mac-plugins.patch index b17b673..b332af5 100644 --- a/debian/patches/drop-mac-plugins.patch +++ b/debian/patches/drop-mac-plugins.patch @@ -12,7 +12,7 @@ Author: Carnë Draug <[email protected]> Last-Update: 2017-08-12 --- a/build.xml +++ b/build.xml -@@ -22,8 +22,6 @@ +@@ -16,8 +16,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" /> diff --git a/debian/patches/exclude-quilt-from-ant.patch b/debian/patches/exclude-quilt-from-ant.patch deleted file mode 100644 index 7ae5f5e..0000000 --- a/debian/patches/exclude-quilt-from-ant.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Excludes the quilt management directory from the build system. - See https://bugs.debian.org/600997 - Requested upstream to set srcdir to ij only, see - https://list.nih.gov/cgi-bin/wa.exe?A2=ind1708&L=IMAGEJ&F=&S=&P=85184 - a change which will be part of the upcoming release 1.51q - https://list.nih.gov/cgi-bin/wa.exe?A2=ind1709&L=IMAGEJ&F=&S=&P=5120 -Author: Miguel Landaeta <[email protected]> -Forwarded: yes ---- a/build.xml -+++ b/build.xml -@@ -10,6 +10,9 @@ - <!-- The plugins directory only needs to be - present at runtime, not at build time. --> - <exclude name="plugins/**"/> -+ <!-- The quilt management directory needs to be excluded -+ or some classes will not build due to duplicated classes errors --> -+ <exclude name=".pc/**"/> - </javac> - </target> - diff --git a/debian/patches/fix-javadocs-syntax.patch b/debian/patches/fix-javadocs-syntax.patch deleted file mode 100644 index 6f33ace..0000000 --- a/debian/patches/fix-javadocs-syntax.patch +++ /dev/null @@ -1,36 +0,0 @@ -Description: Fix syntax for javadoc - Requested upstream to fix, see - https://list.nih.gov/cgi-bin/wa.exe?A2=ind1708&L=IMAGEJ&F=&S=&P=85184 - a change which will be part of the upcoming release 1.51q - https://list.nih.gov/cgi-bin/wa.exe?A2=ind1709&L=IMAGEJ&F=&S=&P=5120 -Author: Carnë Draug <[email protected]> -Last-Update: 2017-08-26 ---- a/ij/gui/Roi.java -+++ b/ij/gui/Roi.java -@@ -569,7 +569,7 @@ - - /** Returns the coordinates of the pixels inside this ROI as a FloatPolygon. - * @see #getContainedPoints() -- * @see #Iterator() -+ * @see #iterator() - */ - public FloatPolygon getContainedFloatPoints() { - Roi roi2 = this; -@@ -598,7 +598,7 @@ - * ax, ay, bx, by: points A and B of line segment - * cx, cy, rad: Circle center and radius. - * ignoreOutside: if true, ignores intersections outside the line segment A-B -- * @Returns an array of 0, 2 or 4 coordinates (for 0, 1, or 2 intersection -+ * @return an array of 0, 2 or 4 coordinates (for 0, 1, or 2 intersection - * points). If two intersection points are returned, they are listed in travel - * direction A->B - * </pre> -@@ -2139,7 +2139,7 @@ - } - - /** -- * Required by the {@link Interable} interface. -+ * Required by the {@link Iterable} interface. - * Use to iterate over the contained coordinates. Usage example: - * <pre> - * for (Point p : roi) { diff --git a/debian/patches/link-javadocs.patch b/debian/patches/link-javadocs.patch index ab8727e..6afd8c2 100644 --- a/debian/patches/link-javadocs.patch +++ b/debian/patches/link-javadocs.patch @@ -3,7 +3,7 @@ Author: Carnë Draug <[email protected]> Last-Update: 2017-08-24 --- a/build.xml +++ b/build.xml -@@ -66,6 +66,7 @@ +@@ -61,6 +61,7 @@ author="true" version="true" use="true" diff --git a/debian/patches/series b/debian/patches/series index 91efa7f..18ad7da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ -exclude-quilt-from-ant.patch drop-mac-plugins.patch -specify-javac-encoding.patch -fix-javadocs-syntax.patch link-javadocs.patch diff --git a/debian/patches/specify-javac-encoding.patch b/debian/patches/specify-javac-encoding.patch deleted file mode 100644 index f0d54bb..0000000 --- a/debian/patches/specify-javac-encoding.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: specify file encoding for java compiler and javadoc - The file ij/process/AutoThresholder.java has some weird whitespace - characters and so the encoding needs to be specified. - Requested upstream to fix, see - https://list.nih.gov/cgi-bin/wa.exe?A2=ind1708&L=IMAGEJ&F=&S=&P=85184 - a change which will be part of the upcoming release 1.51q - https://list.nih.gov/cgi-bin/wa.exe?A2=ind1709&L=IMAGEJ&F=&S=&P=5120 -Author: Carnë Draug <[email protected]> -Last-Update: 2017-08-23 ---- a/build.xml -+++ b/build.xml -@@ -6,7 +6,7 @@ - <!-- First, ensure the build directory exists. --> - <mkdir dir="build" /> - <!-- Build everything; add debug="on" to debug --> -- <javac srcdir="." destdir="build" optimize="on" source="1.5" target="1.5" debug="on" includeantruntime="false"> -+ <javac srcdir="." destdir="build" optimize="on" source="1.5" target="1.5" debug="on" includeantruntime="false" encoding="utf-8"> - <!-- The plugins directory only needs to be - present at runtime, not at build time. --> - <exclude name="plugins/**"/> -@@ -60,6 +60,7 @@ - <mkdir dir="../api" /> - <javadoc - sourcepath="." -+ encoding="utf-8" - packagenames="ij.*" - destdir="../api" - author="true" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/imagej.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
