[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-173-g3127934



The following commit has been merged in the debian-experimental-3.5 branch:
commit 553a7f4d72d7640e147f2c1cdf267cec2c2656b8
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Dec 21 22:13:35 2011 +0100

    migrate reportdesign-mention-package.diff from libreoffice/build

diff --git a/changelog b/changelog
index 3c724ed..a25b184 100644
--- a/changelog
+++ b/changelog
@@ -30,6 +30,8 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
       /usr/share/dpkg/*.mk
   * debian/control.in:
      - update descriptions for new Gtk(3) print dialog
+  * debian/patches:
+     - migrate reportdesign-mention-package.diff from libreoffice/build
 
   [ Bjoern Michaelsen ]
   * debian/rules:
@@ -48,7 +50,7 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
       sensible-lomua; add icedove and thunderbird as fallbacks
     - migrate sensible-browser.diff from libreoffice/build
 
- -- Rene Engelhard <rene@debian.org>  Tue, 20 Dec 2011 23:39:55 +0100
+ -- Rene Engelhard <rene@debian.org>  Wed, 21 Dec 2011 22:12:16 +0100
 
 libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
 
diff --git a/patches/reportdesign-mention-package.diff b/patches/reportdesign-mention-package.diff
new file mode 100644
index 0000000..bdd0a61
--- /dev/null
+++ b/patches/reportdesign-mention-package.diff
@@ -0,0 +1,11 @@
+diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
+index 974b36e..2f42c27 100644
+--- a/dbaccess/source/ui/misc/dbumiscres.src
++++ b/dbaccess/source/ui/misc/dbumiscres.src
+@@ -96,5 +96,5 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
+ String RID_STR_EXTENSION_NOT_PRESENT
+ {
+     // #i96130# use hard coded name
+-    Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder.";
++    Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder. For this, install the package 'libreoffice-report-builder'.";
+ };
diff --git a/patches/series b/patches/series
index bcff14e..59b56c0 100644
--- a/patches/series
+++ b/patches/series
@@ -18,3 +18,4 @@ help-msg-add-package-info.diff
 sensible-lomua.diff
 sensible-browser.diff
 fix-unordf_complex-check.diff
+reportdesign-mention-package.diff

-- 
LibreOffice packaging repository


Reply to: