./packages/openofficeorg/2.4.1/lenny r1252: merge
------------------------------------------------------------
revno: 1252
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-03-10 21:13:35 +0100
message:
merge
modified:
README.Debian
changelog
control.in
presubj
=== modified file 'README.Debian'
--- a/README.Debian 2007-12-04 19:35:24 +0000
+++ b/README.Debian 2009-03-10 20:13:35 +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-02-25 23:43:00 +0000
+++ b/changelog 2009-03-10 20:13:35 +0000
@@ -9,6 +9,13 @@
- build-conflict against g++-4.3 (>> 4.3.2-1.1)
(closes: #514839 - well, not really, but we at least won't have
the "chance" anymore to break)
+ - remove http://udk.openoffice.org/python/python-bridge.html from
+ python-unos description, we already have it in Homepage:
+ * debian/presubj:
+ - directly point to http://wiki.debian.org/OpenOffice#debug in IV
+ (closes: #517987)
+ * debian/README.Debian:
+ - remove openoffice.debian.net (closes: #517978)
-- Rene Engelhard <rene@debian.org> Mon, 23 Feb 2009 20:12:11 +0100
=== modified file 'control.in'
--- a/control.in 2009-02-25 22:46:04 +0000
+++ b/control.in 2009-03-10 20:13:35 +0000
@@ -660,9 +660,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-14 11:58:50 +0000
+++ b/presubj 2009-03-10 20:13:35 +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: