Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv8174
Modified Files:
changelog control control.in
Log Message:
Tighten openoffice.org, openoffice.org-bin dependencies to
force -1 with the java libs off the system (closes:#218928)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- changelog 2 Nov 2003 01:54:38 -0000 1.226
+++ changelog 3 Nov 2003 16:17:56 -0000 1.227
@@ -28,11 +28,13 @@
- add missing libfreetype6-dev | g++-3.0 [RE]
- xsltproc version in Woody is too old and fails, so
require version >= 1.0.30 [CH]
+ - Tighten openoffice.org, openoffice.org-bin dependencies to
+ force -1 with the java libs off the system (closes:#218928) [CH]
* debian/MANIFEST.powerpc:
- Remove python-core so powerpc doesn't have to be built with
IGNORE_MANIFEST_CHANGES=1 [CH]
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 1 Nov 2003 00:05:18 +0100
+ -- Chris Halls <[EMAIL PROTECTED]> Mon, 3 Nov 2003 17:12:56 +0100
openoffice.org (1.1.0-2) unstable; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- control.in 31 Oct 2003 12:31:11 -0000 1.101
+++ control.in 3 Nov 2003 16:17:56 -0000 1.102
@@ -8,7 +8,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0+2), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, openoffice.org-gnome, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
@@ -44,7 +44,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.0)
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin
Provides: openoffice.org1.1-bin
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- control 31 Oct 2003 12:31:11 -0000 1.133
+++ control 3 Nov 2003 16:17:56 -0000 1.134
@@ -8,7 +8,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0), openoffice.org-bin (>>
1.1.0), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-debian-files (>> 1.1.0+2), openoffice.org-bin (>=
1.1.0-2), openoffice.org-l10n-en (>> 1.1.0) | openoffice.org-l10n-1.1.0.final,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
Recommends: x-ttcidfont-conf, openoffice.org-mimelnk
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, openoffice.org-gnome, prelink,
openoffice.org-hyphenation, openoffice.org-thesaurus
Conflicts: openoffice.org1.1, openoffice, openoffice.org-l10n,
openoffice.org-l10n-1.1.0, openoffice-de-en, openoffice-de, oooqs-kde (<=
1.0rc3-2), openoffice.org-spellcheck-de-de (<= 20020701-6),
openoffice.org-spellcheck-de-ch (<= 20020701-6),
openoffice.org-spellcheck-de-at (<= 20020701-6), openoffice.org-spellcheck-es
(<= 0.0.2002.01.20-2), openoffice.org-spellcheck-fr-fr (<= 20030727-2)
@@ -44,7 +44,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>> 1.1.0)
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>= 1.1.0-2)
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin
Provides: openoffice.org1.1-bin
