[med-svn] [libjloda-java] 04/05: Adapt patches

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libjloda-java.

commit 6522efe00e0752663734c7d160faae77af1a4c7a
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 3 11:55:42 2017 +0200

    Adapt patches
---
 debian/patches/fix_build_xml.patch     |  7 ++--
 debian/patches/remove_applestuff.patch | 76 +++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/debian/patches/fix_build_xml.patch b/debian/patches/fix_build_xml.patch
index 7763f83..ff5499e 100644
--- a/debian/patches/fix_build_xml.patch
+++ b/debian/patches/fix_build_xml.patch
@@ -4,15 +4,14 @@ Description: Fix classpath
 
 --- a/antbuild/build.xml
 +++ b/antbuild/build.xml
-@@ -2,9 +2,8 @@
+@@ -7,8 +7,8 @@
  
  
- 	<path id="build.classpath">
+     <path id="build.classpath">
 -	    <fileset dir="../../jloda/jars"  includes="*.jar"/>
 -    	    <fileset dir="../../jloda/jars/batik-1.8"  includes="*.jar"/>
--
 +            <fileset dir="../jars"  includes="*.jar"/>
 +            <fileset dir="/usr/share/java" includes="**/*.jar"/>
-     </path>
  
+     </path>
  
diff --git a/debian/patches/remove_applestuff.patch b/debian/patches/remove_applestuff.patch
index 5af7745..b74a921 100644
--- a/debian/patches/remove_applestuff.patch
+++ b/debian/patches/remove_applestuff.patch
@@ -2,12 +2,49 @@ Author: Andreas Tille <tille at debian.org>
 Last-Update: Tue, 11 Oct 2016 20:08:16 +0200
 Description: We are not building for Apple
 
+--- a/src/jloda/gui/commands/MenuCreator.java
++++ b/src/jloda/gui/commands/MenuCreator.java
+@@ -19,7 +19,6 @@
+ */
+ package jloda.gui.commands;
+ 
+-import jloda.gui.AppleStuff;
+ import jloda.gui.IMenuModifier;
+ import jloda.util.MenuMnemonics;
+ import jloda.util.ProgramProperties;
+@@ -148,7 +147,7 @@ public class MenuCreator {
+                         switch (label) {
+                             case "Quit": {
+                                 final Action action = createAction(command);
+-                                AppleStuff.getInstance().setQuitAction(action);
++                                /* AppleStuff.getInstance().setQuitAction(action); */
+                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
+                                     skipNextSeparator = true;
+                                 }
+@@ -158,7 +157,7 @@ public class MenuCreator {
+                             case "About":
+                             case "About...": {
+                                 final Action action = createAction(command);
+-                                AppleStuff.getInstance().setAboutAction(action);
++                                /* AppleStuff.getInstance().setAboutAction(action); */
+                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
+                                     skipNextSeparator = true;
+                                 }
+@@ -168,7 +167,7 @@ public class MenuCreator {
+                             case "Preferences":
+                             case "Preferences...": {
+                                 final Action action = createAction(command);
+-                                AppleStuff.getInstance().setPreferencesAction(action);
++                                /* AppleStuff.getInstance().setPreferencesAction(action); */
+                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
+                                     skipNextSeparator = true;
+                                 }
 --- a/src/jloda/gui/AppleStuff.java
 +++ /dev/null
 @@ -1,109 +0,0 @@
 -/**
 - * AppleStuff.java 
-- * Copyright (C) 2016 Daniel H. Huson
+- * Copyright (C) 2017 Daniel H. Huson
 - *
 - * (Some files contain contributions from other authors, who are then mentioned separately.)
 - *
@@ -114,40 +151,3 @@ Description: We are not building for Apple
 -    }
 -
 -}
---- a/src/jloda/gui/commands/MenuCreator.java
-+++ b/src/jloda/gui/commands/MenuCreator.java
-@@ -19,7 +19,6 @@
- */
- package jloda.gui.commands;
- 
--import jloda.gui.AppleStuff;
- import jloda.gui.IMenuModifier;
- import jloda.util.MenuMnemonics;
- import jloda.util.ProgramProperties;
-@@ -146,7 +145,7 @@ public class MenuCreator {
-                         switch (label) {
-                             case "Quit": {
-                                 final Action action = createAction(command);
--                                AppleStuff.getInstance().setQuitAction(action);
-+                                /* AppleStuff.getInstance().setQuitAction(action); */
-                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
-                                     skipNextSeparator = true;
-                                 }
-@@ -156,7 +155,7 @@ public class MenuCreator {
-                             case "About":
-                             case "About...": {
-                                 final Action action = createAction(command);
--                                AppleStuff.getInstance().setAboutAction(action);
-+                                /* AppleStuff.getInstance().setAboutAction(action); */
-                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
-                                     skipNextSeparator = true;
-                                 }
-@@ -166,7 +165,7 @@ public class MenuCreator {
-                             case "Preferences":
-                             case "Preferences...": {
-                                 final Action action = createAction(command);
--                                AppleStuff.getInstance().setPreferencesAction(action);
-+                                /* AppleStuff.getInstance().setPreferencesAction(action); */
-                                 if (menu.getItemCount() > 0 && menu.getItem(menu.getItemCount() - 1) == null) {
-                                     skipNextSeparator = true;
-                                 }

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