[pkg-java] r7951 - in trunk/omegat/debian: . patches

tiagosab-guest at alioth.debian.org tiagosab-guest at alioth.debian.org
Tue Feb 10 23:54:10 UTC 2009 

Author: tiagosab-guest
Date: 2009-02-10 23:54:10 +0000 (Tue, 10 Feb 2009)
New Revision: 7951

Added:
   trunk/omegat/debian/omegat.sh
   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
Removed:
   trunk/omegat/debian/patches/02-edit-wrapper.dpatch
Modified:
   trunk/omegat/debian/README.Debian
   trunk/omegat/debian/ant.properties
   trunk/omegat/debian/changelog
   trunk/omegat/debian/compat
   trunk/omegat/debian/control
   trunk/omegat/debian/copyright
   trunk/omegat/debian/patches/00list
   trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch
   trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch
   trunk/omegat/debian/repack-source.sh
   trunk/omegat/debian/rules
   trunk/omegat/debian/watch
Log:
omegat (1.8.1.2+dfsg-1) unstable; urgency=low

  [ Tiago Saboga ]
  * New upstream version.
  * Move to main.
  * Return to standard version number.
  * debian/repack-source.sh
    - Remove hunspell libraries.
  * Bump policy version (no changes needed).
  * Bump debhelper compatibility level.
  * Ship our own version of shell wrapper, instead of patching upstream.
  * debian/copyright - fix lintian warnings:
    - Point to GPL-2 instead of GPL.
    - Replace (C) by Copyright.
  * debian/rules
    - Install upstream changelog.

  [ Onkar Shinde <onkarshinde at ubuntu.com> ]
  * debian/control
    - Use openjdk-6-jdk as build dependency.
    - Use 'openjdk-6-jre | sun-java5-jre | sun-java6-jre' as runtime
      dependency.
  * debian/rules
    - Set JAVA_HOME corresponding to openjdk-6-jdk.
  * debian/ant.properties
    - Set default source and target values to 1.4.
  * debian/watch
    - Fix expression to match only release versions. Do not directly use
      specific sourceforge mirror.

 -- Tiago Saboga <tiagosaboga at gmail.com>  Tue, 10 Feb 2009 16:05:37 -0200


Modified: trunk/omegat/debian/README.Debian
===================================================================
--- trunk/omegat/debian/README.Debian	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/README.Debian	2009-02-10 23:54:10 UTC (rev 7951)
@@ -15,7 +15,6 @@
 patches have to be applied as to install files in debian canonical
 locations.
     ** jar files are installed in /usr/share/java
-    ** sh wrapper is installed in /usr/bin
     ** docs are installed in /usr/share/doc/omegat/html
 
- -- Tiago Saboga <tiagosaboga at gmail.com>, Thu,  3 Jan 2008 23:48:42 -0200
+ -- Tiago Saboga <tiagosaboga at gmail.com>, Thu, 23 Jul 2008 10:13:42 -0300

Modified: trunk/omegat/debian/ant.properties
===================================================================
--- trunk/omegat/debian/ant.properties	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/ant.properties	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,11 +1,16 @@
 ant.build.javac.source=1.4
 ant.build.javac.target=1.4
+
 file.reference.htmlparser.jar=/usr/share/java/libhtmlparser.jar
 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
 javac.classpath=\
     ${reference.lib-mnemonics.jar}:\
     ${file.reference.htmlparser.jar}:\
-    ${file.reference.vldocking_2.0.6d.jar}
+    ${file.reference.vldocking_2.0.6d.jar}:\
+    ${file.reference.jna.jar}:\
+    ${file.reference.swing-layout.jar}
 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	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/changelog	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,20 +1,34 @@
-omegat (1.7.3.u2+dfsg-2) unstable; urgency=low
+omegat (1.8.1.2+dfsg-1) unstable; urgency=low
 
+  [ Tiago Saboga ]
+  * New upstream version.
+  * Move to main.
+  * Return to standard version number.
+  * debian/repack-source.sh
+    - Remove hunspell libraries.
+  * Bump policy version (no changes needed).
+  * Bump debhelper compatibility level.
+  * Ship our own version of shell wrapper, instead of patching upstream.
+  * debian/copyright - fix lintian warnings:
+    - Point to GPL-2 instead of GPL.
+    - Replace (C) by Copyright.
+  * debian/rules
+    - Install upstream changelog.
+
+  [ Onkar Shinde <onkarshinde at ubuntu.com> ]
   * debian/control
     - Use openjdk-6-jdk as build dependency.
     - Use 'openjdk-6-jre | sun-java5-jre | sun-java6-jre' as runtime
       dependency.
   * debian/rules
     - Set JAVA_HOME corresponding to openjdk-6-jdk.
