./packages/openofficeorg/3.1/experimental r1421: merge
------------------------------------------------------------
revno: 1421
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-03-03 23:29:11 +0100
message:
merge
modified:
README.Debian
changelog
control
control.in
presubj
------------------------------------------------------------
revno: 1332.1.87
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2009-03-03 15:53:46 +0100
message:
+ * debian/presubj:
+ - directly point to http://wiki.debian.org/OpenOffice#debug in IV
+ (closes: #517987)
+ * debian/README.Debian:
+ - remove openoffice.debian.net (closes: #517978)
+ * debian/control.in:
+ - remove http://udk.openoffice.org/python/python-bridge.html from
+ python-unos description, we already have it in Homepage:
modified:
README.Debian
changelog
control.in
presubj
------------------------------------------------------------
revno: 1332.1.88
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2009-03-03 18:45:05 +0100
message:
update ooo-build (mips buildfix)
modified:
changelog
------------------------------------------------------------
revno: 1332.1.89
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-03-03 23:25:47 +0100
message:
regen control
modified:
control
=== modified file 'README.Debian'
--- a/README.Debian 2007-12-04 19:35:24 +0000
+++ b/README.Debian 2009-03-03 14:53:46 +0000
@@ -1,6 +1,5 @@
Readme for openoffice.org package for Debian
--------------------------------------------
- http://openoffice.debian.net
Contents
========
@@ -282,14 +281,10 @@
===============================================
Please read the official README.gz (in the same directory as this file), too.
-For further information please see our web page at:
-
- http://openoffice.debian.net
-
-Or the mailing list:
+If you have questions, either post to our the mailing list:
http://lists.debian.org/debian-openoffice
-Or the #debian-oo IRC channel on irc.debian.org
+Or go to the the #debian-oo IRC channel on irc.debian.org
The Debian OpenOffice.org team
=== modified file 'changelog'
--- a/changelog 2009-03-03 01:36:52 +0000
+++ b/changelog 2009-03-03 22:29:11 +0000
@@ -10,7 +10,7 @@
(closes: #512644)
- new orig without rfc314.txt (closes: #516784)
* ooo-build:
- - back on trunk (r15418 - ooo-build 3.0.99.0)
+ - back on trunk (r15448)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -49,12 +49,22 @@
* debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
fixed
- -- Rene Engelhard <rene@debian.org> Mon, 02 Mar 2009 00:46:44 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 03 Mar 2009 23:25:51 +0100
openoffice.org (1:3.0.1-4.5pre) unstable; urgency=low
+ * ooo-build:
+ - update (r15439)
* debian/shell-lib.sh:
- $ORIGIN -> $OOO_BASE_DIR
+ * debian/presubj:
+ - directly point to http://wiki.debian.org/OpenOffice#debug in IV
+ (closes: #517987)
+ * debian/README.Debian:
+ - remove openoffice.debian.net (closes: #517978)
+ * debian/control.in:
+ - remove http://udk.openoffice.org/python/python-bridge.html from
+ python-unos description, we already have it in Homepage:
-- Rene Engelhard <rene@debian.org> Tue, 03 Mar 2009 02:09:05 +0100
=== modified file 'control'
--- a/control 2009-03-03 01:36:52 +0000
+++ b/control 2009-03-03 22:29:11 +0000
@@ -428,9 +428,6 @@
others to develop UNO components in Python, thus Python UNO components
may be run within the OpenOffice.org process and can be called from C++
or the built in StarBasic scripting language.
- .
- You can more information about Pyuno at
- http://udk.openoffice.org/python/python-bridge.html
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
=== modified file 'control.in'
--- a/control.in 2009-02-26 07:22:26 +0000
+++ b/control.in 2009-03-03 22:29:11 +0000
@@ -680,9 +680,6 @@
others to develop UNO components in Python, thus Python UNO components
may be run within the OpenOffice.org process and can be called from C++
or the built in StarBasic scripting language.
- .
- You can more information about Pyuno at
- http://udk.openoffice.org/python/python-bridge.html
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.orgVER-officebean
=== modified file 'presubj'
--- a/presubj 2009-01-15 06:42:02 +0000
+++ b/presubj 2009-03-03 14:53:46 +0000
@@ -17,8 +17,9 @@
similar docs causes problems please attach THIS (or a similar type one
causing it). Otherwise, don't file a bug, we can't look at it anyway.
-IV) Please attach a backtrace if possible (see README.Debian). Install
- openoffice.org-dbg before doing this (and the packages it Recommends).
+IV) Please attach a backtrace if possible (see
+ http://wiki.debian.org/OpenOffice#debug). Install openoffice.org-dbg
+ before doing this (and the packages it Recommends).
Please also read /usr/share/doc/openoffice.org-common/README.gz for common
problems ("Problems During Program Startup")
Reply to: