[SCM] omegat packaging branch, master, updated. upstream/2.2.3_beta4-32-ge85689d

Tue Jun 7 20:54:14 UTC 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "omegat packaging".

The branch, master has been updated
       via  e85689d451335078d9838d3a16f93e30c26fc7de (commit)
       via  55a0f5d2142f35f43c00836b35029a24ea72b3e1 (commit)
       via  67197e3410f377a031b33837b6945755fdb04337 (commit)
      from  56f0b94fcdf12d2eb644bb138a89d08d2fc50425 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e85689d451335078d9838d3a16f93e30c26fc7de
Author: Tiago Saboga <tiagosaboga at gmail.com>
Date:   Tue Jun 7 17:46:15 2011 -0300

    Document quilt patches.

commit 55a0f5d2142f35f43c00836b35029a24ea72b3e1
Author: Tiago Saboga <tiagosaboga at gmail.com>
Date:   Tue Jun 7 17:21:43 2011 -0300

    Put back empty watch file to satisfy lintian.

commit 67197e3410f377a031b33837b6945755fdb04337
Author: Tiago Saboga <tiagosaboga at gmail.com>
Date:   Tue Jun 7 17:17:33 2011 -0300

    Bump debian policy.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    5 +++--
 debian/control                                     |    2 +-
 debian/patches/08-use-java-swingworker.patch       |    7 +++++++
 debian/patches/10-do-not-load-jmyspell.patch       |    7 +++++++
 debian/patches/12-generate-files-with-xjc.patch    |    7 +++++++
 debian/patches/14-fix-deprecated-global.patch      |    7 +++++++
 .../15-do-not-use-sun-proprietary-dtds.patch       |    8 ++++++++
 debian/watch                                       |    5 +++++
 8 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 32d288d..4f82250 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ omegat (2.2.3~beta4+dfsg-1) unstable; urgency=low
   * New upstream release (Closes: #558708).
   * Move debian packaging to git.
   * State copyright for source file src/schemas/srx20.xsd.
-  * Remove debian/watch: unable to follow upstream naming scheme.
+  * Disable debian/watch: unable to follow upstream naming scheme.
   * Do not use sun java: we are using jaxb from openjdk.
   * javahelp-filters: Remove sun proprietary dtds.
   * Use openjdk swingworker.
@@ -22,8 +22,9 @@ omegat (2.2.3~beta4+dfsg-1) unstable; urgency=low
     - (Homepage): Point to main OmegaT page.
     - Package::omegat
       + Move libaccess-bridge-java-jni to Suggests.
+  * Bump debian policy (no changes needed).
 
- -- Tiago Saboga <tiagosaboga at gmail.com>  Tue, 07 Jun 2011 16:47:57 -0300
+ -- Tiago Saboga <tiagosaboga at gmail.com>  Tue, 07 Jun 2011 17:21:02 -0300
 
 omegat (1.8.1.2+dfsg-1.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f8bbddb..c4258ba 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java,
 Homepage: http://www.omegat.org
 Vcs-Git: git://git.debian.org/pkg-java/omegat.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/omegat.git
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: omegat
 Architecture: all
diff --git a/debian/patches/08-use-java-swingworker.patch b/debian/patches/08-use-java-swingworker.patch
index 69f5af6..404c385 100644
--- a/debian/patches/08-use-java-swingworker.patch
+++ b/debian/patches/08-use-java-swingworker.patch
@@ -1,3 +1,10 @@
+Description: Use SwingWorker from openjdk.
+
+Upstream is still bound to java 5 compatibility, what maked this patch
+unacceptable.
+
+Author: Tiago Saboga <tiagosaboga at gmail.com>
+Last-Update: 2011-06-07
 --- a/src/org/omegat/gui/main/ProjectUICommands.java
 +++ b/src/org/omegat/gui/main/ProjectUICommands.java
 @@ -28,8 +28,8 @@
diff --git a/debian/patches/10-do-not-load-jmyspell.patch b/debian/patches/10-do-not-load-jmyspell.patch
index 1bbea76..a81ef3c 100644
--- a/debian/patches/10-do-not-load-jmyspell.patch
+++ b/debian/patches/10-do-not-load-jmyspell.patch
@@ -1,3 +1,10 @@
+Description: Disable JMySpell loading.
+
+JMySpell is not available on Debian. Ideally, we should patch upstream
+to use it only if available, but for now we disable it entirely.
+
+Author: Tiago Saboga <tiagosaboga at gmail.com>
+Last-Update: 2011-06-07
 --- a/src/org/omegat/core/spellchecker/SpellChecker.java
 +++ b/src/org/omegat/core/spellchecker/SpellChecker.java
 @@ -151,13 +151,6 @@
diff --git a/debian/patches/12-generate-files-with-xjc.patch b/debian/patches/12-generate-files-with-xjc.patch
index 585c6ec..5fa88f4 100644
--- a/debian/patches/12-generate-files-with-xjc.patch
+++ b/debian/patches/12-generate-files-with-xjc.patch
@@ -1,3 +1,10 @@
+Description: Regenerate jaxb files with xjc.
+
+Upstream build system uses ant task, which is not working for us for
+unknown reasons.
+
+Author: Tiago Saboga <tiagosaboga at gmail.com>
+Last-Update: 2011-06-07
 --- a/build.xml
 +++ b/build.xml
 @@ -314,14 +314,27 @@
diff --git a/debian/patches/14-fix-deprecated-global.patch b/debian/patches/14-fix-deprecated-global.patch
index fffb568..822e525 100644
--- a/debian/patches/14-fix-deprecated-global.patch
+++ b/debian/patches/14-fix-deprecated-global.patch
@@ -1,3 +1,10 @@
+Description: Eliminate deprecated global warning.
+
+Patch has been mailed upstream, which is considering it.
+
+Forwarded: yes
+Author: Satoru KURASHIKI <lurdan at gmail.com>
+Last-Update: 2011-06-07
 --- a/src/org/omegat/util/Log.java
 +++ b/src/org/omegat/util/Log.java
 @@ -50,7 +50,7 @@
diff --git a/debian/patches/15-do-not-use-sun-proprietary-dtds.patch b/debian/patches/15-do-not-use-sun-proprietary-dtds.patch
index 95ce39f..c1da477 100644
--- a/debian/patches/15-do-not-use-sun-proprietary-dtds.patch
+++ b/debian/patches/15-do-not-use-sun-proprietary-dtds.patch
@@ -1,3 +1,11 @@
+Description: Remove references to sun proprietary dtds.
+
+Sun dtds are shipped within javahelp-filters. They are being removed
+from tarball, and here we avoid looking for them locally.
+
+Forwarded: no
+Author: Tiago Saboga <tiagosaboga at gmail.com>
+Last-Update: 2011-06-07
 --- a/addons/javahelp-filters/src/org/omegat/filters2/xml2/XMLHandler2.java
 +++ b/addons/javahelp-filters/src/org/omegat/filters2/xml2/XMLHandler2.java
 @@ -143,28 +143,6 @@
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..95af65b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,5 @@
+# This package has no proper watch file because I was not able to
+# find a long-term working regex to match upstream and debian versions.
+# Patches are welcome.
+
+# Tiago Saboga <tiagosaboga at gmail.com>  Tue, 07 Jun 2011 17:16:59 -0300


hooks/post-receive
-- 
omegat packaging

