← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mediathekview/trusty

« back to all changes in this revision

Viewing changes to debian/patches/modify-ant-build-system.patch

  • Committer: Package Import Robot
  • Author(s): Markus Koschany, 6ba46ec
  • Date: 2013-05-06 18:04:44 UTC
  • mfrom: (4.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20130506180444-oe1knj8kfeshvd8x
Tags: 3.2.1-2
http://bugs.debian.org/706925
[6ba46ec] Add Build-with-libjgoodies-forms-java-1.6 patch.
This patch fixes a compatibility issue with libjgoodies-forms-java 1.6. The
former class FormFactory has been renamed to FormSpecs which rendered
MediathekView unusable. (Closes: #706925)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/modify-ant-build-system.patch
 
1
From: Markus Koschany <apo@gambaru.de>
 
2
Date: Thu, 21 Mar 2013 19:44:30 +0100
 
3
Subject: modify ant build system
 
4
 
 
5
---
 
6
 build.xml                    |    3 +--
 
7
 nbproject/project.properties |   18 ++++++++----------
 
8
 2 files changed, 9 insertions(+), 12 deletions(-)
 
9
 
 
10
diff --git a/build.xml b/build.xml
 
11
index 32611bf..b6059ea 100644
 
12
--- a/build.xml
 
13
+++ b/build.xml
 
14
@@ -70,7 +70,6 @@
 
15
     properties which you can use, check the target you are overriding in the
 
16
     nbproject/build-impl.xml file. 
 
17
 
 
18
-    -->
 
19
        <target name="-pre-compile" >
 
20
                <propertyfile file="${src.dir}\version.properties">
 
21
                        <entry key="BUILD" value="1" type="int" operation="+"/>
 
22
@@ -80,5 +79,5 @@
 
23
        <target name="-post-jar">
 
24
                <exec executable="./post_make.sh">
 
25
                </exec>
 
26
-       </target>
 
27
+    </target> -->
 
28
 </project>
 
29
diff --git a/nbproject/project.properties b/nbproject/project.properties
 
30
index 62a6122..fb0d273 100644
 
31
--- a/nbproject/project.properties
 
32
+++ b/nbproject/project.properties
 
33
@@ -26,13 +26,12 @@ dist.jar=${dist.dir}/MediathekView.jar
 
34
 dist.javadoc.dir=${dist.dir}/javadoc
 
35
 endorsed.classpath=
 
36
 excludes=*.sh
 
37
-file.reference.commons-compress-1.4.1.jar=libs/commons-compress-1.4.1.jar
 
38
-file.reference.commons-lang3-3.1.jar=libs/commons-lang3-3.1.jar
 
39
-file.reference.forms-1.2.1.jar=libs/forms-1.2.1.jar
 
40
-file.reference.jide-oss-3.5.1-sources.jar=libs/jide-oss-3.5.1-sources.jar
 
41
-file.reference.jide-oss-3.5.1.jar=libs/jide-oss-3.5.1.jar
 
42
-file.reference.swingx-all-1.6.4-sources.jar=libs/swingx-all-1.6.4-sources.jar
 
43
-file.reference.swingx-all-1.6.4.jar=libs/swingx-all-1.6.4.jar
 
44
+file.reference.commons-compress-1.4.1.jar=/usr/share/java/commons-compress.jar
 
45
+file.reference.commons-lang3-3.1.jar=/usr/share/java/commons-lang3.jar
 
46
+file.reference.forms-1.2.1.jar=/usr/share/java/forms.jar
 
47
+file.reference.jide-oss-3.5.1.jar=/usr/share/java/jide-oss.jar
 
48
+file.reference.swingx-all-1.6.4.jar=/usr/share/java/swingx.jar
 
49
+file.reference.mac-widgets.jar=/usr/share/java/mac_widgets.jar
 
50
 includes=**
 
51
 jar.archive.disabled=${jnlp.enabled}
 
52
 jar.compress=true
 
53
@@ -43,8 +42,7 @@ javac.classpath=\
 
54
     ${file.reference.commons-compress-1.4.1.jar}:\
 
55
     ${file.reference.swingx-all-1.6.4.jar}:\
 
56
     ${file.reference.forms-1.2.1.jar}:\
 
57
-    ${file.reference.jide-oss-3.5.1-sources.jar}:\
 
58
-    ${file.reference.swingx-all-1.6.4-sources.jar}
 
59
+    ${file.reference.mac-widgets.jar}
 
60
 # Space-separated list of extra javac options
 
61
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation -g
 
62
 javac.deprecation=true
 
63
@@ -78,7 +76,7 @@ jnlp.signing=
 
64
 jnlp.signing.alias=
 
65
 jnlp.signing.keystore=
 
66
 main.class=mediathek.Main
 
67
-manifest.file=manifest.mf
 
68
+manifest.file=/debian/mediathekview.manifest
 
69
 meta.inf.dir=${src.dir}/META-INF
 
70
 mkdist.disabled=false
 
71
 platform.active=default_platform