-  * debain/ant.properties
+  * debian/ant.properties
     - Set default source and target values to 1.4.
-  * debian/patches
-    - 02-edit-wrapper.dpatch - Add check for OpenJDK runtime as well.
   * debian/watch
     - Fix expression to match only release versions. Do not directly use
       specific sourceforge mirror.
 
- -- Onkar Shinde <onkarshinde at ubuntu.com>  Wed, 19 Nov 2008 00:17:19 +0530
+ -- Tiago Saboga <tiagosaboga at gmail.com>  Tue, 10 Feb 2009 16:05:37 -0200
 
 omegat (1.7.3.u2+dfsg-1) unstable; urgency=low
 

Modified: trunk/omegat/debian/compat
===================================================================
--- trunk/omegat/debian/compat	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/compat	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1 +1 @@
-5
+7

Modified: trunk/omegat/debian/control
===================================================================
--- trunk/omegat/debian/control	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/control	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,18 +1,21 @@
 Source: omegat
-Section: contrib/editors
+Section: editors
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Tiago Saboga <tiagosaboga at gmail.com>
-Build-Depends: debhelper (>= 5), openjdk-6-jdk, dpatch, ant
-Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java, libhtmlparser-java, tofrodos
+Build-Depends: debhelper (>= 7), openjdk-6-jdk, dpatch, ant
+Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java,
+ libhtmlparser-java, libjna-java, libswing-layout-java, tofrodos
 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.7.3
+Standards-Version: 3.8.0
 
 Package: omegat
 Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre, libvldocking-java, libhtmlparser-java
+Depends: openjdk-6-jre | sun-java5-jre | sun-java5-jre,
+ libvldocking-java, libhtmlparser-java, libswing-layout-java
+Recommends: libjna-java, libhunspell-1.2-0
 Description: Computer Assisted Translation (CAT) tool
  OmegaT's main features are
   - ability to run on any operating system supporting Java
@@ -28,5 +31,5 @@
  .
  OmegaT supports OpenDocument files, Microsoft Office files (using
  OpenOffice.org as a conversion filter, or by conversion to HTML),
- OpenOffice.org or StarOffice files, as well as (X)HTML, Java localization
- files or plain text files.
+ OpenOffice.org or StarOffice files, as well as (X)HTML, Java
+ localization files, PO files, OpenXML , DocBook or plain text files.

Modified: trunk/omegat/debian/copyright
===================================================================
--- trunk/omegat/debian/copyright	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/copyright	2009-02-10 23:54:10 UTC (rev 7951)
@@ -22,6 +22,9 @@
     Tiago Saboga
     Benjamin Siband
     Martin Wunderlich
+    Alex Buloichik
+    Fabian Mandelbaum
+    Martin Fleurke
 
   Other contributions by
     Sabine Cretella
@@ -32,20 +35,24 @@
     Marc Prior (localization manager)
     and many, many more very helpful people
 
-  OmegaT uses the following libraries:
-    HTMLParser by Somik Raha, Derrick Oswald and others (LGPL License).
-    http://sourceforge.net/projects/htmlparser
-  
-    VLDocking Framework by VLSolutions (CeCILL License).
-    http://www.vlsolutions.com/en/products/docking/
-
 Copyright: 
    Copyright(C) 2000-2007 Keith Godfrey, Maxym Mykhalchuk, Henry
    Pijffers, Benjamin Siband, Sandra Jean Chua, Kim Bruning, Martin
    Wunderlich, Didier Briel and Thomas Huriaux.
+   Copyright 2008-2009 Didier Briel
    Copyright 2007 Zoltan Bartko
    Copyright 2007 Tiago Saboga
-
+   Copyright 2007-2008 Alex Buloichik
+   Copyright 2007-2008 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 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.
@@ -62,13 +69,13 @@
    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
    License for more details.
 
-   The Debian packaging is (C) 2006-2007, Tiago Saboga
+   The Debian packaging is Copyright 2006-2009, Tiago Saboga
    <tiagosaboga at gmail.com> and is licensed under the GPL.
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian GNU/Linux systems, the complete text of the latest version
+On Debian GNU/Linux systems, the complete text of the version 2
 of the GNU General Public License can be found in
