← Back to branch summary

~ubuntu-branches/ubuntu/natty/java-gnome/natty

« back to all changes in this revision

Viewing changes to debian/patches/02_javadoc_workaround.patch

  • Committer: Bazaar Package Importer
  • Author(s): Guillaume Mazoyer
  • Date: 2011-02-18 17:46:52 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20110218174652-mk7ajkt790es0jwr
Tags: 4.0.19-0ubuntu1
https://launchpad.net/bugs/596252
* New upstream release. (LP: #596252) (Forwarded: Debian: 588943)
* debian/control
  - Update dependencies version according to the upstream configure file.
  - Update Standards-Version to 3.9.1.
  - Sync JNI and JAR packages.
* debian/copyright
  - Update copyright to 2011.
* debian/patches/01_take_screenshots.diff
  - Fix patch to make doc screenshots works.
* debian/patches/02_javadoc_workaround.patch
  - Fix javadoc generation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_javadoc_workaround.patch
 
1
## Description: javadoc generation fix
 
2
## Origin/Author: Andrew Cowie
 
3
Index: java-gnome-4.0.19/build/faster
 
4
===================================================================
 
5
--- java-gnome-4.0.19.orig/build/faster 2011-02-16 00:11:34.828588913 +0100
 
6
+++ java-gnome-4.0.19/build/faster      2011-02-16 00:11:32.188570530 +0100
 
7
@@ -648,7 +648,6 @@
 
8
                cmd += "-quiet "
 
9
 
 
10
        cmd += "-d doc/api "
 
11
-       cmd += "-classpath tmp/bindings "
 
12
        cmd += "-public "
 
13
        cmd += "-nodeprecated "
 
14
        cmd += "-source 1.5 "
 
15
@@ -664,11 +663,11 @@
 
16
        cmd += "-breakiterator "
 
17
        cmd += "-stylesheetfile src/bindings/stylesheet.css "
 
18
        cmd += "-overview src/bindings/overview.html "
 
19
-       cmd += "-sourcepath src/bindings "
 
20
+       cmd += "-sourcepath src/bindings:generated/bindings "
 
21
        cmd += "-encoding UTF-8 "
 
22
        cmd += "-subpackages org "
 
23
        cmd += "-exclude org.freedesktop.bindings "
 
24
-       cmd += "-noqualifier java.*:com.sun.* "
 
25
+       cmd += "-noqualifier 'java.*:com.sun.*' "
 
26
        cmd += "src/bindings/org/freedesktop/bindings/Time.java "
 
27
        cmd += "src/bindings/org/freedesktop/bindings/Version.java "
 
28
        cmd += "src/bindings/org/freedesktop/bindings/Internationalization.java "