← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mediathekview/vivid

« back to all changes in this revision

Viewing changes to debian/patches/build.patch

  • Committer: Package Import Robot
  • Author(s): Markus Koschany
  • Date: 2014-10-24 12:49:46 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20141024124946-rhnmiwad6apojoxt
Tags: 7.1-1
* Imported Upstream version 7.1.
* Declare compliance with Debian Policy 3.9.6.
* Update VCS-Browser field to new canonical address.
* Update man pages timestamp.
* Update debian/copyright for new release.
* Add README.source.
* Rename modify-ant-build-system.patch to build.patch and update it for 7.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build.patch
 
1
From: Markus Koschany <apo@gambaru.de>
 
2
Date: Fri, 24 Oct 2014 12:48:28 +0200
 
3
Subject: build
 
4
 
 
5
---
 
6
 build.xml                    |  2 +-
 
7
 nbproject/project.properties | 39 +++++++++++++--------------------------
 
8
 2 files changed, 14 insertions(+), 27 deletions(-)
 
9
 
 
10
diff --git a/build.xml b/build.xml
 
11
index 46fc923..0b02d7f 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
@@ -81,4 +80,5 @@
 
23
                <exec executable="./post_make.sh">
 
24
                </exec>
 
25
        </target>
 
26
+    -->
 
27
 </project>
 
28
diff --git a/nbproject/project.properties b/nbproject/project.properties
 
29
index f907eb4..9399f45 100644
 
30
--- a/nbproject/project.properties
 
31
+++ b/nbproject/project.properties
 
32
@@ -26,42 +26,29 @@ dist.jar=${dist.dir}/MediathekView.jar
 
33
 dist.javadoc.dir=${dist.dir}/javadoc
 
34
 endorsed.classpath=
 
35
 excludes=*.sh
 
36
-file.reference.commons-compress-1.8.1.jar=../libs/commons-compress-1.8.1.jar
 
37
-file.reference.commons-lang3-3.3.2.jar=../libs/commons-lang3-3.3.2.jar
 
38
-file.reference.jackson-core-2.4.1.jar=../libs/jackson-core-2.4.1.jar
 
39
-file.reference.jgoodies-common-1.8.0.jar=../libs/jgoodies-common-1.8.0.jar
 
40
-file.reference.jgoodies-forms-1.8.0.jar=../libs/jgoodies-forms-1.8.0.jar
 
41
-file.reference.jide-oss-3.6.1.jar=../libs/jide-oss-3.6.1.jar
 
42
-file.reference.swingx-action-1.6.5-1.jar=../libs/swingx-action-1.6.5-1.jar
 
43
-file.reference.swingx-all-1.6.5-1.jar=../libs/swingx-all-1.6.5-1.jar
 
44
-file.reference.swingx-beaninfo-1.6.5-1.jar=../libs/swingx-beaninfo-1.6.5-1.jar
 
45
-file.reference.swingx-common-1.6.5-1.jar=../libs/swingx-common-1.6.5-1.jar
 
46
-file.reference.swingx-core-1.6.5-1.jar=../libs/swingx-core-1.6.5-1.jar
 
47
-file.reference.swingx-graphics-1.6.5-1.jar=../libs/swingx-graphics-1.6.5-1.jar
 
48
-file.reference.swingx-painters-1.6.5-1.jar=../libs/swingx-painters-1.6.5-1.jar
 
49
-file.reference.swingx-plaf-1.6.5-1.jar=../libs/swingx-plaf-1.6.5-1.jar
 
50
-file.reference.xz.jar=../libs/xz.jar
 
51
+file.reference.commons-compress-1.8.1.jar=/usr/share/java/commons-compress.jar
 
52
+file.reference.commons-lang3-3.1.jar=/usr/share/java/commons-lang3.jar
 
53
+file.reference.jgoodies-forms-1.8.0.jar=/usr/share/java/forms.jar
 
54
+file.reference.jide-oss-3.6.1.jar=/usr/share/java/jide-oss.jar
 
55
+file.reference.swingx-all-1.6.5-1.jar=/usr/share/java/swingx.jar
 
56
+file.reference.mac-widgets.jar=/usr/share/java/mac_widgets.jar
 
57
+file.reference.jackson-core-2.4.1.jar=/usr/share/java/jackson-core.jar
 
58
+file.reference.xz.jar=/usr/share/java/xz.jar
 
59
+file.reference.timingframework.jar=/usr/share/java/TimingFramework.jar
 
60
 includes=**
 
61
 jar.archive.disabled=${jnlp.enabled}
 
62
 jar.compress=true
 
63
 jar.index=${jnlp.enabled}
 
64
 javac.classpath=\
 
65
-    ${file.reference.swingx-action-1.6.5-1.jar}:\
 
66
     ${file.reference.swingx-all-1.6.5-1.jar}:\
 
67
-    ${file.reference.swingx-beaninfo-1.6.5-1.jar}:\
 
68
-    ${file.reference.swingx-common-1.6.5-1.jar}:\
 
69
-    ${file.reference.swingx-core-1.6.5-1.jar}:\
 
70
-    ${file.reference.swingx-graphics-1.6.5-1.jar}:\
 
71
-    ${file.reference.swingx-painters-1.6.5-1.jar}:\
 
72
-    ${file.reference.swingx-plaf-1.6.5-1.jar}:\
 
73
+    ${file.reference.mac-widgets.jar}:\
 
74
+    ${file.reference.jackson-core-2.4.1.jar}:\
 
75
     ${file.reference.xz.jar}:\
 
76
     ${file.reference.jide-oss-3.6.1.jar}:\
 
77
     ${file.reference.commons-compress-1.8.1.jar}:\
 
78
-    ${file.reference.commons-lang3-3.3.2.jar}:\
 
79
-    ${file.reference.jackson-core-2.4.1.jar}:\
 
80
-    ${file.reference.jgoodies-common-1.8.0.jar}:\
 
81
+    ${file.reference.commons-lang3-3.1.jar}:\
 
82
     ${file.reference.jgoodies-forms-1.8.0.jar}:\
 
83
-    ${reference.MSearch.jar}
 
84
+    ${file.reference.timingframework.jar}:
 
85
 # Space-separated list of extra javac options
 
86
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation -g
 
87
 javac.deprecation=true