From bc03a4d4588d46e447d4cbb05e10e55ebc915e7a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:52:23 +0200 Subject: Merging debian version 4:24.2.2-2. Signed-off-by: Daniel Baumann --- debian/rules | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5d3ad1a327..9fd80eeb78 100755 --- a/debian/rules +++ b/debian/rules @@ -1386,6 +1386,9 @@ endif ifneq (,$(filter orcus, $(SYSTEM_STUFF))) BUILD_DEPS += , liborcus-dev (>= 0.19.1), liborcus-dev (<< 0.20~) + ifneq ($(BOOKWORM_BACKPORT),y) + BUILD_DEPS += , liborcus-dev (>> 0.19.2-3+b1) [$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] + endif endif ifeq "$(ENABLE_XMLHELP)" "y" @@ -2169,7 +2172,9 @@ endif ifeq "$(PACKAGE_LIBRELOGO)" "y" cat debian/control.librelogo.in >> debian/control.new endif +ifeq "$(ENABLE_FIREBIRD)" "y" cat debian/control.firebird.in >> debian/control.new +endif perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control.new perl -pi -e "s,%OOO_NOGUI_ARCHS%,$(OOO_NOGUI_ARCHS),g" debian/control.new @@ -2922,6 +2927,12 @@ ifeq "$(ENABLE_JAVA)" "y" endif endif +ifeq "$(ENABLE_FIREBIRD)" "y" + mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/share/registry + mv $(PKGDIR)-common/$(OODIR)/share/registry/firebird_sdbc.xcd \ + $(PKGDIR)-sdbc-firebird/$(OODIR)/share/registry +endif + ifeq "$(PACKAGE_SDK)" "y" # move arch-indep stuff into a libreoffice-dev-common mkdir -p $(PKGDIR)-dev-common/usr/include @@ -3497,9 +3508,15 @@ ifeq "$(ENABLE_FIREBIRD)" "y" done endif endif +ifeq "$(ENABLE_MARIADB)" "y" mkdir -p $(PKGDIR)-sdbc-mysql/$(OODIR)/program mv $(PKGDIR)-base/$(OODIR)/program/libmysqlclo.so \ $(PKGDIR)-sdbc-mysql/$(OODIR)/program + # FIXME. Do in scp2 + mkdir -p $(PKGDIR)-sdbc-mysql/$(OODIR)/share/registry + install -m644 instdir/share/registry/mysqlc.xcd \ + $(PKGDIR)-sdbc-mysql/$(OODIR)/share/registry +endif mkdir -p $(PKGDIR)-base-drivers/$(OODIR)/program for i in `find $(PKGDIR)-base/$(OODIR)/program/ -name "*.so" \ -- cgit v1.2.3