./packages/openofficeorg/3.1/experimental r1392: merge
------------------------------------------------------------
revno: 1392
committer: Rene Engelhard <rene@debian.org>
branch nick: 31
timestamp: Tue 2009-01-20 17:06:30 +0100
message:
merge
modified:
README.Debian-source
changelog
control
control.in
control.ure.in
copyright
rules
------------------------------------------------------------
revno: 1332.1.46
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-01-19 02:32:14 +0100
message:
make -common conflict against dictionaries-common (<< 0.98.14)
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.47
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-01-19 16:50:30 +0100
message:
3.0.1 final...
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.48
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2009-01-19 16:54:17 +0100
message:
update URL...
modified:
README.Debian-source
copyright
------------------------------------------------------------
revno: 1332.1.49
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 10:07:51 +0100
message:
Breaks: -> Conflicts:
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.50
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 10:51:04 +0100
message:
3.0.1 final is not yet finalized...
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.51
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 16:42:39 +0100
message:
+ - use UREPACKAGEVERSION for determining ures version, more correct and
+ also includes the minor. Remove +OOo3.0.0~ suffix as ure now is at 1.4.1
+ and we bump .shlibs anyway
modified:
changelog
rules
------------------------------------------------------------
revno: 1388.1.1
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 16:51:52 +0100
message:
suggest java5-runtime instead of java2-runtime; merge
modified:
README.Debian-source
changelog
control
control.in
control.ure.in
copyright
rules
------------------------------------------------------------
revno: 1388.1.2
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-20 17:01:16 +0100
message:
obsolete changelog entry
modified:
changelog
=== modified file 'README.Debian-source'
--- a/README.Debian-source 2008-10-29 15:43:28 +0000
+++ b/README.Debian-source 2009-01-19 15:54:17 +0000
@@ -1,5 +1,6 @@
The .orig.tar.gz consists of the 5 seperate tarballs from
-http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/3.0.0rc4 (the stable/3.0.0 ones are exactly the same) of which some non-free stuff has been removed:
+http://ftp.gwdg.de/pub/openoffice/extended/3.0.1rc2 of which some non-free
+stuff has been removed:
* core:
- psprint_config/configuration/ppds/.PS (except SGEN*.PS):
PPDs where "all rights [are] reserved"
=== modified file 'changelog'
--- a/changelog 2009-01-20 15:53:21 +0000
+++ b/changelog 2009-01-20 16:06:30 +0000
@@ -20,8 +20,6 @@
- remove option for internal writer2latex as it's now a (bundled) extension
upstream too and we have it packaged already.
Hardcode --without-writer2latex
- - use UREPACKAGEVERSION for determining UREs version (keep .shlibs at
- old one to not bump shlibs unnecessarily)
- add conditional for enabling graphite, now that ooo-build has a surrected
--enable-graphite again (and upstream a cws for it)
- temporarily disable the Report Builder extension until rptfix04
@@ -33,17 +31,28 @@
- remove +OOo3.0.0~ suffix for ure/uno-libs3s .shlibs, ure is now at 1.5.0
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
+ * debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
+ jvmfwk soon will stop displaying JVMs < 1.5.0
- -- Rene Engelhard <rene@debian.org> Fri, 16 Jan 2009 18:03:40 +0100
+ -- Rene Engelhard <rene@debian.org> Mon, 19 Jan 2009 11:04:44 +0100
openoffice.org (1:3.0.1~rc2-1.2pre) experimental; urgency=low
+ * ooo-build:
+ - update (r15097)
+ * debian/rules:
+ - update xulrunner build-dep in MOZILLA=libxul case for current reality
+ - use UREPACKAGEVERSION for determining ures version, more correct and
+ also includes the micro. Remove +OOo3.0.0~ suffix as ure now is at 1.4.1
+ and we bump .shlibs anyway
+ * debian/control.in:
+ - make -common conflict against dictionaries-common (<< 0.98.14)
+ - move from Breaks: to Conflicts: as otherwise the experimental buildds
+ fail to install -common...
* merge from Ubuntu:
- make ure only Suggest a JRE
- * debian/rules:
- - update xulrunner build-dep in MOZILLA=libxul case for current reality
- -- Rene Engelhard <rene@debian.org> Wed, 14 Jan 2009 17:11:40 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 20 Jan 2009 14:05:04 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-01-15 06:46:03 +0000
+++ b/control 2009-01-20 15:51:52 +0000
@@ -117,8 +117,7 @@
Depends: openoffice.org-style-galaxy
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
-Breaks: openclipart-openoffice.org (<= 0.18+dfsg-5)
-Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version})
+Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-5), dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
Description: OpenOffice.org office suite architecture independent files
@@ -3056,7 +3055,7 @@
Section: libs
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
-Suggests: java2-runtime, cli-uno-bridge
+Suggests: java5-runtime, cli-uno-bridge
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
=== modified file 'control.in'
--- a/control.in 2009-01-08 21:31:04 +0000
+++ b/control.in 2009-01-20 15:51:52 +0000
@@ -261,7 +261,6 @@
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
openoffice.orgVER-style-crystal
-Breaks: openclipart-openoffice.org (<= 0.18+dfsg-5)
Conflicts: openoffice.org-debian-files,
openoffice.org-mimelnk,
openoffice.org2-common,
@@ -275,7 +274,9 @@
openoffice.org-impress (<< ${base-version}),
openoffice.org-draw (<< ${base-version}),
openoffice.org-math (<< ${base-version}),
- broffice.org (<< ${base-version})
+ broffice.org (<< ${base-version}),
+ openclipart-openoffice.org (<= 0.18+dfsg-5),
+ dictionaries-common (<< 0.98.14)
Provides: openoffice.org2-common,
openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files,
=== modified file 'control.ure.in'
--- a/control.ure.in 2009-01-14 16:23:59 +0000
+++ b/control.ure.in 2009-01-20 15:51:52 +0000
@@ -47,7 +47,7 @@
Section: libs
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}
-Suggests: java2-runtime, cli-uno-bridge
+Suggests: java5-runtime, cli-uno-bridge
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: openoffice.org-java-common (<< 1:3.0.0~dev300m12)
Description: UNO runtime environment
=== modified file 'copyright'
--- a/copyright 2009-01-07 01:38:14 +0000
+++ b/copyright 2009-01-19 15:54:17 +0000
@@ -1,5 +1,5 @@
Package: OpenOffice.org
-Obtained from: http://ftp.stardiv.de/pub/OpenOffice.org/contrib/rc/3.0.0rc4
+Obtained from: http://ftp.gwdg.de/pub/openoffice/extended/3.0.1rc2
Upstream authors: The OpenOffice.org and go-oo.org teams
Debian package authors: Peter Novodvorsky, Jan Palic, Chris Halls,
Rene Engelhard
=== modified file 'rules'
--- a/rules 2009-01-20 15:53:21 +0000
+++ b/rules 2009-01-20 16:06:30 +0000
@@ -2985,8 +2985,8 @@
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
- dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst awk '{ print $$2 }'))"
+ dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
dh_installdeb -s
ifeq "$(USE_SYSTEM_ICU)" "n"
cat debian/shlibs.override.icu >> debian/shlibs.local
Reply to: