CVS:oo-deb/debian changelog,1.262.4.11,1.262.4.12 control,1.147.4.10,1.147.4.11 control.in,1.114.4.7,1.114.4.8
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv27450
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
changelog control control.in
Log Message:
* The "Hopefully the last one for 1.1.1rc, really...." commit.
depend on the right version of oo-d-f, cvsXXXYYYZZZ > 1.1.1rc...
and actually _do_ the depends....
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.262.4.11
retrieving revision 1.262.4.12
diff -u -d -r1.262.4.11 -r1.262.4.12
--- changelog 2 Mar 2004 22:52:31 -0000 1.262.4.11
+++ changelog 3 Mar 2004 07:23:17 -0000 1.262.4.12
@@ -25,7 +25,7 @@
- s/libdb3++dev/libdb3++-dev | libdb++-dev/ [RE]
- add new ${java-additional-depends} substvar which adds a
dependency to libdbX.Y-java on java builds [RE]
- - depend on openoffice.org-debian-files (>> 1.1.0+cvs20040229) [RE]
+ - depend on openoffice.org-debian-files (>> 1.1.0+1.1.1rc) [RE]
- bump version of -l10n virtual package; openoffice.org depends on
openoffice.org-10n-en (>> 1.1.0+1.1.a) | openoffice.org-l10n-1.1.1
* debian/local/openoffice-xlate-lang:
@@ -41,7 +41,7 @@
- use ooo-icons_OOO_1_1-8 [RE]
* merge 1.1.0-6 [RE]
- -- Rene Engelhard <rene@debian.org> Mon, 1 Mar 2004 18:07:16 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 3 Mar 2004 08:14:51 +0100
openoffice.org (1.1.0+1.1.1a-1) experimental; urgency=low
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.114.4.7
retrieving revision 1.114.4.8
diff -u -d -r1.114.4.7 -r1.114.4.8
--- control.in 3 Mar 2004 03:24:45 -0000 1.114.4.7
+++ control.in 3 Mar 2004 07:23:17 -0000 1.114.4.8
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1a), 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.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}
Recommends: openoffice.org-mimelnk
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
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
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.147.4.10
retrieving revision 1.147.4.11
diff -u -d -r1.147.4.10 -r1.147.4.11
--- control 3 Mar 2004 03:24:45 -0000 1.147.4.10
+++ control 3 Mar 2004 07:23:17 -0000 1.147.4.11
@@ -9,7 +9,7 @@
Package: openoffice.org
Architecture: all
-Depends: openoffice.org-debian-files (>> 1.1.0+1.1.1a), 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.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}
Recommends: openoffice.org-mimelnk
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
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
Reply to: