debian/clean

-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@lists.alioth.debian.org>
-Uploaders: Tiago Saboga <tiagosaboga@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@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

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