[Git][java-team/omegat][master] 8 commits: Wrap and sort

[Andrej Shadura]

Andrej Shadura pushed to branch master at Debian Java Maintainers / omegat


Commits:
651c2b70 by Andrej Shadura at 2019-01-04T18:44:20Z
Wrap and sort

- - - - -
7366e2fa by Andrej Shadura at 2019-01-04T18:44:47Z
Add missing build dependencies

- - - - -
936c3a6a by Andrej Shadura at 2019-01-04T18:46:25Z
Depend on java-runtime, not a specific version of it

- - - - -
5629c303 by Andrej Shadura at 2019-01-04T19:07:25Z
Fix the clean pattern for the generated files

- - - - -
6a136bbc by Andrej Shadura at 2019-01-04T19:08:01Z
Generate things in debian/

- - - - -
56d0df96 by Andrej Shadura at 2019-01-04T19:13:43Z
Use javahelper to patch the JAR

- - - - -
7e1e1bb6 by Andrej Shadura at 2019-01-04T19:22:38Z
Use javahelper to generate Depends

- - - - -
e8418f8f by Andrej Shadura at 2019-01-04T19:23:35Z
Clean debian/omegat.classpath

- - - - -


4 changed files:

- debian/clean
- debian/control
- debian/omegat.install
- debian/rules


Changes:

=====================================
debian/clean
=====================================
@@ -1,3 +1,4 @@
-omegat.1 images/OmegaT.xpm
+debian/omegat.1 debian/OmegaT.xpm
+debian/omegat.classpath
 lib/*
-src/gen/*/*
+src/gen/*/*/*


=====================================
debian/control
=====================================
@@ -2,10 +2,39 @@ Source: omegat
 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 (>= 9), default-jdk, ant
-Build-Depends-Indep: docbook-to-man, imagemagick, libvldocking-java,
- libhtmlparser-java, libjna-java, libswing-layout-java, tofrodos, librsvg2-bin
+Uploaders:
+ Tiago Saboga <tiagosaboga at gmail.com>
+Build-Depends:
+ ant,
+ debhelper (>= 9),
+ default-jdk
+Build-Depends-Indep:
+ antlr4,
+ docbook-to-man,
+ groovy,
+ imagemagick,
+ libactivation-java,
+ libcommons-io-java,
+ libcommons-lang-java,
+ libcommons-logging-java,
+ libdictzip-java,
+ libhtmlparser-java,
+ libjaxb-api-java,
+ libjaxb-java,
+ libjgit-java,
+ libjna-java,
+ libjsch-java,
+ libjuniversalchardet-java,
+ liblucene3-contrib-java,
+ liblucene3-java,
+ libpdfbox-java,
+ librsvg2-bin,
+ libsequence-library-java,
+ libslf4j-java,
+ libswing-layout-java,
+ libvldocking-java,
+ javahelper,
+ tofrodos
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/omegat.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/omegat.git
@@ -13,10 +42,10 @@ Homepage: http://www.omegat.org
 
 Package: omegat
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java6-runtime | java7-runtime, libvldocking-java,
- libhtmlparser-java, libswing-layout-java
-Recommends: libjna-java, libhunspell-1.3-0
-Suggests: libaccess-bridge-java-jni
+Depends:
+ default-jre | java-runtime,
+ ${misc:Depends},
+ ${java:Depends}
 Description: Computer Assisted Translation (CAT) tool
  OmegaT's main features are
   - multiple source texts handling, retaining complex folder
@@ -35,7 +64,7 @@ Description: Computer Assisted Translation (CAT) tool
     (recognition of inflected forms) and LanguageTool (style
      and grammar checker) plugins
   - integration with Hunspell for spelling checking
-  - simple API to access source/target/selection textual data 
+  - simple API to access source/target/selection textual data
  .
  OmegaT supports 24 formats, including documentation formats such as
  OpenDocument, Open XML (MS Office 2007), DocBook and (x)HTML, and


=====================================
debian/omegat.install
=====================================
@@ -2,7 +2,7 @@ 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/omegat
-lib/*.jar usr/share/omegat/lib
 lib-mnemonics/dist/lib-mnemonics.jar usr/share/omegat/lib
-images/*[gif|png|xpm|svg] usr/share/omegat/images/
+images/*[gif|png|svg] usr/share/omegat/images/
+debian/*xpm usr/share/omegat/images/
 debian/omegat.desktop usr/share/applications


=====================================
debian/rules
=====================================
@@ -4,13 +4,13 @@
 include debian/ant.properties
 
 %:
-	dh "$@"
+	dh "$@" --with javahelper
 
 override_dh_auto_configure:
-	docbook-to-man debian/omegat.sgml > omegat.1
-	convert images/OmegaT.svg images/OmegaT.xpm
+	docbook-to-man debian/omegat.sgml > debian/omegat.1
+	convert images/OmegaT.svg debian/OmegaT.xpm
 	mkdir -p lib
-	for jar in $(filter-out ${reference.lib-mnemonics.jar},${javac.classpath:%:=%}); do ln -s $$jar lib; done
+	echo usr/share/omegat/OmegaT.jar /usr/share/omegat/lib/lib-mnemonics.jar $(filter-out ${reference.lib-mnemonics.jar},${javac.classpath:%:=%}) > debian/omegat.classpath
 
 override_dh_auto_build:
 	dh_auto_build -- gen jar



View it on GitLab: https://salsa.debian.org/java-team/omegat/compare/f9b2023268050f2402c426c82f23b4c1af2b3c2c...e8418f8f1f5413a8253acefc0a913108a726b3f1

-- 
View it on GitLab: https://salsa.debian.org/java-team/omegat/compare/f9b2023268050f2402c426c82f23b4c1af2b3c2c...e8418f8f1f5413a8253acefc0a913108a726b3f1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190104/39d49271/attachment.html>