Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv15303
Modified Files:
changelog control.in
Log Message:
and the next typo: 1.1rc3 < 1.1.1a; this was not intended, a .1 was missing
to have the desired effect
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -d -r1.280 -r1.281
--- changelog 29 Mar 2004 17:31:31 -0000 1.280
+++ changelog 30 Mar 2004 02:07:03 -0000 1.281
@@ -4,7 +4,7 @@
source .tar.bz2
* debian/control.in:
- Tighten dependencies between packages to ensure all main packages are at
- least 1.1.1rc3 (closes: #239193) [CH]
+ least 1.1.1rc3 (closes: #239193) [CH, RE]
* debian/rules:
- Remove new binary bitmaps for Red Hat [CH]
- remove version infos from the remaining .desktop files to get
@@ -15,7 +15,7 @@
* debian/shell-lib.sh:
- add message() taken from xfree86 (closes: #233424)
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 28 Mar 2004 16:51:19 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 30 Mar 2004 03:59:37 +0200
openoffice.org (1.1.0+cvs20040317-1) unstable; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- control.in 22 Mar 2004 15:20:14 -0000 1.118
+++ control.in 30 Mar 2004 02:07:03 -0000 1.119
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
-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}
+Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1rc3), openoffice.org-bin
(>> 1.1.0+1.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+1.1rc3)${java-additional-depends}
+Depends: ${shlibs:Depends}, ${debconf-depends}, openoffice.org (>>
1.1.0+1.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.1.0+1.1rc3)
+Depends: ${shlibs:Depends}, openoffice.org (>> 1.1.0+1.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.
