CVS:oo-deb/debian changelog,1.417.2.11,1.417.2.12 control,1.197.2.4,1.197.2.5 control.in,1.164.2.4,1.164.2.5
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv23245
Modified Files:
Tag: OPENOFFICE_ORG_1_1_4
changelog control control.in
Log Message:
merge 1.1.3-7
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.417.2.11
retrieving revision 1.417.2.12
diff -u -d -r1.417.2.11 -r1.417.2.12
--- changelog 23 Feb 2005 23:35:11 -0000 1.417.2.11
+++ changelog 25 Feb 2005 07:34:08 -0000 1.417.2.12
@@ -1,4 +1,4 @@
-openoffice.org (1.1.4-0.1pre2) experimental; urgency=low
+openoffice.org (1.1.4-1) experimental; urgency=low
* New upstream release. (closes: #296390)
- fixes crash on opening some documents, closes: #273011
@@ -17,6 +17,17 @@
* ooo-build: back in branch ooo-build-1-3 [RE]
-- Rene Engelhard <rene@debian.org> Wed, 23 Feb 2005 23:50:47 +0100
+
+openoffice.org (1.1.3-7) unstable; urgency=high
+
+ * debian/rules:
+ - fix get-ooo-build to get right ooo-build branch [RE]
+ - add missing else to get the language-build special casing for the
+ buildds work again, makes them not build OOo completely twice.... [RE]
+ * debian/control.in:
+ - version conflict with kwin-style-baghira (<< 0.6) [CH]
+
+ -- Rene Engelhard <rene@debian.org> Wed, 23 Feb 2005 14:00:07 +0100
openoffice.org (1.1.3-6) unstable; urgency=high
Index: control.in
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control.in,v
retrieving revision 1.164.2.4
retrieving revision 1.164.2.5
diff -u -d -r1.164.2.4 -r1.164.2.5
--- control.in 20 Feb 2005 22:52:27 -0000 1.164.2.4
+++ control.in 25 Feb 2005 07:34:08 -0000 1.164.2.5
@@ -11,7 +11,7 @@
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>> 1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) | openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1, msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome | openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1, openclipart
-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, openoffice.org-spellcheck-nb-no (<= 20020814-1), openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1, openoffice.org-l10n-1.1.2, kwin-style-baghira, kwin-baghira (<< 0.6), openoffice.org-l10n-1.1.3
+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, openoffice.org-spellcheck-nb-no (<= 20020814-1), openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1, openoffice.org-l10n-1.1.2, kwin-style-baghira (<< 0.6), kwin-baghira (<< 0.6), openoffice.org-l10n-1.1.3
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
Index: control
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/control,v
retrieving revision 1.197.2.4
retrieving revision 1.197.2.5
diff -u -d -r1.197.2.4 -r1.197.2.5
--- control 20 Feb 2005 22:52:27 -0000 1.197.2.4
+++ control 25 Feb 2005 07:34:08 -0000 1.197.2.5
@@ -11,7 +11,7 @@
Architecture: all
Depends: openoffice.org-debian-files (>> 1.1.2+1.1.3), openoffice.org-bin (>> 1.1.2+1.1.3), openoffice.org-l10n-en (>> 1.1.2+1.1.3) | openoffice.org-l10n-1.1.3, dictionaries-common (>= 0.10) | openoffice.org-updatedicts, ttf-opensymbol
Suggests: myspell-dictionary, openoffice.org-help, menu, ooqstart-gnome | oooqs-kde, unixodbc, cupsys-bsd, libsane, ttf-bitstream-vera, prelink, openoffice.org-hyphenation, openoffice.org-thesaurus, libxrender1, msttcorefonts, openoffice.org-mimelnk, openoffice.org-gtk-gnome | openoffice.org-kde, openoffice.org-gnomevfs, xlibmesa-gl | libgl1, openclipart
-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, openoffice.org-spellcheck-nb-no (<= 20020814-1), openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1, openoffice.org-l10n-1.1.2, kwin-style-baghira, kwin-baghira (<< 0.6), openoffice.org-l10n-1.1.3
+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, openoffice.org-spellcheck-nb-no (<= 20020814-1), openoffice.org-spellcheck-nn-no (<= 20021023-1), openoffice.org-l10n-1.1.1, openoffice.org-l10n-1.1.2, kwin-style-baghira (<< 0.6), kwin-baghira (<< 0.6), openoffice.org-l10n-1.1.3
Replaces: openoffice.org1.1, openoffice-de-en, openoffice-de, openoffice.org-bin (<= 1.0.3-2), openoffice.org-gnome
Provides: openoffice.org1.1, openoffice-de-en, openoffice-de
Description: high-quality office productivity suite
Reply to: