[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc3-1-16-ge352f98
The following commit has been merged in the debian-experimental-3.5 branch:
commit dd67296873a782f0df936deb4f44169a5ea7b064
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Tue Feb 14 13:54:45 2012 +0100
backport fix to fix rdb path in settings/std.mk in the SDK
diff --git a/changelog b/changelog
index 174c792..70b4aae 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:3.5.0-1) UNRELEASED; urgency=low
amymore...
* debian/patches/patches/make-gengal-work-again.diff: register gengal.bin
executable to get proper rpath and remove gengalrc
+ * debian/patches/odk-fix-rdb-paths.diff: backport fix to fix rdb path
+ in settings/std.mk in the SDK
* debian/rules:
- install found .gdb-py files into respective -dbg packages
diff --git a/patches/odk-fix-rdb-paths.diff b/patches/odk-fix-rdb-paths.diff
new file mode 100644
index 0000000..2453547
--- /dev/null
+++ b/patches/odk-fix-rdb-paths.diff
@@ -0,0 +1,23 @@
+From bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Tue, 14 Feb 2012 09:32:59 +0000
+Subject: Resolves rhbz#789622: Adapt SDK to changed paths in LO installation
+
+---
+diff --git a/odk/settings/std.mk b/odk/settings/std.mk
+index 0726631..705b528 100644
+--- a/odk/settings/std.mk
++++ b/odk/settings/std.mk
+@@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
+ URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
+ URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
+
+-OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)"
+-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
++OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)"
++OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)
+
+ OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 04e23c9..48f0ac4 100644
--- a/patches/series
+++ b/patches/series
@@ -30,3 +30,4 @@ SwTblBoxFormula-destructor.diff
ia64-oox-size.diff
mediwiki-oor-replace.diff
no-rcX-in-final.diff
+odk-fix-rdb-paths.diff
--
LibreOffice packaging repository
Reply to: