Author: apeeters-guest Date: 2008-07-16 19:39:58 +0000 (Wed, 16 Jul 2008) New Revision: 6702
Added: trunk/libgrinvin-core-java/debian/patches/remove-macosx-support.diff trunk/libgrinvin-core-java/debian/patches/series Removed: trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.Grinvin.java.patch trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.MacOSXHandler.java.patch trunk/libgrinvin-core-java/debian/patches/org.grinvin.preferences.GrinvinPreferences.java.patch Modified: trunk/libgrinvin-core-java/debian/changelog trunk/libgrinvin-core-java/debian/control trunk/libgrinvin-core-java/debian/rules Log: Switch patch system to quilt Modified: trunk/libgrinvin-core-java/debian/changelog =================================================================== --- trunk/libgrinvin-core-java/debian/changelog 2008-07-16 19:29:28 UTC (rev 6701) +++ trunk/libgrinvin-core-java/debian/changelog 2008-07-16 19:39:58 UTC (rev 6702) @@ -1,6 +1,12 @@ libgrinvin-core-java (1.2-1) UNRELEASED; urgency=low * New upstream release + * Use quilt as patch system and update patches accordingly + * debian/control: + - Removed Build-Depends: patchutils + - Added Build-Depends: quilt + * debian/rules: + - Use patchsys-quilt.mk instead of simple-patchsys.mk -- Adriaan Peeters <[EMAIL PROTECTED]> Wed, 16 Jul 2008 19:28:31 +0000 Modified: trunk/libgrinvin-core-java/debian/control =================================================================== --- trunk/libgrinvin-core-java/debian/control 2008-07-16 19:29:28 UTC (rev 6701) +++ trunk/libgrinvin-core-java/debian/control 2008-07-16 19:39:58 UTC (rev 6702) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Adriaan Peeters <[EMAIL PROTECTED]> Homepage: http://www.grinvin.org/ -Build-Depends: debhelper (>> 5.0.0), cdbs, patchutils, ant, java-gcj-compat-dev, libgui-commands-java (>= 1.1.42), libjdom1-java, libjmathtex-java, libswirl-java, javahelp2, libbatik-java +Build-Depends: debhelper (>> 5.0.0), cdbs, quilt, ant, java-gcj-compat-dev, libgui-commands-java (>= 1.1.42), libjdom1-java, libjmathtex-java, libswirl-java, javahelp2, libbatik-java Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libgrinvin-core-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgrinvin-core-java/ Standards-Version: 3.7.3 Deleted: trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.Grinvin.java.patch =================================================================== --- trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.Grinvin.java.patch 2008-07-16 19:29:28 UTC (rev 6701) +++ trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.Grinvin.java.patch 2008-07-16 19:39:58 UTC (rev 6702) @@ -1,13 +0,0 @@ ---- org/grinvin/grinvin/Grinvin.java 2007-06-18 09:50:00.000000000 +0200 -+++ org/grinvin/grinvin/Grinvin.java.new 2007-10-05 10:54:29.000000000 +0200 -@@ -107,10 +107,6 @@ - // install url stream handler - URL.setURLStreamHandlerFactory(new GrinvinURLStreamHandlerFactory()); - -- // install about handler -- if (GrinvinPreferences.INSTANCE.getOsType() == OsType.MAC_OS_X) -- new MacOSXHandler(); -- - // don't hide tooltips - ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE); - Deleted: trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.MacOSXHandler.java.patch =================================================================== --- trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.MacOSXHandler.java.patch 2008-07-16 19:29:28 UTC (rev 6701) +++ trunk/libgrinvin-core-java/debian/patches/org.grinvin.grinvin.MacOSXHandler.java.patch 2008-07-16 19:39:58 UTC (rev 6702) @@ -1,95 +0,0 @@ ---- org/grinvin/grinvin/MacOSXHandler.java 2007-06-18 09:50:02.000000000 +0200 -+++ org/grinvin/grinvin/MacOSXHandler.java.new 2007-10-05 10:16:58.000000000 +0200 -@@ -1,92 +0,0 @@ --/* MacOSXHandler.java -- * ========================================================================= -- * This file is part of the GrInvIn project - http://www.grinvin.org -- * -- * Copyright (C) 2005-2007 Universiteit Gent -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or (at -- * your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more details. -- * -- * A copy of the GNU General Public License can be found in the file -- * LICENSE.txt provided with the source distribution of this program (see -- * the META-INF directory in the source jar). This license can also be -- * found on the GNU website at http://www.gnu.org/licenses/gpl.html. -- * -- * If you did not receive a copy of the GNU General Public License along -- * with this program, contact the lead developer, or write to the Free -- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -- * 02110-1301, USA. -- */ -- --package org.grinvin.grinvin; -- --import com.apple.eawt.Application; --import com.apple.eawt.ApplicationAdapter; --import com.apple.eawt.ApplicationEvent; -- --import java.util.ResourceBundle; --import java.util.logging.Level; --import java.util.logging.Logger; -- --import org.grinvin.about.AboutDialog; --import org.grinvin.workspace.Workspace; --import org.grinvin.workspace.WorkspaceException; -- --/** -- * Handle the OSX events. -- */ --public class MacOSXHandler extends Application { -- -- // -- private static final ResourceBundle BUNDLE -- = ResourceBundle.getBundle("org.grinvin.grinvin.resources"); -- -- // -- public MacOSXHandler() { -- addApplicationListener(new AboutBoxHandler()); -- addApplicationListener(new QuitHandler()); -- } -- -- // -- private class AboutBoxHandler extends ApplicationAdapter { -- -- AboutBoxHandler() { -- // avoid creation of access type -- } -- -- // -- public void handleAbout(ApplicationEvent event) { -- new AboutDialog(null).setVisible(true); -- event.setHandled(true); -- } -- -- } -- -- private class QuitHandler extends ApplicationAdapter { -- -- QuitHandler() { -- // avoid creation of access type -- } -- -- // -- public void handleQuit(ApplicationEvent event) { -- event.setHandled(false); -- try { -- Workspace.getInstance().save(); -- } catch (WorkspaceException ex) { -- Logger.getLogger("org.grinvin.io").log(Level.SEVERE, BUNDLE.getString("workspace.savefailed.text"), ex); -- } -- System.exit(0); -- } -- -- } -- -- --} Deleted: trunk/libgrinvin-core-java/debian/patches/org.grinvin.preferences.GrinvinPreferences.java.patch =================================================================== --- trunk/libgrinvin-core-java/debian/patches/org.grinvin.preferences.GrinvinPreferences.java.patch 2008-07-16 19:29:28 UTC (rev 6701) +++ trunk/libgrinvin-core-java/debian/patches/org.grinvin.preferences.GrinvinPreferences.java.patch 2008-07-16 19:39:58 UTC (rev 6702) @@ -1,25 +0,0 @@ ---- org/grinvin/preferences/GrinvinPreferences.java 2007-06-18 09:50:02.000000000 +0200 -+++ org/grinvin/preferences/GrinvinPreferences.java.new 2007-10-05 10:20:24.000000000 +0200 -@@ -27,8 +27,6 @@ - - package org.grinvin.preferences; - --import com.apple.eio.FileManager; -- - import java.io.File; - import java.io.FileNotFoundException; - import java.io.IOException; -@@ -160,12 +158,7 @@ - } else if (key == Preference.GRINVIN_BIN_DIR) { - String defaultValue; - if (osType == OsType.MAC_OS_X) { -- try { -- defaultValue = FileManager.getResource("benzene"); -- defaultValue = defaultValue.substring(0,defaultValue.lastIndexOf('/')); -- } catch (FileNotFoundException ex) { -- defaultValue = null; -- } -+ throw new RuntimeException("Invalid Os Type: MAC_OS_X"); - } else if (osType == OsType.WINDOWS) { - assert systemPreferences != null : "System preferences not available"; - defaultValue = systemPreferences.get(key.getId(), null); Added: trunk/libgrinvin-core-java/debian/patches/remove-macosx-support.diff =================================================================== --- trunk/libgrinvin-core-java/debian/patches/remove-macosx-support.diff (rev 0) +++ trunk/libgrinvin-core-java/debian/patches/remove-macosx-support.diff 2008-07-16 19:39:58 UTC (rev 6702) @@ -0,0 +1,111 @@ +Index: grinvin-core-1.2/org/grinvin/Grinvin.java +=================================================================== +--- grinvin-core-1.2.orig/org/grinvin/Grinvin.java 2008-07-16 19:32:12.000000000 +0000 ++++ grinvin-core-1.2/org/grinvin/Grinvin.java 2008-07-16 19:33:04.000000000 +0000 +@@ -83,10 +83,6 @@ + // install url stream handler + URL.setURLStreamHandlerFactory(new GrinvinURLStreamHandlerFactory()); + +- // install about handler on Mac OS X +- if (GrinvinPreferences.getInstance().getOsType() == OsType.MAC_OS_X) +- new MacOSXHandler(); +- + // don't hide tooltips + ToolTipManager.sharedInstance().setDismissDelay(Integer.MAX_VALUE); + +Index: grinvin-core-1.2/org/grinvin/main/MacOSXHandler.java +=================================================================== +--- grinvin-core-1.2.orig/org/grinvin/main/MacOSXHandler.java 2008-07-16 19:32:21.000000000 +0000 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,64 +0,0 @@ +-/* MacOSXHandler.java +- * ========================================================================= +- * This file is part of the GrInvIn project - http://www.grinvin.org +- * +- * Copyright (C) 2005-2008 Universiteit Gent +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or (at +- * your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, but +- * WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * A copy of the GNU General Public License can be found in the file +- * LICENSE.txt provided with the source distribution of this program (see +- * the META-INF directory in the source jar). This license can also be +- * found on the GNU website at http://www.gnu.org/licenses/gpl.html. +- * +- * If you did not receive a copy of the GNU General Public License along +- * with this program, contact the lead developer, or write to the Free +- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +- * 02110-1301, USA. +- */ +- +-package org.grinvin.main; +- +-import com.apple.eawt.Application; +-import com.apple.eawt.ApplicationAdapter; +-import com.apple.eawt.ApplicationEvent; +- +-import org.grinvin.about.AboutDialog; +-import org.grinvin.main.actions.Exit; +- +-/** +- * Handle the OSX events. +- */ +-public class MacOSXHandler extends Application { +- +- // +- public MacOSXHandler() { +- addApplicationListener(new AboutBoxHandler()); +- addApplicationListener(new QuitHandler()); +- } +- +- // +- private static class AboutBoxHandler extends ApplicationAdapter { +- @Override +- public void handleAbout(ApplicationEvent event) { +- new AboutDialog().setVisible(true); +- event.setHandled(true); +- } +- } +- +- private static class QuitHandler extends ApplicationAdapter { +- public void handleQuit(ApplicationEvent event) { +- event.setHandled(false); +- Exit.handleExit(); +- } +- } +- +-} +Index: grinvin-core-1.2/org/grinvin/preferences/GrinvinPreferences.java +=================================================================== +--- grinvin-core-1.2.orig/org/grinvin/preferences/GrinvinPreferences.java 2008-07-16 19:32:30.000000000 +0000 ++++ grinvin-core-1.2/org/grinvin/preferences/GrinvinPreferences.java 2008-07-16 19:34:17.000000000 +0000 +@@ -27,8 +27,6 @@ + + package org.grinvin.preferences; + +-import com.apple.eio.FileManager; +- + import java.io.File; + import java.io.FileNotFoundException; + import java.io.IOException; +@@ -170,12 +168,7 @@ + if (key == Preference.GRINVIN_BIN_DIR) { + String defaultValue; + if (osType == OsType.MAC_OS_X) { +- try { +- defaultValue = FileManager.getResource("benzene"); +- defaultValue = defaultValue.substring(0,defaultValue.lastIndexOf('/')); +- } catch (FileNotFoundException ex) { +- defaultValue = null; +- } ++ throw new RuntimeException("Invalid Os Type: MAC_OS_X"); + } else if (osType == OsType.WINDOWS) { + assert systemPreferences != null : "System preferences not available"; + defaultValue = systemPreferences.get(key.getId(), null); Added: trunk/libgrinvin-core-java/debian/patches/series =================================================================== --- trunk/libgrinvin-core-java/debian/patches/series (rev 0) +++ trunk/libgrinvin-core-java/debian/patches/series 2008-07-16 19:39:58 UTC (rev 6702) @@ -0,0 +1 @@ +remove-macosx-support.diff Modified: trunk/libgrinvin-core-java/debian/rules =================================================================== --- trunk/libgrinvin-core-java/debian/rules 2008-07-16 19:29:28 UTC (rev 6701) +++ trunk/libgrinvin-core-java/debian/rules 2008-07-16 19:39:58 UTC (rev 6702) @@ -1,7 +1,7 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/java-gcj _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
