[java3d] 48/77: * Add myself to Uploaders. * Change patch system to quilt. * Add patch 04_no_maxmemory.patch: - Do not set maxmemory attribute in ant's javadoc task.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java3d.

commit d10fe001da877507dbd588977854bce76d7b542c
Author: Torsten Werner <twerner at debian.org>
Date:   Sat Aug 22 10:30:23 2009 +0000

    * Add myself to Uploaders.
    * Change patch system to quilt.
    * Add patch 04_no_maxmemory.patch:
      - Do not set maxmemory attribute in ant's javadoc task.
---
 debian/changelog                     |  9 ++++++++-
 debian/control                       |  5 +++--
 debian/patches/04_no_maxmemory.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                |  4 ++++
 debian/rules                         |  2 +-
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2b214a..d8f1845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
 java3d (1.5.2+dfsg-3) unstable; urgency=low
 
+  [ Onkar Shinde ]
   * debian/patches/02_fix_generic_ftbfs.patch
     - Improve the patch as per my understanding of the build system.
       (Closes: #541384)
   * debian/patches/03_fix_ia64_ftbfs.patch
     - Add fix for FTBFS on ia64.
 
- -- Onkar Shinde <onkarshinde at ubuntu.com>  Fri, 14 Aug 2009 00:12:49 +0530
+  [ Torsten Werner ]
+  * Add myself to Uploaders.
+  * Change patch system to quilt.
+  * Add patch 04_no_maxmemory.patch:
+    - Do not set maxmemory attribute in ant's javadoc task.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 22 Aug 2009 12:14:24 +0200
 
 java3d (1.5.2+dfsg-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a8f3831..19a4ac0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,9 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Jonny Lamb 
  <jonny at debian.org>, Sylvestre Ledru <sylvestre.ledru at inria.fr>,
- Onkar Shinde <onkarshinde at ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev
+ Onkar Shinde <onkarshinde at ubuntu.com>,
+ Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant-optional, libvecmath-java, mesa-common-dev, libgl1-mesa-dev, libxext-dev, libxt-dev, quilt
 Standards-Version: 3.8.2
 Homepage: http://java3d.dev.java.net
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/java3d/
diff --git a/debian/patches/04_no_maxmemory.patch b/debian/patches/04_no_maxmemory.patch
new file mode 100644
index 0000000..e1e02f3
--- /dev/null
+++ b/debian/patches/04_no_maxmemory.patch
@@ -0,0 +1,28 @@
+Index: java3d-1.5.2+dfsg/j3d-core/src/classes/build.xml
+===================================================================
+--- java3d-1.5.2+dfsg.orig/j3d-core/src/classes/build.xml	2009-08-22 12:12:44.000000000 +0200
++++ java3d-1.5.2+dfsg/j3d-core/src/classes/build.xml	2009-08-22 12:12:53.000000000 +0200
+@@ -242,7 +242,6 @@
+     <!-- Compile the javadoc from ${src} into ${build}/javadocs -->
+     <javadoc packagenames="javax.media.j3d.*,
+                            javax.vecmath.*"
+-             maxmemory="128m"
+              destdir="${build}/${platform}/javadocs/docs-jcp"
+ 	     bottom="${javadoc.bottom}"
+              windowtitle="${build.javadoc.name} ${version}">
+@@ -283,7 +282,6 @@
+     <javadoc packagenames="javax.media.j3d.*,
+                            com.sun.j3d.*,
+                            javax.vecmath.*"
+-             maxmemory="128m"
+ 	     private="true"
+              destdir="${build}/${platform}/javadocs/docs-private"
+ 	     bottom="${javadoc.bottom}"
+@@ -318,7 +316,6 @@
+              excludepackagenames="com.sun.j3d.utils.scenegraph.io.retained,
+ 			   com.sun.j3d.exp.swing.impl,
+ 			   com.sun.j3d.utils.scenegraph.io.state.*"
+-             maxmemory="128m"
+              destdir="${build}/${platform}/javadocs/docs-public"
+ 	     bottom="${javadoc.bottom}"
+              windowtitle="${build.javadoc.name} ${version}">
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1c57efa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01_fix_powerpc_ftbfs.patch
+02_fix_generic_ftbfs.patch
+03_fix_ia64_ftbfs.patch
+04_no_maxmemory.patch
diff --git a/debian/rules b/debian/rules
index c2e6ed0..6d4ba40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := ant-nodeps vecmath

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java3d.git