[libreoffice] 02/03: git update; update patches and adapt for new own firebirdsdbc" auto-install "module"
Rene Engelhard
rene at moszumanska.debian.org
Mon Jan 16 21:21:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 91e99f2c504fb2faedde3ed15042bffa542cd01b
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jan 16 22:18:10 2017 +0100
git update; update patches and adapt for new own firebirdsdbc" auto-install "module"
---
changelog | 2 +-
patches/make-package-modules-not-suck.diff | 28 ++++++++++++----------------
patches/no-packagekit-per-default.diff | 2 +-
rules | 2 +-
4 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/changelog b/changelog
index 7711d70..7cb5c3c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20161229-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20170116-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 381a783..d94cae7 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -48,7 +48,7 @@ diff --git a/Repository.mk b/Repository.mk
index 14a1c07..eab8078 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -199,13 +199,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
+@@ -211,13 +211,27 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
@@ -59,7 +59,6 @@ index 14a1c07..eab8078 100644
+ dbaxml) \
dbp \
dbu \
-+ $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,flat) \
+ $(if $(ENABLE_JAVA),jdbc) \
+ $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
@@ -78,7 +77,7 @@ index 14a1c07..eab8078 100644
date \
pricing \
sc \
-@@ -217,6 +232,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+@@ -229,6 +243,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
))
@@ -93,7 +92,7 @@ index 14a1c07..eab8078 100644
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
svgfilter \
flash \
-@@ -236,11 +259,11 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
+@@ -248,11 +270,11 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,tde, \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
@@ -106,7 +105,7 @@ index 14a1c07..eab8078 100644
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
-@@ -307,10 +307,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -315,10 +337,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ctl \
cui \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -118,18 +117,15 @@ index 14a1c07..eab8078 100644
dbtools \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-@@ -318,10 +338,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -332,7 +351,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
evtatt \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
- flat \
file) \
filterconfig \
-- $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
fps_office \
- for \
- forui \
-@@ -340,7 +358,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -353,7 +371,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
gie \
hyphen \
icg \
@@ -137,7 +133,7 @@ index 14a1c07..eab8078 100644
ldapbe2 \
localebe1 \
log \
-@@ -353,8 +370,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -366,8 +383,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
@@ -146,7 +142,7 @@ index 14a1c07..eab8078 100644
odfflatxml \
offacc \
oox \
-@@ -368,13 +383,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -381,13 +396,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sb \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
scn \
@@ -160,7 +156,7 @@ index 14a1c07..eab8078 100644
sot \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
-@@ -385,7 +395,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -398,7 +408,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
svt \
svx \
svxcore \
@@ -168,7 +164,7 @@ index 14a1c07..eab8078 100644
syssh \
$(if $(ENABLE_TDEAB),tdeab1) \
$(if $(ENABLE_TDEAB),tdeabdrv1) \
-@@ -469,6 +478,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
+@@ -486,6 +495,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
msword \
@@ -176,7 +172,7 @@ index 14a1c07..eab8078 100644
swd \
swui \
t602filter \
-@@ -553,14 +553,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -567,14 +577,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
comphelper \
@@ -191,7 +187,7 @@ index 14a1c07..eab8078 100644
i18nutil \
index_data \
$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \
-@@ -570,7 +578,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -590,7 +598,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
package2 \
$(if $(USING_X11),recentfile) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index b48154d..23ff114 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -89,7 +89,7 @@ index 1ffe504..d365800 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -317,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
- static bool addFontconfigDir(const OString& rDirectory);
+ static void addFontconfigDir(const OString& rDirectory);
std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_DBUS
diff --git a/rules b/rules
index a778769..9f78e41 100755
--- a/rules
+++ b/rules
@@ -2696,7 +2696,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(ENABLE_FIREBIRD)" "y"
mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/program
- mv $(PKGDIR)-base/$(OODIR)/program/libfirebird_sdbclo.so \
+ mv $(PKGDIR)-core/$(OODIR)/program/libfirebird_sdbclo.so \
$(PKGDIR)-sdbc-firebird/$(OODIR)/program
ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
for i in libEngine12.so libfbclient.so.2; do \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list