1 diff --git a/build.xml b/build.xml
2 index 0ebe470..fc12040 100644
7 <property name="classes.dir" value="${dist.dir}"/> <!-- Directory for classes -->
8 <property name="jar.dir" value="${build.dir}/jar"/> <!-- Directory for built jar's -->
9 - <property name="lib.dir" value="lib"/> <!-- Library source directory -->
11 <property name="pkgname" value="${ant.project.name}-${build.version}"/>
15 <!-- Classpath definitions -->
17 - <fileset dir="${lib.dir}" includes="**/*.jar"/>
18 + <!-- update manifest class-path definition below too when making changes here -->
19 + <pathelement location="/usr/share/java/itext5.jar"/>
20 + <pathelement location="/usr/share/java/jcommon.jar"/>
21 + <pathelement location="/usr/share/java/jfreechart.jar"/>
22 + <pathelement location="/usr/share/java/jmock2.jar"/>
23 + <pathelement location="/usr/share/java/miglayout.jar"/>
26 <path id="test-classpath">
28 <pathelement location="${build-test.dir}"/>
29 <pathelement location="${classes.dir}"/>
30 <pathelement location="${src-test.dir}"/>
31 - <fileset dir="lib-test/" includes="*.jar"/>
32 + <pathelement location="/usr/share/java/junit4.jar"/>
38 <attribute name="Main-Class" value="${main-class}"/>
39 <attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
40 + <attribute name="Class-Path" value="/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext5.jar"/>
42 - <zipfileset src="lib/miglayout15-swing.jar" />
43 - <zipfileset src="lib/jcommon-1.0.16.jar" />
44 - <zipfileset src="lib/jfreechart-1.0.13.jar" />
45 - <zipfileset src="lib/iText-5.0.2.jar" />
50 <fileset dir="." includes="*" excludes="*.log">
53 - <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/ l10n/"/>
54 + <fileset dir="." includes="datafiles/ pix/ src/ test/ l10n/"/>
56 <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
57 <delete dir="${build.dir}/${pkgname}"/>
58 @@ -214,4 +215,4 @@ ${nonascii}</fail>
63 \ No newline at end of file
65 diff --git a/debian/patches/use-system-libs.diff b/debian/patches/use-system-libs.diff
66 index 45cf8be..e69de29 100644
67 --- a/debian/patches/use-system-libs.diff
68 +++ b/debian/patches/use-system-libs.diff
70 -diff --git a/build.xml b/build.xml
71 -index 30f62d2..16ad504 100644
76 - <property name="classes.dir" value="${dist.dir}"/> <!-- Directory for classes -->
77 - <property name="jar.dir" value="${build.dir}/jar"/> <!-- Directory for built jar's -->
78 -- <property name="lib.dir" value="lib"/> <!-- Library source directory -->
80 - <property name="pkgname" value="${ant.project.name}-${build.version}"/>
84 - <!-- Classpath definitions -->
85 - <path id="classpath">
86 -- <fileset dir="${lib.dir}" includes="**/*.jar"/>
87 -+ <!-- update manifest class-path definition below too when making changes here -->
88 -+ <pathelement location="/usr/share/java/itext5.jar"/>
89 -+ <pathelement location="/usr/share/java/jcommon.jar"/>
90 -+ <pathelement location="/usr/share/java/jfreechart.jar"/>
91 -+ <pathelement location="/usr/share/java/jmock2.jar"/>
92 -+ <pathelement location="/usr/share/java/miglayout.jar"/>
95 - <path id="test-classpath">
97 - <pathelement location="${build-test.dir}"/>
98 - <pathelement location="${classes.dir}"/>
99 - <pathelement location="${src-test.dir}"/>
100 -- <fileset dir="lib-test/" includes="*.jar"/>
101 -+ <pathelement location="/usr/share/java/junit4.jar"/>
107 - <attribute name="Main-Class" value="${main-class}"/>
108 - <attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
109 -+ <attribute name="Class-Path" value="/usr/share/java/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext5.jar"/>
111 -- <zipfileset src="lib/miglayout15-swing.jar" />
112 -- <zipfileset src="lib/jcommon-1.0.16.jar" />
113 -- <zipfileset src="lib/jfreechart-1.0.13.jar" />
114 -- <zipfileset src="lib/iText-5.0.2.jar" />
119 - <fileset dir="." includes="*">
120 - <type type="file"/>
122 -- <fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
123 -+ <fileset dir="." includes="datafiles/ pix/ src/ test/"/>
125 - <zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
126 - <delete dir="${build.dir}/${pkgname}"/>
127 -@@ -213,4 +214,4 @@ ${nonascii}</fail>
132 -\ No newline at end of file