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 1487be9ae33fd7715ad5d3f9e47df084a2b47aae (commit) via 084847313227d904c6fdc57837e7d2f8e5cd904d (commit) via 1471cb58b83a526f48bbd63fdc8c3a7ccee8cb2f (commit) from 6f4de9db5d3b86a81f2d9a23d375b079d2461d7e (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 1487be9ae33fd7715ad5d3f9e47df084a2b47aae Author: Tiago Saboga <tiagosab...@gmail.com> Date: Fri Jun 10 12:21:01 2011 -0300 Add debian/TODO file. commit 084847313227d904c6fdc57837e7d2f8e5cd904d Author: Tiago Saboga <tiagosab...@gmail.com> Date: Fri Jun 10 12:14:16 2011 -0300 Fix bug in omegat.sh grep invocation. commit 1471cb58b83a526f48bbd63fdc8c3a7ccee8cb2f Author: Tiago Saboga <tiagosab...@gmail.com> Date: Fri Jun 10 11:34:57 2011 -0300 Install jar files in private dir. ----------------------------------------------------------------------- Summary of changes: debian/TODO | 7 +++++++ debian/changelog | 4 +++- debian/omegat.install | 2 +- debian/omegat.sh | 4 ++-- debian/patches/01-extra-jars-in-new-location.patch | 2 +- debian/rules | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..8e01426 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,7 @@ +* Move to javahelper? +* Run with jarwrapper +* Write a real man page +* Document plugin installation +* Load additional plugins from user dir + +-- Tiago Saboga <tiagosab...@gmail.com>, Fri, 10 Jun 2011 diff --git a/debian/changelog b/debian/changelog index 79f4e56..9b7d1fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ omegat (2.2.3~beta4+dfsg-1) unstable; urgency=low * New upstream release (Closes: #558708). + * Move jar files to /usr/share/omegat: they are not meant to be + used by other applications * Add debian/README.Debian-plugins file. * Move debian packaging to git. * State copyright for source file src/schemas/srx20.xsd. @@ -25,7 +27,7 @@ omegat (2.2.3~beta4+dfsg-1) unstable; urgency=low + Move libaccess-bridge-java-jni to Suggests. * Bump debian policy (no changes needed). - -- Tiago Saboga <tiagosab...@gmail.com> Thu, 09 Jun 2011 10:56:35 -0300 + -- Tiago Saboga <tiagosab...@gmail.com> Fri, 10 Jun 2011 11:33:15 -0300 omegat (1.8.1.2+dfsg-1.1) unstable; urgency=low diff --git a/debian/omegat.install b/debian/omegat.install index 0255291..60bbd75 100644 --- a/debian/omegat.install +++ b/debian/omegat.install @@ -1,6 +1,6 @@ release/readme*.txt usr/share/doc/omegat/ release/join.html usr/share/doc/omegat/ docs/*html usr/share/omegat/html-template -dist/OmegaT.jar usr/share/java +dist/OmegaT.jar usr/share/omegat images/*{gif,png,xpm} usr/share/omegat/images/ debian/omegat.desktop usr/share/applications diff --git a/debian/omegat.sh b/debian/omegat.sh old mode 100644 new mode 100755 index 192ad20..3c6f433 --- a/debian/omegat.sh +++ b/debian/omegat.sh @@ -4,7 +4,7 @@ JAVA_OPTIONS='-Djava.library.path=/usr/lib/jni' JAVA=$(which java | xargs readlink -f) -echo "$JAVA" | grep -e '(openjdk|sun)' +echo "$JAVA" | grep -q -e '\(openjdk\|sun\)' if [ $? -eq 0 ] then JAVABIN=$JAVA @@ -22,4 +22,4 @@ else exit 1 fi -exec $JAVABIN $JAVA_OPTIONS -jar /usr/share/java/OmegaT.jar $* +exec $JAVABIN $JAVA_OPTIONS -jar /usr/share/omegat/OmegaT.jar $* diff --git a/debian/patches/01-extra-jars-in-new-location.patch b/debian/patches/01-extra-jars-in-new-location.patch index d3d2a3c..187df22 100644 --- a/debian/patches/01-extra-jars-in-new-location.patch +++ b/debian/patches/01-extra-jars-in-new-location.patch @@ -7,7 +7,7 @@ Description: Do not specify paths in Class-path. 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 lib/swing-worker-1.2.jar -+Class-Path: omegat-lib-mnemonics.jar libhtmlparser.jar vldocking.jar jna.jar swing-layout.jar ++Class-Path: lib-mnemonics.jar ../java/libhtmlparser.jar ../java/vldocking.jar ../java/jna.jar ../java/swing-layout.jar OmegaT-Plugin: true Name: org.omegat.filters3.xml.android.AndroidFilter diff --git a/debian/rules b/debian/rules index 23fb965..bb9b1ef 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ install: build 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)/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 + install -m 644 $(CURDIR)/lib-mnemonics/dist/lib-mnemonics.jar $(CURDIR)/debian/omegat/usr/share/omegat/lib-mnemonics.jar binary-arch: build install hooks/post-receive -- omegat packaging _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits