Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv569
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
changelog control control.in
Log Message:
* debian/control.in:
+ Tighten dependencies between packages to ensure all main packages are at
least 1.1.1rc3 (closes: #239193)
* 1.1.0+cvs20040317-1.2pre
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.29
retrieving revision 1.262.4.30
diff -u -d -r1.262.4.29 -r1.262.4.30
--- changelog 19 Mar 2004 03:25:53 -0000 1.262.4.29
+++ changelog 22 Mar 2004 12:47:48 -0000 1.262.4.30
@@ -1,3 +1,11 @@
+openoffice.org (1.1.0+cvs20040317-1.2pre) unstable; urgency=low
+
+ * debian/control.in:
+ + Tighten dependencies between packages to ensure all main packages are at
+ least 1.1.1rc3 (closes: #239193) [CH]
+
+ -- Chris Halls <[EMAIL PROTECTED]> Mon, 22 Mar 2004 13:44:12 +0100
+
openoffice.org (1.1.0+cvs20040317-1) unstable; urgency=low
* New CVS co (SRX645_m35 as of 20040317) -> 1.1.0+1.1.1rc3 [RE]
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.11
retrieving revision 1.114.4.12
diff -u -d -r1.114.4.11 -r1.114.4.12
--- control.in 17 Mar 2004 22:16:37 -0000 1.114.4.11
+++ control.in 22 Mar 2004 12:47:48 -0000 1.114.4.12
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc), openoffice.org-bin
(>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) |
openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts${debianutils-depends}
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin
(>> 1.1.0+1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) |
openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts${debianutils-depends}
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts,
openoffice.org-mimelnk
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),
openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -40,7 +40,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>=
1.1.0-2)${java-additional-depends}
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>>
1.1.0+1.1rc3)${java-additional-depends}
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
@@ -72,7 +72,7 @@
Section: utils
Architecture: i386 powerpc s390 sparc
Enhances: openoffice.org
-Depends: ${shlibs:Depends}, openoffice.org (>> 1.0.99+1.1rc)
+Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.0+1.1rc3)
Description: OpenOffice.org crash reporting tool
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.14
retrieving revision 1.147.4.15
diff -u -d -r1.147.4.14 -r1.147.4.15
--- control 17 Mar 2004 22:16:37 -0000 1.147.4.14
+++ control 22 Mar 2004 12:47:48 -0000 1.147.4.15
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc), openoffice.org-bin
(>= 1.1.0-2), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) |
openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts${debianutils-depends}
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin
(>> 1.1.0+1.1rc3), openoffice.org-l10n-en (>> 1.1.0+1.1.1a) |
openoffice.org-l10n-1.1.1, dictionaries-common (>= 0.10) |
openoffice.org-updatedicts${debianutils-depends}
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome |
oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera,
openoffice.org-crashrep, prelink, openoffice.org-hyphenation,
openoffice.org-thesaurus, www-browser, libxrender1, msttcorefonts,
openoffice.org-mimelnk
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),
openoffice.org-gnome
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de,
openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
@@ -40,7 +40,7 @@
Package: openoffice.org-bin
Architecture: i386 powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>=
1.1.0-2)${java-additional-depends}
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>>
1.1.0+1.1rc3)${java-additional-depends}
Conflicts: openoffice.org1.1-bin
Replaces: openoffice.org1.1-bin, openoffice.org-gnome
Provides: openoffice.org1.1-bin
@@ -72,7 +72,7 @@
Section: utils
Architecture: i386 powerpc s390 sparc
Enhances: openoffice.org
-Depends: ${shlibs:Depends}, openoffice.org (>> 1.0.99+1.1rc)
+Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.0+1.1rc3)
Description: OpenOffice.org crash reporting tool
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
