./packages/openofficeorg/3.2/experimental r1803: merge

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 1803 [merge]
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2010-02-05 17:21:24 +0100
message:
  merge
modified:
  changelog
  control
  control.ure.in
  po/ar.po

=== modified file 'changelog'
--- a/changelog	2010-02-04 22:08:32 +0000
+++ b/changelog	2010-02-05 16:21:24 +0000
@@ -1,3 +1,12 @@
+openoffice.org (1:3.2.0~rc5-3) UNRELEASED; urgency=low
+
+  * ooo-build:
+    - update (9458f3d988dbe801fea678f4bb71a5a9eb627b66 - 3.0.99.5) 
+
+  * debian/control.ure.in: fix uno-libs3*'s ure replaces
+
+ -- Rene Engelhard <rene@debian.org>  Thu, 04 Feb 2010 23:13:51 +0100
+
 openoffice.org (1:3.2.0~rc5-2) experimental; urgency=low
 
   * ooo-build:

=== modified file 'control'
--- a/control	2010-02-04 09:49:49 +0000
+++ b/control	2010-02-05 16:21:24 +0000
@@ -3277,7 +3277,7 @@
 Section: libs
 Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: ure (<< 1:3.0.0~beta2-1)
+Replaces: ure (<< 1.4+OOo3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared libraries
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.
@@ -3300,7 +3300,7 @@
 Priority: extra
 Architecture: i386 powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa
 Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}
-Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
+Replaces: ure-dbg (<< 1.4+OOo3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.

=== modified file 'control.ure.in'
--- a/control.ure.in	2010-01-28 09:39:07 +0000
+++ b/control.ure.in	2010-02-05 15:56:55 +0000
@@ -3,7 +3,7 @@
 Architecture: %OOO_ARCHS%
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Replaces: ure (<< 1:3.0.0~beta2-1)
+Replaces: ure (<< 1.4+OOo3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared libraries
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.
@@ -27,7 +27,7 @@
 Architecture: %OOO_ARCHS%
 Depends: uno-libs3 (= ${ure:Version}),
  ${misc:Depends}
-Replaces: ure-dbg (<< 1:3.0.0~beta2-1)
+Replaces: ure-dbg (<< 1.4+OOo3.0.0~beta2-1)
 Description: OpenOffice.org UNO runtime environment -- public shared library debug symbols
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of OpenOffice.org, packaged up as an individual product.

=== modified file 'po/ar.po'
--- a/po/ar.po	2010-01-31 23:10:11 +0000
+++ b/po/ar.po	2010-02-05 14:33:32 +0000
@@ -1,15 +1,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Ossama M. Khayat <okhayat@yahoo.com>, 2009.
+# Ossama M. Khayat <okhayat@yahoo.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: openoffice.org@packages.debian.org\n"
 "POT-Creation-Date: 2010-02-01 00:04+0100\n"
-"PO-Revision-Date: 2009-10-26 00:06+0300\n"
+"PO-Revision-Date: 2010-02-05 17:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
+"Language-Team: American English <support@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +47,7 @@
 #. Description
 #: ../ure.templates.in:2001
 msgid "Component registries might be corrupted"
-msgstr ""
+msgstr "سجل المكوّنات قد يكون فاسداً"
 
 #. Type: note
 #. Description
@@ -58,6 +58,10 @@
 "program/services.rdb and the rdb files in /var/spool/openoffice/uno_packages/"
 "cache for installed extensions."
 msgstr ""
+" تقوم بالترقية من نسخة قد تحتوي ملفات سجل خدمة/مكونات "
+"فاسدة (*.rdb)، بالأخص /var/lib/openoffice/basis3.1/"
+"program/services.rdb وملفات rdb في /var/spool/openoffice/uno_packages/"
+"cache للامتدادات المثبتة."
 
 #. Type: note
 #. Description
@@ -68,3 +72,8 @@
 "files. Try cleanly reinstalling the packages and/or using a clean user "
 "profile."
 msgstr ""
+"إن واجهت مشالك في مدير المكوّنات أو مشاكل أخرى "
+"مرتبطة بمكتبة libstore في أي من unopkg أو أوبن أوفيس، الرجاء التحقق "
+"من هذه الملفات. حاول إعادة تثبيت الحزم و/أو استخدام ملف شخصي "
+"جديد للمستخدم."
+