-/usr/share/common-licenses/GPL.
+/usr/share/common-licenses/GPL-2.

Added: trunk/omegat/debian/omegat.sh
===================================================================
--- trunk/omegat/debian/omegat.sh	                        (rev 0)
+++ trunk/omegat/debian/omegat.sh	2009-02-10 23:54:10 UTC (rev 7951)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+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
+elif [ -x /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
+else
+    echo "Suitable java binary not found."
+    exit 1
+fi
+
+exec $JAVABIN $JAVA_OPTIONS -jar /usr/share/java/OmegaT.jar $*


Property changes on: trunk/omegat/debian/omegat.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/omegat/debian/patches/00list
===================================================================
--- trunk/omegat/debian/patches/00list	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/patches/00list	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,4 +1,6 @@
 01-extra-jars-in-new-location
-02-edit-wrapper
 03-location-of-help-files
 04-get-rid-of-MRJAdapter
+05-remove-jmyspell-alternative
+06-use-external-hunspell
+07-set-default-dictionary-location

Modified: trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch
===================================================================
--- trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/patches/01-extra-jars-in-new-location.dpatch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -2,16 +2,18 @@
 ## 01-extra-jars-in-new-location.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adapt classpath to debian filesystem hierarchy..
+## DP: Do not specify paths in Class-path.
 
 @DPATCH@
-diff -urNad omegat-1.7.2.dfsg0~/manifest-template.mf omegat-1.7.2.dfsg0/manifest-template.mf
---- omegat-1.7.2.dfsg0~/manifest-template.mf	2007-11-10 12:27:46.000000000 -0200
-+++ omegat-1.7.2.dfsg0/manifest-template.mf	2007-11-10 12:34:03.000000000 -0200
-@@ -3,5 +3,5 @@
+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.0.6d.jar
-+Class-Path: omegat-lib-mnemonics.jar libhtmlparser.jar vldocking.jar
+-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
  
+ 
+ 

Deleted: trunk/omegat/debian/patches/02-edit-wrapper.dpatch
===================================================================
--- trunk/omegat/debian/patches/02-edit-wrapper.dpatch	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/patches/02-edit-wrapper.dpatch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-edit-wrapper.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Rewrite shell wrapper:
-## DP: - use /bin/sh instead of /bin/bash
-## DP: - look for sun's java vm
-
- at DPATCH@
-diff -urNad omegat-1.7.3.u2+dfsg~/release/OmegaT omegat-1.7.3.u2+dfsg/release/OmegaT
---- omegat-1.7.3.u2+dfsg~/release/OmegaT	2008-03-28 19:49:26.000000000 +0530
-+++ omegat-1.7.3.u2+dfsg/release/OmegaT	2008-11-19 00:13:13.000000000 +0530
-@@ -1,3 +1,14 @@
--#!/bin/bash
--java -jar OmegaT.jar $*
-+#!/bin/sh
- 
-+if [ -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
-+elif [ -x /usr/lib/jvm/java-1.5.0-sun/bin/java ]
-+    then JAVABIN=/usr/lib/jvm/java-1.5.0-sun/bin/java
-+else
-+    echo "I could not find a suitable java binary."
-+    exit 1
-+fi
-+
-+exec $JAVABIN -jar /usr/share/java/OmegaT.jar $*

Modified: trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch
===================================================================
--- trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/patches/04-get-rid-of-MRJAdapter.dpatch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -5,10 +5,10 @@
 ## DP: Remove unneeded library (only useful to Mac OS).
 
 @DPATCH@
-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-11-10 12:49:10.000000000 -0200
-+++ omegat-1.7.2.dfsg0/src/org/omegat/gui/main/MainWindow.java	2007-11-10 12:50:14.000000000 -0200
-@@ -66,7 +66,6 @@
+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;
@@ -16,16 +16,15 @@
  
  import org.omegat.core.ProjectProperties;
  import org.omegat.core.StringEntry;
-@@ -104,8 +103,6 @@
- import com.vlsolutions.swing.docking.event.DockableStateWillChangeListener;
+@@ -103,7 +102,6 @@
  import com.vlsolutions.swing.docking.ui.DockingUISettings;
+ import javax.swing.text.AttributeSet;
  
 -import net.roydesign.mac.MRJAdapter;
--
- /**
-  * The main window of OmegaT application.
-  *
-@@ -258,35 +255,8 @@
+ import org.omegat.gui.dialogs.SpellcheckerConfigurationDialog;
+ import org.omegat.util.Token;
+ 
+@@ -262,35 +260,8 @@
          uiUpdateOnProjectClose();
          initUIShortcuts();
          

Added: trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch
===================================================================
--- trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch	                        (rev 0)
+++ trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-remove-jmyspell-alternative.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not use jmyspell, as it is not in debian.
+
+ at 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;
+     }


Property changes on: trunk/omegat/debian/patches/05-remove-jmyspell-alternative.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/omegat/debian/patches/06-use-external-hunspell.dpatch
===================================================================
--- trunk/omegat/debian/patches/06-use-external-hunspell.dpatch	                        (rev 0)
+++ trunk/omegat/debian/patches/06-use-external-hunspell.dpatch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-use-external-hunspell.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use debian's libhunspell.
+
+ at 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);


Property changes on: trunk/omegat/debian/patches/06-use-external-hunspell.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch
===================================================================
--- trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch	                        (rev 0)
+++ trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-set-default-dictionary-location.dpatch by Tiago Saboga <tiagosaboga at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set sensible default location for hunspell dictionaries.
+
+ at 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 +


Property changes on: trunk/omegat/debian/patches/07-set-default-dictionary-location.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/omegat/debian/repack-source.sh
===================================================================
--- trunk/omegat/debian/repack-source.sh	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/repack-source.sh	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ $# -ne 3 ]
 then
     echo "Usage: $0 option version filename"
@@ -21,6 +23,9 @@
 # Remove win32 executables
 rm "$BASEDIR"/release/win32-specific/*exe
 
+# Remove hunspell libraries
+rm -r "$BASEDIR"/native
+
 # Repack
 GZIP=-9 tar -C "$TMPDIR" -czf ../omegat_${VERSION}+dfsg.orig.tar.gz "omegat-${VERSION}+dfsg"
 
@@ -31,5 +36,5 @@
 
 if [ $1 = --upstream-version ] ;
 then
-    uupdate --upstream-version $2 $3
+    uupdate --upstream-version $2 "omegat_${VERSION}+dfsg.orig.tar.gz"
 fi

Modified: trunk/omegat/debian/rules
===================================================================
--- trunk/omegat/debian/rules	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/rules	2009-02-10 23:54:10 UTC (rev 7951)
@@ -28,12 +28,12 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs
 	find $(CURDIR)/docs -mindepth 1 -maxdepth 1 -type d -print0 | xargs -0 cp -r --target-directory=$(CURDIR)/debian/omegat/usr/share/doc/omegat/html
 	find $(CURDIR)/debian/omegat/usr/share/doc/omegat -name '*license.txt' -delete
 	find $(CURDIR)/debian/omegat/usr/share -regex '.*(html|txt)' -print0 | xargs -0 fromdos
-	install -m 755 $(CURDIR)/release/OmegaT $(CURDIR)/debian/omegat/usr/bin/omegat
+	install -m 755 $(CURDIR)/debian/omegat.sh $(CURDIR)/debian/omegat/usr/bin/omegat
 	install -m 644 $(CURDIR)/lib-mnemonics/dist/lib-mnemonics.jar $(CURDIR)/debian/omegat/usr/share/java/omegat-lib-mnemonics.jar
 
 binary-arch: build install
@@ -41,7 +41,7 @@
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs -k release/changes.txt
 	dh_installdocs
 	dh_installexamples
 	dh_install

Modified: trunk/omegat/debian/watch
===================================================================
--- trunk/omegat/debian/watch	2009-02-09 20:28:04 UTC (rev 7950)
+++ trunk/omegat/debian/watch	2009-02-10 23:54:10 UTC (rev 7951)
@@ -1,6 +1,6 @@
 version=3
 #http://sf.net/omegat/OmegaT_(.*)_Source\.zip
-opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_(\d)+/.u$1/ \
-  http://sf.net/omegat/OmegaT_([\d.]+)_Source\.zip \
+opts=dversionmangle=s/\+dfsg\d*$//,uversionmangle=s/_(\d)+/.$1/ \
+  http://sf.net/omegat/OmegaT_([\d._]+)_Source\.zip \
   debian \
   debian/repack-source.sh

More information about the pkg-java-commits mailing list