Author: tiagosab-guest
Date: 2010-02-21 20:30:56 +0000 (Sun, 21 Feb 2010)
New Revision: 11672
Added:
trunk/omegat/debian/README.source
trunk/omegat/debian/patches/01-extra-jars-in-new-location.patch
trunk/omegat/debian/patches/03-location-of-help-files.patch
trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.patch
trunk/omegat/debian/patches/05-remove-jmyspell-alternative.patch
trunk/omegat/debian/patches/06-use-external-hunspell.patch
trunk/omegat/debian/patches/series
trunk/omegat/debian/source/
trunk/omegat/debian/source/format
Removed:
trunk/omegat/debian/patches/00list
trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch
trunk/omegat/debian/patches/03-location-of-help-files.dpatch
trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch
trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch
trunk/omegat/debian/patches/06-use-external-hunspell.dpatch
trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch
Modified:
trunk/omegat/debian/ant.properties
trunk/omegat/debian/changelog
trunk/omegat/debian/control
trunk/omegat/debian/copyright
trunk/omegat/debian/omegat.sh
trunk/omegat/debian/repack-source.sh
trunk/omegat/debian/rules
Log:
omegat (2.0.5.2+dfsg-1) unstable; urgency=low
* New upstream release (Closes: #558708).
* debian/repack-source.sh: fix repackaged file name.
* Bug fix: "spelling mistake in runtime dependencies of omegat", thanks
to Rolf Leggewie (Closes: #522655).
* Bug fix: "startup script choose to use openjdk, ignoring
alternatives.", thanks to Satoru KURASHIKI (Closes: #526239).
* Bug fix: "debhelper but no ${misc:Depends}", thanks to lintian.
* Bug fix: "patch system but no source readme", thanks to lintian.
* Bump policy version (no changes needed).
* Change to quilt patching system.
* Switch to dpkg-source 3.0 (quilt) format
-- Tiago Saboga <tiagosab...@gmail.com> Sun, 21 Feb 2010 16:49:48 -0300
Added: trunk/omegat/debian/README.source
===================================================================
--- trunk/omegat/debian/README.source (rev 0)
+++ trunk/omegat/debian/README.source 2010-02-21 20:30:56 UTC (rev 11672)
@@ -0,0 +1,6 @@
+This package uses the quilt system for maintaining patches.
+
+Please see /usr/share/doc/quilt/README.source for instructions
+about how to apply and deapply patches.
+
+ -- Tiago Saboga <tiagosab...@gmail.com>, Sun, 21 Feb 2010 15:51:02 -0300
Modified: trunk/omegat/debian/ant.properties
===================================================================
--- trunk/omegat/debian/ant.properties 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/ant.properties 2010-02-21 20:30:56 UTC (rev 11672)
@@ -5,12 +5,14 @@
file.reference.vldocking_2.0.6d.jar=/usr/share/java/vldocking.jar
file.reference.jna.jar=/usr/share/java/jna.jar
file.reference.swing-layout.jar=/usr/share/java/swing-layout.jar
+file.reference.copylibstaskbar=/usr/lib/netbeans/java1/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
javac.classpath=\
${reference.lib-mnemonics.jar}:\
${file.reference.htmlparser.jar}:\
${file.reference.vldocking_2.0.6d.jar}:\
${file.reference.jna.jar}:\
- ${file.reference.swing-layout.jar}
+ ${file.reference.swing-layout.jar}:\
+ ${file.reference.copylibstaskbar}
reference.lib-mnemonics.jar=lib-mnemonics/dist/lib-mnemonics.jar
javadoc.link=/usr/share/doc/classpath-doc/api
Modified: trunk/omegat/debian/changelog
===================================================================
--- trunk/omegat/debian/changelog 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/changelog 2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,3 +1,19 @@
+omegat (2.0.5.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release (Closes: #558708).
+ * debian/repack-source.sh: fix repackaged file name.
+ * Bug fix: "spelling mistake in runtime dependencies of omegat", thanks
+ to Rolf Leggewie (Closes: #522655).
+ * Bug fix: "startup script choose to use openjdk, ignoring
+ alternatives.", thanks to Satoru KURASHIKI (Closes: #526239).
+ * Bug fix: "debhelper but no ${misc:Depends}", thanks to lintian.
+ * Bug fix: "patch system but no source readme", thanks to lintian.
+ * Bump policy version (no changes needed).
+ * Change to quilt patching system.
+ * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Tiago Saboga <tiagosab...@gmail.com> Sun, 21 Feb 2010 16:49:48 -0300
+
omegat (1.8.1.2+dfsg-1) unstable; urgency=low
[ Tiago Saboga ]
Modified: trunk/omegat/debian/control
===================================================================
--- trunk/omegat/debian/control 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/control 2010-02-21 20:30:56 UTC (rev 11672)
@@ -3,18 +3,20 @@
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Tiago Saboga <tiagosab...@gmail.com>
-Build-Depends: debhelper (>= 7), openjdk-6-jdk, dpatch, ant
+Build-Depends: debhelper (>= 7), openjdk-6-jdk, ant
Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java,
- libhtmlparser-java, libjna-java, libswing-layout-java, tofrodos
+ libhtmlparser-java, libjna-java, libswing-layout-java, tofrodos,
+ netbeans-ide
Homepage: http://www.omegat.org/omegat/omegat.html
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/omegat
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/omegat
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
Package: omegat
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java5-jre,
- libvldocking-java, libhtmlparser-java, libswing-layout-java
+Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre,
+ libvldocking-java, libhtmlparser-java, libswing-layout-java,
+ netbeans-ide, ${misc:Depends}
Recommends: libjna-java, libhunspell-1.2-0
Description: Computer Assisted Translation (CAT) tool
OmegaT's main features are
Modified: trunk/omegat/debian/copyright
===================================================================
--- trunk/omegat/debian/copyright 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/copyright 2010-02-21 20:30:56 UTC (rev 11672)
@@ -8,9 +8,6 @@
OmegaT is originally the work of Keith Godfrey.
Marc Prior is the coordinator of the OmegaT project.
- Previous contributors include:
- (alphabetical order)
-
Code has been contributed by
Zoltan Bartko
Didier Briel (release manager)
@@ -42,20 +39,20 @@
Copyright 2008-2009 Didier Briel
Copyright 2007 Zoltan Bartko
Copyright 2007 Tiago Saboga
- Copyright 2007-2008 Alex Buloichik
- Copyright 2007-2008 Martin Fleurke
+ Copyright 2007-2009 Alex Buloichik
+ Copyright 2007-2009 Martin Fleurke
Copyright 2008 Fabian Mandelbaum
Copyright 2008 Josef Molnár (translation)
Copyright 2008 Jean-Christophe Helary (translation)
Copyright 2008 Dick Groskamp (translation)
Copyright 2008 Dragomir Kovačević (translation)
Copyright 2008 Vito Smolej (translation)
- Copyright 2006 Martin Wunderlich
+ Copyright 2006-2009 Martin Wunderlich
Copyright 2008 Andrzej Sawula
The documentation, except for the Instant Start Guide chapter, is
- Copyright 2007 Vito Smolej.
- The Instant Start Guide is Copyright 2005-2007 Samuel Murray.
+ Copyright 2009 Vito Smolej.
+ The Instant Start Guide is Copyright 2005-2009 Samuel Murray.
License:
@@ -69,7 +66,7 @@
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
License for more details.
- The Debian packaging is Copyright 2006-2009, Tiago Saboga
+ The Debian packaging is Copyright 2006-2010, Tiago Saboga
<tiagosab...@gmail.com> and is licensed under the GPL.
You should have received a copy of the GNU General Public License
Modified: trunk/omegat/debian/omegat.sh
===================================================================
--- trunk/omegat/debian/omegat.sh 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/omegat.sh 2010-02-21 20:30:56 UTC (rev 11672)
@@ -2,12 +2,21 @@
JAVA_OPTIONS='-Djava.library.path=/usr/lib/jni'
-if [ -x /usr/lib/jvm/java-6-openjdk/bin/java ]
- then JAVABIN=/usr/lib/jvm/java-6-openjdk/bin/java
+JAVA=$(which java | xargs readlink -f)
+
+echo "$JAVA" | grep -e '(openjdk|sun)'
+if [ $? -eq 0 ]
+then
+ JAVABIN=$JAVA
+elif [ -x /usr/lib/jvm/java-6-openjdk/bin/java ]
+then
+ JAVABIN="/usr/lib/jvm/java-6-openjdk/bin/java"
elif [ -x /usr/lib/jvm/java-6-sun/bin/java ]
- then JAVABIN=/usr/lib/jvm/java-6-sun/bin/java
+then
+ JAVABIN="/usr/lib/jvm/java-6-sun/bin/java"
elif [ -x /usr/lib/jvm/java-1.5.0-sun/bin/java ]
- then JAVABIN=/usr/lib/jvm/java-1.5.0-sun/bin/java
+then
+ JAVABIN="/usr/lib/jvm/java-1.5.0-sun/bin/java"
else
echo "Suitable java binary not found."
exit 1
Deleted: trunk/omegat/debian/patches/00list
===================================================================
--- trunk/omegat/debian/patches/00list 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/00list 2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,6 +0,0 @@
-01-extra-jars-in-new-location
-03-location-of-help-files
-04-get-rid-of-MRJAdapter
-05-remove-jmyspell-alternative
-06-use-external-hunspell
-07-set-default-dictionary-location
Deleted: trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch
===================================================================
--- trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch
2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch
2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01-extra-jars-in-new-location.dpatch by Tiago Saboga <tiagosab...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not specify paths in Class-path.
-
-...@dpatch@
-diff -urNad omegat-1.8.1.2+dfsg~/manifest-template.mf
omegat-1.8.1.2+dfsg/manifest-template.mf
---- omegat-1.8.1.2+dfsg~/manifest-template.mf 2009-02-09 21:03:32.000000000
-0200
-+++ omegat-1.8.1.2+dfsg/manifest-template.mf 2009-02-09 21:09:50.000000000
-0200
-@@ -3,7 +3,7 @@
- License: GNU Public License version 2
- Specification-Version: 1
- Implementation-Version: @version@
--Class-Path: lib/lib-mnemonics.jar lib/htmlparser.jar lib/MRJAdapter.jar
lib/vldocking_2.1.4.jar lib/jna.jar lib/swing-layout-1.0.jar
lib/retroweaver-rt-2.0.1.jar lib/jmyspell-core-1.0.0-beta-2-1.4.jar
lib/backport-util-concurrent.jar
-+Class-Path: omegat-lib-mnemonics.jar libhtmlparser.jar vldocking.jar jna.jar
swing-layout.jar
-
-
-
Added: trunk/omegat/debian/patches/01-extra-jars-in-new-location.patch
===================================================================
--- trunk/omegat/debian/patches/01-extra-jars-in-new-location.patch
(rev 0)
+++ trunk/omegat/debian/patches/01-extra-jars-in-new-location.patch
2010-02-21 20:30:56 UTC (rev 11672)
@@ -0,0 +1,20 @@
+Author: Tiago Saboga <tiagosab...@gmail.com>
+Description: Do not specify paths in Class-path.
+--- omegat-2.0.5.2+dfsg.orig/manifest-template.mf
++++ omegat-2.0.5.2+dfsg/manifest-template.mf
+@@ -3,4 +3,4 @@
+ License: GNU Public License version 2
+ Specification-Version: 1
+ Implementation-Version: @version@
+-Class-Path: lib/lib-mnemonics.jar lib/htmlparser.jar lib/MRJAdapter.jar
lib/vldocking_2.1.4.jar lib/jna.jar lib/swing-layout-1.0.jar
lib/jmyspell-core-1.0.0-beta-2.jar lib/activation.jar lib/jaxb-api.jar
lib/jaxb-impl.jar lib/jsr173_1.0_api.jar
++Class-Path: omegat-lib-mnemonics.jar libhtmlparser.jar vldocking.jar jna.jar
swing-layout.jar activation.jar jaxb-api.jar jaxb-impl.jar jsr173_1.0_api.jar
+--- omegat-2.0.5.2+dfsg.orig/nbproject/project.properties
++++ omegat-2.0.5.2+dfsg/nbproject/project.properties
+@@ -50,7 +50,6 @@
+ jnlp.enabled=false
+ jnlp.offline-allowed=false
+ jnlp.signed=false
+-libs.CopyLibs.classpath=nbproject/org-netbeans-modules-java-j2seproject-copylibstask.jar
+ jar.compress=true
+ javadoc.preview=true
+
Deleted: trunk/omegat/debian/patches/03-location-of-help-files.dpatch
===================================================================
--- trunk/omegat/debian/patches/03-location-of-help-files.dpatch
2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/03-location-of-help-files.dpatch
2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,111 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-location-of-help-files.dpatch by Tiago Saboga <tiagosab...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change location of help files.
-
-...@dpatch@
-diff -urNad omegat-1.7.2.dfsg0~/src/org/omegat/gui/HelpFrame.java
omegat-1.7.2.dfsg0/src/org/omegat/gui/HelpFrame.java
---- omegat-1.7.2.dfsg0~/src/org/omegat/gui/HelpFrame.java 2007-09-22
14:01:02.000000000 -0300
-+++ omegat-1.7.2.dfsg0/src/org/omegat/gui/HelpFrame.java 2007-11-10
12:43:20.000000000 -0200
-@@ -210,8 +210,7 @@
- StringBuffer templateText = new StringBuffer(1024);
- try {
- BufferedReader templateFile = new BufferedReader(new FileReader(
-- StaticUtils.installDir() + File.separator
-- + OConsts.HELP_DIR + File.separator
-+ OConsts.HELP_DIR + File.separator
- + OConsts.HELP_LANG_INDEX));
- for (String line = templateFile.readLine();
- line != null;
-@@ -229,7 +228,7 @@
- StringBuffer translations = new StringBuffer(1024);
- translations.append("<table>\n");
- File docDir = new File(
-- StaticUtils.installDir() + File.separator + OConsts.HELP_DIR);
-+ OConsts.HELP_DIR);
- File[] subDirs = docDir.listFiles();
- Arrays.sort(subDirs); // sort on alphabetical order
- for (int i = 0; i < subDirs.length; i++) {
-@@ -430,8 +429,7 @@
- {
- try {
- return "file:"
// NOI18N
-- + (new File( StaticUtils.installDir()
-- + File.separator + OConsts.HELP_DIR +
File.separator
-+ + (new File( OConsts.HELP_DIR + File.separator
- + m_language + File.separator +
file)).getCanonicalPath();
- }
- catch (IOException exception) {
-@@ -476,8 +474,7 @@
- private static String getDocVersion(String locale) {
- // Check if there's a manual for the specified locale
- // (Assume yes if the index file is there)
-- File index = new File(StaticUtils.installDir()
-- + File.separator + OConsts.HELP_DIR
-+ File index = new File(OConsts.HELP_DIR
- + File.separator + locale
- + File.separator + OConsts.HELP_HOME);
- if (!index.exists())
-@@ -485,8 +482,7 @@
-
- // Check if the doc dir for the specified locale
- // contains a file containing the doc version
-- File v = new File(StaticUtils.installDir()
-- + File.separator + OConsts.HELP_DIR
-+ File v = new File(OConsts.HELP_DIR
- + File.separator + locale
- + File.separator + "version.properties");
- if (!v.exists())
-diff -urNad omegat-1.7.2.dfsg0~/src/org/omegat/gui/main/MainWindow.java
omegat-1.7.2.dfsg0/src/org/omegat/gui/main/MainWindow.java
---- omegat-1.7.2.dfsg0~/src/org/omegat/gui/main/MainWindow.java
2007-09-20 09:52:52.000000000 -0300
-+++ omegat-1.7.2.dfsg0/src/org/omegat/gui/main/MainWindow.java 2007-11-10
12:43:20.000000000 -0200
-@@ -66,6 +66,7 @@
- import javax.swing.text.BadLocationException;
- import javax.swing.undo.CannotRedoException;
- import javax.swing.undo.CannotUndoException;
-+import net.roydesign.mac.MRJAdapter;
-
- import org.omegat.core.ProjectProperties;
- import org.omegat.core.StringEntry;
-@@ -502,8 +503,7 @@
- {
- String language = detectInstantStartLanguage();
- String filepath =
-- StaticUtils.installDir()
-- + File.separator + OConsts.HELP_DIR + File.separator
-+ OConsts.HELP_DIR + File.separator
- + language + File.separator
- + OConsts.HELP_INSTANT_START;
- JTextPane instantArticlePane = new JTextPane();
-@@ -534,16 +534,14 @@
- String country =
java.util.Locale.getDefault().getCountry().toUpperCase();
-
- // Check if there's a translation for the full locale (lang + country)
-- File isg = new File(StaticUtils.installDir()
-- + File.separator + OConsts.HELP_DIR
-+ File isg = new File(OConsts.HELP_DIR
- + File.separator + language + "_" + country
- + File.separator + OConsts.HELP_INSTANT_START);
- if (isg.exists())
- return language + "_" + country;
-
- // Check if there's a translation for the language only
-- isg = new File(StaticUtils.installDir()
-- + File.separator + OConsts.HELP_DIR
-+ isg = new File(OConsts.HELP_DIR
- + File.separator + language
- + File.separator + OConsts.HELP_INSTANT_START);
- if(isg.exists())
-diff -urNad omegat-1.7.2.dfsg0~/src/org/omegat/util/OConsts.java
omegat-1.7.2.dfsg0/src/org/omegat/util/OConsts.java
---- omegat-1.7.2.dfsg0~/src/org/omegat/util/OConsts.java 2006-12-02
01:02:34.000000000 -0200
-+++ omegat-1.7.2.dfsg0/src/org/omegat/util/OConsts.java 2007-11-10
12:43:20.000000000 -0200
-@@ -56,7 +56,7 @@
- // help
- public static final String HELP_HOME = "index.html";
// NOI18N
- public static final String HELP_INSTANT_START =
"instantStartGuideNoTOC.html";// NOI18N
-- public static final String HELP_DIR = "docs";
// NOI18N
-+ public static final String HELP_DIR =
"/usr/share/omegat/html-template"; // NOI18N
- public static final String HELP_LANG_INDEX = "languageIndex.html";
// NOI18N
-
- // status file consts
Added: trunk/omegat/debian/patches/03-location-of-help-files.patch
===================================================================
--- trunk/omegat/debian/patches/03-location-of-help-files.patch
(rev 0)
+++ trunk/omegat/debian/patches/03-location-of-help-files.patch 2010-02-21
20:30:56 UTC (rev 11672)
@@ -0,0 +1,25 @@
+Author: Tiago Saboga <tiagosab...@gmail.com>
+Description: Change location of help files.
+--- omegat-2.0.5.2+dfsg.orig/src/org/omegat/gui/help/HelpFrame.java
++++ omegat-2.0.5.2+dfsg/src/org/omegat/gui/help/HelpFrame.java
+@@ -174,8 +174,7 @@
+ } else {
+ path = filename;
+ }
+- File f = new File(StaticUtils.installDir() + File.separator
+- + OConsts.HELP_DIR + File.separator + path);
++ File f = new File(OConsts.HELP_DIR + File.separator + path);
+ try {
+ if (f.exists()) {
+ return f.toURI().toURL();
+--- omegat-2.0.5.2+dfsg.orig/src/org/omegat/util/OConsts.java
++++ omegat-2.0.5.2+dfsg/src/org/omegat/util/OConsts.java
+@@ -60,7 +60,7 @@
+ // help
+ public static final String HELP_HOME = "index.html";
// NOI18N
+ public static final String HELP_INSTANT_START =
"instantStartGuideNoTOC.html";// NOI18N
+- public static final String HELP_DIR = "docs";
// NOI18N
++ public static final String HELP_DIR =
"/usr/share/omegat/html-template"; // NOI18N
+ public static final String HELP_LANG_INDEX = "languageIndex.html";
// NOI18N
+
+ // status file consts
Deleted: trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch
===================================================================
--- trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch 2010-02-21
18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch 2010-02-21
20:30:56 UTC (rev 11672)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-get-rid-of-MRJAdapter.dpatch by Tiago Saboga <tiagosab...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove unneeded library (only useful to Mac OS).
-
-...@dpatch@
-diff -urNad omegat~/src/org/omegat/gui/main/MainWindow.java
omegat/src/org/omegat/gui/main/MainWindow.java
---- omegat~/src/org/omegat/gui/main/MainWindow.java 2009-02-09
22:42:07.000000000 -0200
-+++ omegat/src/org/omegat/gui/main/MainWindow.java 2009-02-09
22:42:07.000000000 -0200
-@@ -65,7 +65,6 @@
- import javax.swing.text.BadLocationException;
- import javax.swing.undo.CannotRedoException;
- import javax.swing.undo.CannotUndoException;
--import net.roydesign.mac.MRJAdapter;
-
- import org.omegat.core.ProjectProperties;
- import org.omegat.core.StringEntry;
-@@ -103,7 +102,6 @@
- import com.vlsolutions.swing.docking.ui.DockingUISettings;
- import javax.swing.text.AttributeSet;
-
--import net.roydesign.mac.MRJAdapter;
- import org.omegat.gui.dialogs.SpellcheckerConfigurationDialog;
- import org.omegat.util.Token;
-
-@@ -262,35 +260,8 @@
- uiUpdateOnProjectClose();
- initUIShortcuts();
-
-- try
-- {
-- // MacOSX-specific
-- MRJAdapter.addQuitApplicationListener(new ActionListener()
-- {
-- public void actionPerformed(ActionEvent e)
-- {
-- doQuit();
-- }
-- });
-- MRJAdapter.addAboutListener(new ActionListener()
-- {
-- public void actionPerformed(ActionEvent e)
-- {
-- doAbout();
-- }
-- });
-- }
-- catch(NoClassDefFoundError e)
-- {
-- Log.log(e);
-- }
--
-- // all except MacOSX
-- if(!StaticUtils.onMacOSX()) // NOI18N
-- {
-- projectMenu.add(separator2inProjectMenu);
-- projectMenu.add(projectExitMenuItem);
-- }
-+ projectMenu.add(separator2inProjectMenu);
-+ projectMenu.add(projectExitMenuItem);
-
- // Add Language submenu to Options menu
-
Added: trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.patch
===================================================================
--- trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.patch
(rev 0)
+++ trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.patch 2010-02-21
20:30:56 UTC (rev 11672)
@@ -0,0 +1,49 @@
+Author: Tiago Saboga <tiagosab...@gmail.com>
+Description: Remove unneeded library (only useful to Mac OS).
+--- omegat-2.0.5.2+dfsg.orig/src/org/omegat/gui/main/MainWindowMenu.java
++++ omegat-2.0.5.2+dfsg/src/org/omegat/gui/main/MainWindowMenu.java
+@@ -42,8 +42,6 @@
+ import javax.swing.JMenuItem;
+ import javax.swing.JSeparator;
+
+-import net.roydesign.mac.MRJAdapter;
+-
+ import org.omegat.core.Core;
+ import org.omegat.core.CoreEvents;
+ import org.omegat.core.events.IApplicationEventListener;
+@@ -214,8 +212,6 @@
+ setActionCommands();
+ MainWindowMenuShortcuts.setShortcuts(mainMenu);
+
+- initMacSpecific();
+-
+ CoreEvents.registerApplicationEventListener(new
IApplicationEventListener() {
+ public void onApplicationStartup() {
+ updateCheckboxesOnStart();
+@@ -252,26 +248,6 @@
+ updateEditOverwriteMachineTranslationMenuItem();
+ }
+
+- /**
+- * Initialize Mac-specific features.
+- */
+- private void initMacSpecific() {
+- try {
+- // MacOSX-specific
+- MRJAdapter.addQuitApplicationListener(new ActionListener() {
+- public void actionPerformed(ActionEvent e) {
+-
mainWindowMenuHandler.projectExitMenuItemActionPerformed();
+- }
+- });
+- MRJAdapter.addAboutListener(new ActionListener() {
+- public void actionPerformed(ActionEvent e) {
+- mainWindowMenuHandler.helpAboutMenuItemActionPerformed();
+- }
+- });
+- } catch (NoClassDefFoundError e) {
+- Log.log(e);
+- }
+- }
+
+ /**
+ * Create menu instance and set title.
Deleted: trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch
===================================================================
--- trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch
2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch
2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-remove-jmyspell-alternative.dpatch by Tiago Saboga
<tiagosab...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Do not use jmyspell, as it is not in debian.
-
-...@dpatch@
-diff -urNad
omegat-1.8.0.1_beta+dfsg~/src/org/omegat/core/spellchecker/SpellChecker.java
omegat-1.8.0.1_beta+dfsg/src/org/omegat/core/spellchecker/SpellChecker.java
----
omegat-1.8.0.1_beta+dfsg~/src/org/omegat/core/spellchecker/SpellChecker.java
2008-02-11 11:15:56.000000000 -0200
-+++
omegat-1.8.0.1_beta+dfsg/src/org/omegat/core/spellchecker/SpellChecker.java
2008-05-08 23:47:57.000000000 -0300
-@@ -42,8 +42,6 @@
- import java.nio.charset.Charset;
- import java.nio.charset.CharsetDecoder;
- import java.util.ArrayList;
--import org.dts.spell.dictionary.OpenOfficeSpellDictionary;
--import org.dts.spell.dictionary.SpellDictionary;
-
- import org.omegat.core.threads.CommandThread;
- import org.omegat.util.Log;
-@@ -69,8 +67,6 @@
- */
- private Hunspell hunspell;
-
-- private org.dts.spell.SpellChecker jmyspell;
--
- /** the list of ignored words */
- private ArrayList ignoreList = new ArrayList();
-
-@@ -147,16 +143,8 @@
- if (hunspell != null) {
- pHunspell = hunspell.Hunspell_create(affixName,
dictionaryName);
- encoding = hunspell.Hunspell_get_dic_encoding(pHunspell);
-- } else {
-- try {
-- SpellDictionary dict = new OpenOfficeSpellDictionary(new
File(dictionaryName), new File(affixName), false);
-- jmyspell = new org.dts.spell.SpellChecker(dict);
-- jmyspell.setCaseSensitive(false);
-- } catch (Exception ex) {
-- Log.log("Error loading jmyspell: " + ex.getMessage());
-- return;
-- }
-- }
-+ }
-+
- // find out the internal project directory
- String projectDir =
-
CommandThread.core.getProjectProperties().getProjectInternal();
-@@ -198,9 +186,6 @@
-
- pHunspell = null;
- }
-- if (jmyspell != null) {
-- jmyspell = null;
-- }
-
- }
-
-@@ -273,8 +258,6 @@
- Log.log("Unsupported encoding " + encoding);
- }
- return false;
-- } else if (jmyspell != null) {
-- return jmyspell.isCorrect(word);
- } else {
- return false;
- }
-@@ -330,9 +313,7 @@
- Log.log("Unsupported encoding "+encoding);
- }
- }
-- } else if (jmyspell != null) {
-- aList.addAll(jmyspell.getDictionary().getSuggestions(word, 20));
-- }
-+ }
-
- return aList;
- }
Added: trunk/omegat/debian/patches/05-remove-jmyspell-alternative.patch
===================================================================
--- trunk/omegat/debian/patches/05-remove-jmyspell-alternative.patch
(rev 0)
+++ trunk/omegat/debian/patches/05-remove-jmyspell-alternative.patch
2010-02-21 20:30:56 UTC (rev 11672)
@@ -0,0 +1,72 @@
+Author: Tiago Saboga <tiagosab...@gmail.com>
+Description: Do not use jmyspell, as it is not in debian.
+--- omegat-2.0.5.2+dfsg.orig/src/org/omegat/core/spellchecker/SpellChecker.java
++++ omegat-2.0.5.2+dfsg/src/org/omegat/core/spellchecker/SpellChecker.java
+@@ -45,8 +45,6 @@
+ import java.util.List;
+ import java.util.logging.Logger;
+
+-import org.dts.spell.dictionary.OpenOfficeSpellDictionary;
+-import org.dts.spell.dictionary.SpellDictionary;
+ import org.omegat.core.Core;
+ import org.omegat.core.CoreEvents;
+ import org.omegat.core.events.IProjectEventListener;
+@@ -79,8 +77,6 @@
+
+ private Hunspell hunspellSave;
+
+- private org.dts.spell.SpellChecker jmyspell;
+-
+ /** the list of ignored words */
+ private List<String> ignoreList = new ArrayList<String>();
+
+@@ -185,19 +181,7 @@
+ LOGGER
+ .finer("Initialize SpellChecker by Hunspell for
language '"
+ + language + "' dictionary " +
dictionaryName);
+- } else {
+- try {
+- SpellDictionary dict = new OpenOfficeSpellDictionary(new
File(dictionaryName), new File(affixName), false);
+- jmyspell = new org.dts.spell.SpellChecker(dict);
+- jmyspell.setCaseSensitive(false);
+- } catch (Exception ex) {
+- Log.log("Error loading jmyspell: " + ex.getMessage());
+- return;
+- }
+- LOGGER
+- .finer("Initialize SpellChecker by JMySpell for
language '"
+- + language + "' dictionary " +
dictionaryName);
+- }
++ }
+ // find out the internal project directory
+ String projectDir =
+
Core.getProject().getProjectProperties().getProjectInternal();
+@@ -240,10 +224,6 @@
+ saveWordLists();
+ pHunspell = null;
+ }
+- if (jmyspell != null) {
+- jmyspell = null;
+- }
+-
+ }
+
+ /**
+@@ -326,8 +306,6 @@
+ Log.log("Unsupported encoding " + encoding);
+ }
+ return false;
+- } else if (jmyspell != null) {
+- return jmyspell.isCorrect(word);
+ } else {
+ return true;
+ }
+@@ -389,8 +367,6 @@
+ }
+ }
+ }
+- } else if (jmyspell != null) {
+- aList.addAll(jmyspell.getDictionary().getSuggestions(word, 20));
+ }
+
+ return aList;
Deleted: trunk/omegat/debian/patches/06-use-external-hunspell.dpatch
===================================================================
--- trunk/omegat/debian/patches/06-use-external-hunspell.dpatch 2010-02-21
18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/06-use-external-hunspell.dpatch 2010-02-21
20:30:56 UTC (rev 11672)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06-use-external-hunspell.dpatch by Tiago Saboga <tiagosab...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debian's libhunspell.
-
-...@dpatch@
-diff -urNad omegat~/build.xml omegat/build.xml
---- omegat~/build.xml 2008-05-06 14:25:22.000000000 -0300
-+++ omegat/build.xml 2009-02-09 23:20:34.000000000 -0200
-@@ -63,10 +63,6 @@
-
- <target name="-post-jar">
- <delete file="${dist.dir}/README.TXT"/>
-- <!-- copy the native libraries to the distribution directory -->
-- <copy todir="dist/native">
-- <fileset dir="native"/>
-- </copy>
- </target>
-
- <!-- Creates a zip with two localization packs -->
-diff -urNad omegat~/src/org/omegat/core/spellchecker/SpellChecker.java
omegat/src/org/omegat/core/spellchecker/SpellChecker.java
---- omegat~/src/org/omegat/core/spellchecker/SpellChecker.java 2009-02-09
23:19:32.000000000 -0200
-+++ omegat/src/org/omegat/core/spellchecker/SpellChecker.java 2009-02-09
23:19:32.000000000 -0200
-@@ -109,11 +109,7 @@
-
- /** Creates a new instance of SpellChecker */
- protected SpellChecker() {
-- String libraryPath = StaticUtils.installDir()
-- + File.separator
-- + OConsts.NATIVE_LIBRARY_DIR
-- + File.separator
-- + mapLibraryName(OConsts.SPELLCHECKER_LIBRARY_NAME);
-+ String libraryPath = "hunspell-1.2";
-
- try {
- hunspell = (Hunspell) Native.loadLibrary(libraryPath,
Hunspell.class);
Added: trunk/omegat/debian/patches/06-use-external-hunspell.patch
===================================================================
--- trunk/omegat/debian/patches/06-use-external-hunspell.patch
(rev 0)
+++ trunk/omegat/debian/patches/06-use-external-hunspell.patch 2010-02-21
20:30:56 UTC (rev 11672)
@@ -0,0 +1,56 @@
+Author: Tiago Saboga <tiagosab...@gmail.com>
+Description: Use debian's libhunspell.
+--- omegat-2.0.5.2+dfsg.orig/build.xml
++++ omegat-2.0.5.2+dfsg/build.xml
+@@ -63,10 +63,6 @@
+
+ <target name="-post-jar">
+ <delete file="${dist.dir}/README.TXT"/>
+- <!-- copy the native libraries to the distribution directory -->
+- <copy todir="dist/native">
+- <fileset dir="native"/>
+- </copy>
+ </target>
+
+ <!-- Creates a zip with two localization packs -->
+--- omegat-2.0.5.2+dfsg.orig/src/org/omegat/core/spellchecker/SpellChecker.java
++++ omegat-2.0.5.2+dfsg/src/org/omegat/core/spellchecker/SpellChecker.java
+@@ -108,9 +108,7 @@
+ + File.separator
+ + mapLibraryName(OConsts.SPELLCHECKER_LIBRARY_NAME);
+ } else {
+- libraryPath = StaticUtils.installDir() + File.separator
+- + OConsts.NATIVE_LIBRARY_DIR + File.separator
+- + mapLibraryName(OConsts.SPELLCHECKER_LIBRARY_NAME);
++ libraryPath = OConsts.SPELLCHECKER_LIBRARY_NAME;
+ }
+
+ try {
+@@ -148,8 +146,9 @@
+ Core.getProject().getProjectProperties().getTargetLanguage()
+ .getLocaleCode();
+
+- String dictionaryDir = Preferences.getPreference(
+- Preferences.SPELLCHECKER_DICTIONARY_DIRECTORY);
++ String dictionaryDir = Preferences.getPreferenceDefault(
++ Preferences.SPELLCHECKER_DICTIONARY_DIRECTORY,
++ OConsts.SPELLCHECKER_SYSTEM_DICTIONARY_DIRECTORY);
+
+ if (dictionaryDir != null) {
+ String affixName = dictionaryDir + File.separator + language +
+--- omegat-2.0.5.2+dfsg.orig/src/org/omegat/util/OConsts.java
++++ omegat-2.0.5.2+dfsg/src/org/omegat/util/OConsts.java
+@@ -94,8 +94,12 @@
+ public static final String LEARNED_WORD_LIST_FILE_NAME =
"learned_words.txt"; // NOI18N
+
+ /** The name of the spell checking library */
+- public static final String SPELLCHECKER_LIBRARY_NAME = "hunspell"; //
NOI18N
++ public static final String SPELLCHECKER_LIBRARY_NAME = "hunspell-1.2";
// NOI18N
+
++ /** directory of system dictionaries */
++ public static final String SPELLCHECKER_SYSTEM_DICTIONARY_DIRECTORY =
++ "/usr/share/myspell/dicts"; // NOI18N
++
+ /** the native library directory */
+ public static final String NATIVE_LIBRARY_DIR = "native"; // NOI18N
+
Deleted: trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch
===================================================================
--- trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch
2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch
2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07-set-default-dictionary-location.dpatch by Tiago Saboga
<tiagosab...@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set sensible default location for hunspell dictionaries.
-
-...@dpatch@
-diff -urNad omegat~/src/org/omegat/core/spellchecker/SpellChecker.java
omegat/src/org/omegat/core/spellchecker/SpellChecker.java
---- omegat~/src/org/omegat/core/spellchecker/SpellChecker.java 2009-02-01
18:44:52.000000000 -0200
-+++ omegat/src/org/omegat/core/spellchecker/SpellChecker.java 2009-02-10
13:52:15.000000000 -0200
-@@ -140,8 +140,9 @@
- CommandThread.core.getProjectProperties().getTargetLanguage()
- .getLocaleCode();
-
-- String dictionaryDir = Preferences.getPreference(
-- Preferences.SPELLCHECKER_DICTIONARY_DIRECTORY);
-+ String dictionaryDir = Preferences.getPreferenceDefault(
-+ Preferences.SPELLCHECKER_DICTIONARY_DIRECTORY,
-+ "/usr/share/myspell/dicts");
-
- if (dictionaryDir != null) {
- String affixName = dictionaryDir + File.separator + language +
Added: trunk/omegat/debian/patches/series
===================================================================
--- trunk/omegat/debian/patches/series (rev 0)
+++ trunk/omegat/debian/patches/series 2010-02-21 20:30:56 UTC (rev 11672)
@@ -0,0 +1,5 @@
+01-extra-jars-in-new-location.patch
+03-location-of-help-files.patch
+04-get-rid-of-MRJAdapter.patch
+05-remove-jmyspell-alternative.patch
+06-use-external-hunspell.patch
Modified: trunk/omegat/debian/repack-source.sh
===================================================================
--- trunk/omegat/debian/repack-source.sh 2010-02-21 18:25:21 UTC (rev
11671)
+++ trunk/omegat/debian/repack-source.sh 2010-02-21 20:30:56 UTC (rev
11672)
@@ -11,30 +11,34 @@
VERSION=$2
FILENAME=$3
+DEBVERSION="${VERSION}+dfsg"
-TMPDIR=`mktemp -d omegat-tmp`
-BASEDIR=$TMPDIR/omegat-${VERSION}+dfsg
+TMPDIR=`mktemp -d omegat-tmpXXXX`
+BASEDIR="$TMPDIR/omegat-${VERSION}+dfsg"
mkdir "$BASEDIR"
unzip -d "$BASEDIR" "$FILENAME"
# Remove third-party libraries
-rm -r "$BASEDIR"/lib
+rm -r "${BASEDIR}/lib"
+rm
"${BASEDIR}/nbproject/org-netbeans-modules-java-j2seproject-copylibstask.jar"
+rm -r "${BASEDIR}/test/lib"
+rm -r "${BASEDIR}/gen/lib"
# Remove win32 executables
-rm "$BASEDIR"/release/win32-specific/*exe
+rm "${BASEDIR}/release/win32-specific/*exe"
# Remove hunspell libraries
-rm -r "$BASEDIR"/native
+rm -r "${BASEDIR}/native"
# Repack
-GZIP=-9 tar -C "$TMPDIR" -czf ../omegat_${VERSION}+dfsg.orig.tar.gz
"omegat-${VERSION}+dfsg"
+GZIP=-9 tar -C "$TMPDIR" -czf "../omegat_${DEBVERSION}.orig.tar.gz"
"omegat-${DEBVERSION}"
# Clean temporary files
rm -rf "$TMPDIR"
-rm -rf "$BASEDIR"
+rm -rf "${BASEDIR}"
rm -f "$FILENAME"
if [ $1 = --upstream-version ] ;
then
- uupdate --upstream-version $2 "omegat_${VERSION}+dfsg.orig.tar.gz"
+ uupdate --upstream-version "${DEBVERSION"
"omegat_${DEBVERSION}.orig.tar.gz"
fi
Modified: trunk/omegat/debian/rules
===================================================================
--- trunk/omegat/debian/rules 2010-02-21 18:25:21 UTC (rev 11671)
+++ trunk/omegat/debian/rules 2010-02-21 20:30:56 UTC (rev 11672)
@@ -1,11 +1,11 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+# include /usr/share/quilt/quilt.make
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
ANT_OPTIONS=-propertyfile debian/ant.properties
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
touch configure-stamp
@@ -17,8 +17,7 @@
convert images/OmegaT.ico[0] images/OmegaT.xpm
touch $@
-clean: unpatch clean-patched
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp omegat.1 images/OmegaT.xpm
Added: trunk/omegat/debian/source/format
===================================================================
--- trunk/omegat/debian/source/format (rev 0)
+++ trunk/omegat/debian/source/format 2010-02-21 20:30:56 UTC (rev 11672)
@@ -0,0 +1 @@
+3.0 (quilt)
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
