./packages/openofficeorg/3.2/experimental r1663: merge
------------------------------------------------------------
revno: 1663 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-10-02 19:33:40 +0200
message:
merge
added:
po/ru.po
po/tr.po
modified:
changelog
control
control.in
control.kde.in
po/de.po
po/templates.pot
rules
templates
=== modified file 'changelog'
--- a/changelog 2009-10-02 00:22:29 +0000
+++ b/changelog 2009-10-02 17:33:40 +0000
@@ -14,7 +14,7 @@
- now honours ACLs (closes: #216596, #548881)
* ooo-build:
- - update (571836c97355e18d01f5d26342e90d842809091f)
+ - update (6602305e8a0761b59b2dea4730f9a933cc991ecf)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -46,7 +46,7 @@
* debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <rene@debian.org> Fri, 02 Oct 2009 02:15:47 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 02 Oct 2009 19:31:25 +0200
openoffice.org (1:3.1.1-3) UNRELEASED; urgency=low
@@ -72,8 +72,14 @@
(closes: #548608)
- fix lang= handling for DEB_BUILD_OPTIONS
- point --with-external-{dict,hyph,thes}-dir to the new locations
- * debian/control.in: break dict/hyphen patterns/thesauri packages
- with the old location
+ - build against libneon27-gnutls-dev (closes: #534243)
+ * debian/control.in:
+ - break dict/hyphen patterns/thesauri packages with the old location
+ - stop making -common have a hard depends on the default iconset; make
+ it depend on openoffice.orgVER-style-default | openoffice.orgVER-style
+ and make -gtk/-kde only recommend -style-tango/-style-{crystal,oxgen}.
+ Provide openoffice.orgVER-style on all -style-* (closes: #423021)
+ Stop -style-* depending on -common (closes: #406778)
* debian/control.mysql.in: remove bogus conflicts, add Homepage:
* debian/shell-lib.sh:
- check whether OOo is running before (de-)registering extensions or
@@ -82,7 +88,7 @@
it breaks. Removing "Adding extension XY .. done" echos
* debian/templates, debian/po: add debconf error shown when OOo is running
- -- Rene Engelhard <rene@debian.org> Wed, 30 Sep 2009 13:49:29 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 02 Oct 2009 14:55:07 +0200
openoffice.org (1:3.1.1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-02 00:22:29 +0000
+++ b/control 2009-10-02 17:33:40 +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 , 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-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 , 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-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
@@ -114,7 +114,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: openoffice.org-style-galaxy, ${misc:Depends}
+Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-oxygen, xfonts-mathml
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>= 1:${basis-version}.99)
@@ -251,9 +251,10 @@
Package: openoffice.org-style-crystal
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Crystal symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -262,9 +263,10 @@
Package: openoffice.org-style-oxygen
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Oxygen symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -273,9 +275,10 @@
Package: openoffice.org-style-industrial
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Industrial symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -284,9 +287,10 @@
Package: openoffice.org-style-tango
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: tango-icon-theme
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Tango symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -296,9 +300,10 @@
Package: openoffice.org-style-hicontrast
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Hicontrast symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -308,10 +313,10 @@
Package: openoffice.org-style-galaxy
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.org-common (<< 2.1~m190), openoffice.org-style-default, openoffice.org-style-andromeda
Conflicts: openoffice.org-style-default
-Provides: openoffice.org-style-default
+Provides: openoffice.org-style-default, openoffice.org-style
Description: full-featured office productivity suite -- Galaxy (Default) symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -322,8 +327,9 @@
Package: openoffice.org-style-andromeda
Architecture: all
-Depends: openoffice.org-common (= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.org-common (<< 2.1~m190)
+Provides: openoffice.org-style
Description: full-featured office productivity suite -- Andromeda (Classic) symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -335,7 +341,8 @@
Package: openoffice.org-gtk
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-style-tango, ${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: openoffice.org-style-tango,
Section: gnome
Enhances: openoffice.org
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<< 2.0.4~rc1-0)
@@ -875,7 +882,8 @@
Package: openoffice.org-kde
Architecture: i386 powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
-Depends: openoffice.org-core (= ${binary:Version}), ${kde-iconset-dep}, ${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: ${kde-iconset-dep}
Suggests: konqueror, kmail, openoffice.org-kab
Section: kde
Enhances: openoffice.org
=== modified file 'control.in'
--- a/control.in 2009-10-02 00:22:29 +0000
+++ b/control.in 2009-10-02 17:33:40 +0000
@@ -260,7 +260,7 @@
Package: openoffice.orgVER-common
Architecture: all
-Depends: openoffice.orgVER-style-galaxy,
+Depends: openoffice.orgVER-style-default | openoffice.orgVER-style,
${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast
@@ -501,10 +501,10 @@
Package: openoffice.orgVER-style-crystal
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Crystal symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -513,10 +513,10 @@
Package: openoffice.orgVER-style-oxygen
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Oxygen symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -525,10 +525,10 @@
Package: openoffice.orgVER-style-industrial
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Industrial symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -537,10 +537,10 @@
Package: openoffice.orgVER-style-tango
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: tango-icon-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Tango symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -550,10 +550,10 @@
Package: openoffice.orgVER-style-hicontrast
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Suggests: gtk2-engines
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Hicontrast symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -563,11 +563,10 @@
Package: openoffice.orgVER-style-galaxy
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 2.1~m190), openoffice.orgVER-style-default, openoffice.org-style-andromeda
Conflicts: openoffice.orgVER-style-default
-Provides: openoffice.orgVER-style-default
+Provides: openoffice.orgVER-style-default, openoffice.orgVER-style
Description: full-featured office productivity suite -- Galaxy (Default) symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -578,9 +577,9 @@
Package: openoffice.orgVER-style-andromeda
Architecture: all
-Depends: openoffice.orgVER-common (= ${source:Version}),
- ${misc:Depends}
+Depends: ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 2.1~m190)
+Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Andromeda (Classic) symbol style
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -593,9 +592,9 @@
Package: openoffice.orgVER-gtk
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- openoffice.orgVER-style-tango,
${shlibs:Depends},
${misc:Depends}
+Recommends: openoffice.orgVER-style-tango,
Section: gnome
Enhances: openoffice.orgVER
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0),
=== modified file 'control.kde.in'
--- a/control.kde.in 2009-09-29 11:08:34 +0000
+++ b/control.kde.in 2009-10-02 12:23:41 +0000
@@ -1,9 +1,9 @@
Package: openoffice.orgVER-kde
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${binary:Version}),
- ${kde-iconset-dep},
${shlibs:Depends},
${misc:Depends}
+Recommends: ${kde-iconset-dep}
Suggests: konqueror,
kmail,
openoffice.orgVER-kab
=== modified file 'po/de.po'
--- a/po/de.po 2009-10-01 16:02:24 +0000
+++ b/po/de.po 2009-10-02 17:33:40 +0000
@@ -38,7 +38,7 @@
#. Description
#: ../templates:1001
msgid ""
-"Please close OpenOffice.org (including a eventually running Quickstarter)."
+"Please close OpenOffice.org (including an eventually running Quickstarter)."
msgstr ""
"Bitte schliessen Sie OpenOffice.org (inkl. einem evtl. laufenden "
"Quickstarter)"
=== added file 'po/ru.po'
--- a/po/ru.po 1970-01-01 00:00:00 +0000
+++ b/po/ru.po 2009-10-02 10:23:26 +0000
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2009 Rail Aliev <rail@i-rs.ru>
+# This file is distributed under the same license as the openoffice.org package.
+# Rail Aliev <rail@i-rs.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-09-29 12:50+0200\n"
+"PO-Revision-Date: 2009-10-02 14:20+0400\n"
+"Last-Translator: Rail Aliev <rail@i-rs.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.4.0\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "OpenOffice.org running!"
+msgstr "OpenOffice.org запущен!"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenOffice.org is running right now. A running OpenOffice.org makes "
+"extension (de-)registration not possible and it causes problems with "
+"(de-)registering components."
+msgstr ""
+"OpenOffice.org в данный момент запущен. Установка и удаление расширений при "
+"работающем OpenOffice.org невозможна, а регистрация компонентов может "
+"привести к проблемам."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"Please close OpenOffice.org (including an eventually running Quickstarter)."
+msgstr "Завершите работу OpenOffice.org (включая Быстрый запуск)."
=== modified file 'po/templates.pot'
--- a/po/templates.pot 2009-10-01 16:02:24 +0000
+++ b/po/templates.pot 2009-10-02 17:33:40 +0000
@@ -35,7 +35,7 @@
#. Description
#: ../templates:1001
msgid ""
-"Please close OpenOffice.org (including a eventually running Quickstarter)."
+"Please close OpenOffice.org (including an eventually running Quickstarter)."
msgstr ""
#. Type: note
=== added file 'po/tr.po'
--- a/po/tr.po 1970-01-01 00:00:00 +0000
+++ b/po/tr.po 2009-10-02 10:23:26 +0000
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2009 Rail Aliev <rail@i-rs.ru>
+# This file is distributed under the same license as the openoffice.org package.
+# Rail Aliev <rail@i-rs.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
+"POT-Creation-Date: 2009-09-29 12:50+0200\n"
+"PO-Revision-Date: 2009-10-02 14:11+0400\n"
+"Last-Translator: Rail Aliev <rail@i-rs.ru>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Virtaal 0.4.0\n"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid "OpenOffice.org running!"
+msgstr "OpenOffice.org çalışıyor!"
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"OpenOffice.org is running right now. A running OpenOffice.org makes "
+"extension (de-)registration not possible and it causes problems with "
+"(de-)registering components."
+msgstr ""
+"OpenOffice.org şu anda çalışıyor. Çalışan OpenOffice.org eklentilerin "
+"kurulum ve kaldırmasını imkansız kılıyor ve bileşenlerin kaydı sırasında "
+"sorunlara yol açabilir."
+
+#. Type: error
+#. Description
+#: ../templates:1001
+msgid ""
+"Please close OpenOffice.org (including an eventually running Quickstarter)."
+msgstr "Lütfen OpenOffice.org uygulamasını kapatın (hızlı başlatıcı dahil)."
=== modified file 'rules'
--- a/rules 2009-10-02 00:22:29 +0000
+++ b/rules 2009-10-02 17:33:40 +0000
@@ -183,6 +183,7 @@
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
+NEON_SECTYPE=gnutls
NEONSONR=27
# can't be enabled when odfmetdatadata2 included because librdf doesn't
# include some of OOos patches (as to 1.0.7), see issue 90956.
@@ -1053,8 +1054,13 @@
endif
ifeq "$(USE_SYSTEM_NEON)" "y"
+ ifneq "$(NEON_SECTYPE)" "openssl"
+ BUILD_DEPS += , libneon$(NEONSONR)-$(NEON_SECTYPE)-dev
+ DBG_DBG_SUGGESTS+= , libneon$(NEONSONR)-$(NEON_SECTYPE)-dbg
+ else
BUILD_DEPS += , libneon$(NEONSONR)-dev
DBG_DBG_SUGGESTS+= , libneon$(NEONSONR)-dbg
+ endif
CONFIGURE_FLAGS += --with-system-neon
endif
=== modified file 'templates'
--- a/templates 2009-09-29 11:08:34 +0000
+++ b/templates 2009-10-02 10:23:26 +0000
@@ -5,4 +5,4 @@
extension (de-)registration not possible and it causes problems with
(de-)registering components.
.
- Please close OpenOffice.org (including a eventually running Quickstarter).
+ Please close OpenOffice.org (including an eventually running Quickstarter).
Reply to: