CVS:oo-debian-files/doc README.Debian,1.29,1.30 TODO,1.10,1.11

[Rene Engelhard <rene@gluck.debian.org>]

Update of /cvs/debian-openoffice/oo-debian-files/doc
In directory gluck:/tmp/cvs-serv25552/doc

Modified Files:
	README.Debian TODO 
Log Message:
- update README.Debian and TODO
- move to main


Index: README.Debian
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/doc/README.Debian,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- README.Debian	8 Oct 2003 11:00:38 -0000	1.29
+++ README.Debian	24 Oct 2003 08:53:50 -0000	1.30
@@ -43,8 +43,7 @@
   * The non-free components have been removed:
 	- Support for 3D shaded objects (GPC library)
 	- LZW compression of GIFs, needed for 'save to html/web' features
-	- Java runtime support.  Currently the packages must still be built
-	  with the blackdown JDK.
+	- Java
 
   * Integration with other Debian packages:
 	- Global desktop integration for all users for KDE and Gnome desktops.

Index: TODO
===================================================================
RCS file: /cvs/debian-openoffice/oo-debian-files/doc/TODO,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- TODO	6 Oct 2003 16:24:14 -0000	1.10
+++ TODO	24 Oct 2003 08:53:50 -0000	1.11
@@ -10,16 +10,6 @@
      - moz zips (at least the non-linux architectures, preferably the linux
        zips too - see above)
 
-*   OpenOffice.org ready for debian main?
-
-    The build system needs a Java Development Kit, although it is not necessary
-    to have a JDK installed at runtime.  At the moment, only Blackdown/Sun JDKs
-    are recognised so we have to stay in contrib until this is solved.
-
-    Update October 2003:  Josh Triplett has been working on changes to drop the
-    Java build dependency completely; we plan to move OOo to debian main from
-    version 1.1.0-2.
-
 *   Split source into several pieces.  At 130MB of source and 90MB of .debs,
     OOo is the biggest single package in Debian and updates will cost a lot in
     network bandwidth, however small the changes are.  We need to split the
@@ -28,7 +18,6 @@
 
 *   Remove libraries from the package which are already available in Debian.
     - nas
-    - zlib
     - icu
 
 *   Replace LZW compression algorithm.  Save to Web in writer will not work if