./packages/openofficeorg/3.2/experimental r1694: merge
------------------------------------------------------------
revno: 1694 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-11-13 19:49:01 +0100
message:
merge
added:
openoffice.org-common.lintian-overrides.in
po/es.po
po/fi.po
po/fr.po
po/gl.po
po/it.po
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-11-10 21:04:13 +0000
+++ b/changelog 2009-11-13 18:49:01 +0000
@@ -2,8 +2,6 @@
* ooo-build:
- update (ca4067bb9997ac3f64141c46078f6c8adfbbff0e)
- - icc-use-sal-endianness-and-types.diff: use correct endianess
- in icc (closes: #536348)
* debian/control.in:
- make -core conflict against -style-* (<< 1:3.2.0~beta)
@@ -16,6 +14,35 @@
-- Rene Engelhard <rene@debian.org> Tue, 10 Nov 2009 21:56:17 +0100
+openoffice.org (1:3.1.1-7) UNRELEASED; urgency=low
+
+ * ooo-build
+ - update (06bcdf6420e39ef6aff6f313bc9626b9fdac6b06)
+ - icc-use-sal-endianness-and-types.diff: use correct endianess
+ in icc (closes: #536348)
+ - xulrunner-1.9.1.diff: fix build with xulrunner 1.9.1
+
+ * debian/po:
+ - add
+ - fi.po (thanks Esko Arajärvi, closes: #554031)
+ - fr.po (thanks L.F.Templeton, closes: #554374)
+ - es.po (thanks Francisco Javier Cuadrado, closes: #554713)
+ - gl.po (thanks Marce Villarino, closes: #554988)
+ - it.po (thanks Vincenzo Campanella, closes: #556111)
+ * debian/rules:
+ - revert build-dep bump for armel, as it does not help as of latest
+ findings and the bug probably is in OOo...
+ - remove useless empty dir /usr/lib/openoffice/ure in -core
+ - bump libgcj-common build-dep to 1:4.4.1-1 to fix lintian warnings
+ (command-with-path-in-maintainer-script)
+ - install /usr/share/openoffice/shell-lib-extensions.sh only with 644;
+ thanks lintian
+ - MOZILLA=libxul (closes: #555912)
+ * debian/openoffice.org-common.lintian-overrides.in: override
+ E: openoffice.org-common: no-debconf-config
+
+ -- Rene Engelhard <rene@debian.org> Fri, 13 Nov 2009 19:21:47 +0100
+
openoffice.org (1:3.2.0~beta-1) experimental; urgency=low
* OpenOffice.org 3.2.0 beta (OOO320_m2)
@@ -67,7 +94,7 @@
-- Rene Engelhard <rene@debian.org> Sat, 31 Oct 2009 19:21:37 +0100
-openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-6) unstable; urgency=low
[ Rene Engelhard ]
* ooo-build:
=== modified file 'control'
--- a/control 2009-11-04 10:24:09 +0000
+++ b/control 2009-11-13 18:49:01 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common (>= 1:4.4.0) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x], libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64 ppc64 s390x] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x], libgcj-common (>= 1:4.4.1-1) [i386 mips mipsel s390 armel amd64 ia64 s390x] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libformula-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386 amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>= 1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x], libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== added file 'openoffice.org-common.lintian-overrides.in'
--- a/openoffice.org-common.lintian-overrides.in 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-common.lintian-overrides.in 2009-11-05 14:00:31 +0000
@@ -0,0 +1,1 @@
+openoffice.org-common: no-debconf-config
=== added file 'po/es.po'
--- a/po/es.po 1970-01-01 00:00:00 +0000
+++ b/po/es.po 2009-11-06 10:08:24 +0000
@@ -0,0 +1,68 @@
+# openoffice.org po-debconf translation to Spanish
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the openoffice.org package.
+#
+# Changes:
+# - Initial translation
+# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openoffice.org 1:3.1.1-6\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-10-26 09:00+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org se está ejecutando"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+#, fuzzy
+#| msgid ""
+#| "OpenOffice.org is running right now. This can cause problems with (de-)"
+#| "regstration of components and extensions."
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org se está ejecutando ahora mismo. Esto puede causar problemas "
+"con el registro o borrado de componentes y extensiones."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Debería cerrar todas las instancias de OpenOffice.org (incluyendo cualquier "
+"Quickstarter actualmente en ejecución) antes de proceder con la "
+"actualización del paquete."
=== added file 'po/fi.po'
--- a/po/fi.po 1970-01-01 00:00:00 +0000
+++ b/po/fi.po 2009-11-04 09:48:33 +0000
@@ -0,0 +1,43 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the openoffice.org package.
+#
+# Esko Arajärvi <edu@iki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-11-02 21:16+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org käynnissä"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org on parhaillaan käynnissä. Tämä voi aiheuttaa ongelmia "
+"komponenttien ja laajennosten lisäyksen tai poiston kanssa."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Sulje kaikki OpenOffice.orgin käynnissä olevat instanssit (mukaan lukien "
+"Quickstarterit) ennen kuin jatkat paketin päivitystä."
=== added file 'po/fr.po'
--- a/po/fr.po 1970-01-01 00:00:00 +0000
+++ b/po/fr.po 2009-11-05 08:20:59 +0000
@@ -0,0 +1,49 @@
+# French Translation of openoffice.org debconf template
+# Copyright (C) 2009 Debian French l10n Team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the openoffice.org package.
+# Translator:
+# L.F. Templeton <f.templeton@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openoffice.org_3.1.1-2\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-10-30 21:05+0100\n"
+"Last-Translator: L.F.Templeton <f.templeton@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org actuellement lancé"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org est actuellement lancé. Cela peut engendrer des problèmes "
+"lors de l'ajout (ou suppression) d'extensions et de composants."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Vous devriez fermer toutes les instances d'OpenOffice.org actuellement "
+"ouvertes (y compris les Quickstarter) avant de mettre à jour le paquet."
+
+#~ msgid ""
+#~ "Please close OpenOffice.org (including an eventually running "
+#~ "Quickstarter)."
+#~ msgstr ""
+#~ "Merci de fermer OpenOffice.org (y compris Quickstarter s'il est lancé)."
=== added file 'po/gl.po'
--- a/po/gl.po 1970-01-01 00:00:00 +0000
+++ b/po/gl.po 2009-11-09 04:31:35 +0000
@@ -0,0 +1,48 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Marce Villarino <mvillarino@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-11-07 19:54+0100\n"
+"Last-Translator: Marce Villarino <mvillarino@gmail.com>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org está a executarse"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+#, fuzzy
+#| msgid ""
+#| "OpenOffice.org is running right now. This can cause problems with (de-)"
+#| "regstration of components and extensions."
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"OpenOffice.org está a executarse nestes momentos. Isto pode traer problemas "
+"co (des)rexistro das compoñentes e extensións."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"Debería pechar todas as instancias de OpenOffice.org en execución (incluíndo "
+"calquera Quickstarter que se estea a executar) antes de continuar coa "
+"actualización do paquete."
=== added file 'po/it.po'
--- a/po/it.po 1970-01-01 00:00:00 +0000
+++ b/po/it.po 2009-11-13 16:31:08 +0000
@@ -0,0 +1,48 @@
+# ITALIAN TRANSLATION OF OPENOFFICE.ORG PO-DEBCONFIG.
+# COPYRIGHT (C) 2009 THE OPENOFFICE.ORG'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the OpenOffice.org package.
+#
+# Vincenzo Campanella <vinz65@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OPENOFFICE.ORG 1:3.1.1-6\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-10-31 13:04+0100\n"
+"PO-Revision-Date: 2009-10-28 08:27+0100\n"
+"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid "OpenOffice.org running"
+msgstr "OpenOffice.org è in esecuzione"
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+#, fuzzy
+#| msgid ""
+#| "OpenOffice.org is running right now. This can cause problems with (de-)"
+#| "regstration of components and extensions."
+msgid ""
+"OpenOffice.org is running right now. This can cause problems with (de-)"
+"registration of components and extensions."
+msgstr ""
+"Attualmente OpenOffice.org è in esecuzione. Questo potrebbe causare problemi "
+"con la (de-)registrazione delle componenti e delle estensioni."
+
+#. Type: error
+#. Description
+#: ../openoffice.org-common.templates.in:2001
+msgid ""
+"You should close all running instances of OpenOffice.org (including any "
+"currently running Quickstarter) before proceeding with the package upgrade."
+msgstr ""
+"È necessario chiudere tutte le istanze di OpenOffice.org, incluso l'avvio "
+"rapido se attualmente in esecuzione, prima di procedere con l'aggiornamento "
+"del pacchetto."
=== modified file 'rules'
--- a/rules 2009-11-09 08:38:56 +0000
+++ b/rules 2009-11-13 18:49:01 +0000
@@ -203,7 +203,7 @@
USE_BZIP_COMPRESS=n
PRUNE_OOOBUILD=y
PARALLEL_BUILD=n
-MOZILLA=iceape
+MOZILLA=libxul
ENABLE_LDAP=y
USE_OPENLDAP=y
ENABLE_OPENGL=y
@@ -328,6 +328,7 @@
DICT_DIR=/usr/share/myspell/dicts
HYPH_DIR=/usr/share/myspell/dicts
THES_DIR=/usr/share/myspell/dicts
+ MOZILLA=iceape
endif
#############
@@ -465,11 +466,6 @@
ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390]
endif
-ifeq (armel,$(findstring armel,$(OOO_ARCHS)))
- ifeq "$(shell gcc --version | head -n 1 | awk '{print $$4}' | cut -d. -f1,2)" "4.4"
- BUILD_DEPS += , binutils (>= 2.20) [armel], gcc-4.4 (>= 4.1.1-6) [armel], g++-4.4 (>= 4.1.1-6) [armel]
- endif
-endif
OOO_MOZILLA_ARCHS=i386 powerpc mips mipsel s390 arm armel
ifeq "$(BUILD_AMD64)" "y"
@@ -693,7 +689,7 @@
ifeq "$(LENNY_BACKPORT)" "y"
BUILD_DEPS += , gij [$(OOO_GCJ_ARCHS)], java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_GCJ_ARCHS)], libgcj-bc [$(OOO_GCJ_ARCHS)]
else
- BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.0) [$(OOO_GCJ_ARCHS)]
+ BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.1-1) [$(OOO_GCJ_ARCHS)]
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
@@ -2464,6 +2460,9 @@
> debian/cli-uno-bridge/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
endif
+ # should be empty now, remove
+ rmdir $(PKGDIR)-core/$(OOBRANDDIR)/ure
+
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(USE_SYSTEM_STLPORT)" "y"
# when we use external stlport, we just can and should do a symlink
@@ -3159,7 +3158,7 @@
chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
# install extension shell lib for use by extensions not from here
- install -D -m755 debian/shell-lib-extensions.sh \
+ install -D -m644 debian/shell-lib-extensions.sh \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/shell-lib-extensions.sh
# those are needed in /usr/share, too
Reply to: