[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1-l10n, updated. cb6801247316d2fc9e41144ab96ef7c504e6b9be
The following commit has been merged in the ubuntu-natty-3.3.1-l10n branch:
commit 2221bcc52ba32635c8f9e0b8747d921af69b3dd5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 24 15:03:56 2011 +0100
this is l10n, regenerate control file
diff --git a/changelog b/changelog
index 37a3da4..8537e69 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.3.2-1ubuntu1) natty; urgency=low
+libreoffice-l10n (1:3.3.2-1ubuntu1) natty; urgency=low
* merged all changes from ubuntu-natty-3.3.1 up to 3.3.2-1ubuntu1
* regenerated control file
diff --git a/control b/control
index e6e35d0..ce050c7 100644
--- a/control
+++ b/control
@@ -156,34 +156,11 @@ Description: office productivity suite -- Belarussian language package
Package: libreoffice-l10n-bg
Section: localization
Architecture: all
-<<<<<<< HEAD
Depends: libreoffice-common (>= ${base-version}) | language-support-translations-bg, libreoffice-common (<< 1:${next-basis-version}~) | language-support-translations-bg, ${l10n-common-depends}, ${misc:Depends}
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-bg
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-bg | myspell-dictionary-bg, hyphen-bg, mythes-bg, libreoffice-help-bg
Description: office productivity suite -- Bulgarian language package
-=======
-Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
-Suggests: libreoffice-style-hicontrast, libreoffice-style-tango, libreoffice-style-crystal, libreoffice-style-oxygen, libreoffice-style-human
-Recommends: xfonts-mathml, ${textcat-data-recommends}
-Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<< 1:3.3.0~)
-Provides: libreoffice-l10n-en-us
-Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
- libreoffice-style-oxygen (<< 1:${basis-version}~),
- libreoffice-style-industrial,
- libreoffice-style-tango (<< 1:${basis-version}~),
- libreoffice-style-hicontrast (<< 1:${basis-version}~),
- libreoffice-style-galaxy (<< 1:${basis-version}~),
- libreoffice-style-andromeda (<< 1:${basis-version}~),
- libreoffice-style-crystal (>= 1:${next-basis-version}~),
- libreoffice-style-oxygen (>= 1:${next-basis-version}~),
- libreoffice-style-tango (>= 1:${next-basis-version}~),
- libreoffice-style-hicontrast (>= 1:${next-basis-version}~),
- libreoffice-style-galaxy (>= 1:${next-basis-version}~),
- libreoffice-style-andromeda (>= 1:${next-basis-version}~)
-Replaces: openoffice.org-common (<< 1:3.3.0~)
-Description: office productivity suite -- arch-independent files
->>>>>>> ubuntu-natty-3.3.1
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@ -1164,7 +1141,6 @@ Description: office productivity suite -- Mongolian language package
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-<<<<<<< HEAD
Package: libreoffice-l10n-ml
Section: localization
Architecture: all
@@ -1173,25 +1149,6 @@ Recommends: libreoffice-core (>> ${base-version}) | language-support-translation
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-ml | myspell-dictionary-ml, hyphen-ml, mythes-ml, libreoffice-help-ml
Description: office productivity suite -- Malayalam language package
-=======
-Package: mozilla-libreoffice
-Section: net
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Enhances: iceape-browser,
- iceweasel,
- mozilla-browser,
- firefox,
- libreoffice,
- libreoffice-core
-Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
-Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins, libreoffice-writer, libreoffice-calc, libreoffice-draw, libreoffice-impress, libreoffice-math, libreoffice-base
-Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
-Xb-Npp-Name: OpenOffice.org Plug-in
-Xb-Npp-MimeType: application/vnd.stardivision.calc, application/vnd.stardivision.chart, application/vnd.stardivision.draw, application/vnd.stardivision.impress, application/vnd.stardivision.impress-packed, application/vnd.stardivision.math, application/vnd.stardivision.writer, application/vnd.stardivision.writer-global, application/vnd.staroffice.writer, application/vnd.sun.xml.calc, application/vnd.sun.xml.calc.template, application/vnd.sun.xml.draw, application/vnd.sun.xml.draw.template, application/vnd.sun.xml.impress, application/vnd.sun.xml.impress.template, application/vnd.sun.xml.math, application/vnd.sun.xml.writer, application/vnd.sun.xml.writer.global, application/vnd.sun.xml.writer.template, application/vnd.oasis.opendocument.text, application/vnd.oasis.opendocument.text-template, application/vnd.oasis.opendocument.text-master, application/vnd.oasis.opendocument.text-web, application/vnd.oasis.opendocument.spreadsheet, application/vnd.oasis.opendocument.spreadshee
t-template, application/vnd.oasis.opendocument.graphics, application/vnd.oasis.opendocument.graphics-template, application/vnd.oasis.opendocument.presentation, application/vnd.oasis.opendocument.presentation-template, application/vnd.oasis.opendocument.formula
-Conflicts: mozilla-openoffice.org (<< 1:3.3.0~)
-Replaces: mozilla-openoffice.org
-Description: office productivity suite -- Mozilla plugin
->>>>>>> ubuntu-natty-3.3.1
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@ -1239,21 +1196,11 @@ Description: office productivity suite -- Marathi language package
Package: libreoffice-l10n-nb
Section: localization
Architecture: all
-<<<<<<< HEAD
Depends: libreoffice-common (>= ${base-version}) | language-support-translations-nb, libreoffice-common (<< 1:${next-basis-version}~) | language-support-translations-nb, ${l10n-common-depends}, ${misc:Depends}
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nb
Provides: libreoffice-l10n-${help-l10n-virtual-version}
Suggests: hunspell-dictionary-nb | myspell-dictionary-nb, hyphen-nb, mythes-nb, libreoffice-help-nb
Description: office productivity suite -- Norwegian language package
-=======
-Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreoffice-core, libreoffice-java-common, ${misc:Depends}
-Enhances: libreoffice-writer
-Recommends: ${lucene-depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Suggests: mediawiki
-Description: LibreOffice extension for working with MediaWiki articles
->>>>>>> ubuntu-natty-3.3.1
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
--
LibreOffice packaging repository
Reply to: