← Back to branch summary

~ubuntu-branches/ubuntu/natty/cobertura/natty

« back to all changes in this revision

Viewing changes to debian/patches/build_with_system_jars.diff

  • Committer: Bazaar Package Importer
  • Author(s): Miguel Landaeta
  • Date: 2010-05-11 19:21:46 UTC
  • mfrom: (0.1.4 sid) (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100511192146-j742v5jsl89ztndu
Tags: 1.9.4.1+dfsg-2
http://bugs.debian.org/580842
* Now Build-Depends on libservlet2.5-java and add a missing Depends
  on the same package. (Closes: #580842). 
* Simplify list of JRE dependences for cobertura and drop JRE dependences for
  libcobertura-java as Java libraries are no longer required to depend on a
  JVM.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build_with_system_jars.diff
 
1
diff --git a/build.properties b/build.properties
 
2
index 4641708..530a635 100644
 
3
--- a/build.properties
 
4
+++ b/build.properties
 
5
@@ -8,11 +8,10 @@ eclipse.dir=/opt/eclipse
 
6
 etc.dir=etc
 
7
 examples.dir=examples
 
8
 examples.functionalconditiontest.dir=examples/functionalconditiontest/src
 
9
-lib.dir=lib
 
10
+lib.dir=/usr/share/java
 
11
 src.dir=src
 
12
 othersrc.dir=src-2
 
13
 test.src.dir=test
 
14
-jetty.dir=jetty
 
15
 
 
16
 # Directories for generated output
 
17
 build.dir=build
 
18
diff --git a/build.xml b/build.xml
 
19
index 2a19d41..5120052 100644
 
20
--- a/build.xml
 
21
+++ b/build.xml
 
22
@@ -18,12 +18,7 @@
 
23
 
 
24
 
 
25
        <path id="base.path">
 
26
-               <fileset dir="${lib.dir}">
 
27
-                       <include name="**/*.jar" />
 
28
-               </fileset>
 
29
-               <fileset dir="${jetty.dir}">
 
30
-                       <include name="lib/servlet-api*.jar" />
 
31
-               </fileset>
 
32
+               <fileset dir="/" includesfile="debian/classpath-debian"/>
 
33
        </path>
 
34
 
 
35
        <path id="cobertura.classpath">