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/changelog | 18 +++++++- debian/control | 3 ++ debian/control.in | 2 + debian/libreoffice-mysql-connector.maintscript | 1 - debian/libreoffice-sdbc-firebird.ucf | 1 + debian/libreoffice-sdbc-mysql.ucf | 1 + debian/patches/series | 1 + debian/patches/split-sdbc-firebird-mariadb.diff | 58 +++++++++++++++++++++++++ debian/rules | 17 ++++++++ 9 files changed, 100 insertions(+), 2 deletions(-) delete mode 100644 debian/libreoffice-mysql-connector.maintscript create mode 100644 debian/libreoffice-sdbc-firebird.ucf create mode 100644 debian/libreoffice-sdbc-mysql.ucf create mode 100644 debian/patches/split-sdbc-firebird-mariadb.diff diff --git a/debian/changelog b/debian/changelog index 2f97af94a2..84aa065e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libreoffice (4:24.2.2-2) unstable; urgency=medium + + * debian/patches/split-sdbc-firebird-mariadb.diff: create extra + {mysqlc,firebird_sdbc}.xcd add as for evoab. Otherwise configuration + parts of it ends up (or not in indep builds) in libreoffice-commons + main.xcd + * debian/rules: + - install new {mysqlc,firebird_sdbc}.xcd into the respective + packages + - build-depend on liborcus-dev (>> 0.19.2-3+b1) as for libxmlsec1-dev + * debian/libreoffice-sdbc-{mysql,firebird}.ucf: add + * debian/control.in: add Breaks: -sdbc-{mysql,firebird} (<< 4:24.2.2-2) + to libreoffice-common + + -- Rene Engelhard Sat, 30 Mar 2024 09:30:30 +0000 + libreoffice (4:24.2.2-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: @@ -65,7 +81,7 @@ libreoffice (4:24.2.2~rc2-1) experimental; urgency=medium build-deps we have: + move fontforge to B-D-I and rebuild opens___.ttf as before. Make arch-dep builds use fonts-opensymbol and it's copy as it's already - thre. + there. Implement build profiles to change behaviour here should there ever be need for it (e.g. if one needed a new version of opensymbol for the tests and it's not available (yet)). diff --git a/debian/control b/debian/control index 37bea2e34b..aace1c8f25 100644 --- a/debian/control +++ b/debian/control @@ -100,6 +100,7 @@ Build-Depends: autoconf, libodfgen-dev (>= 0.1), liborcus-dev (<< 0.20~), liborcus-dev (>= 0.19.1), + liborcus-dev (>> 0.19.2-3+b1) [armhf] , libpagemaker-dev, libpagemaker-dev (<< 0.1~), libpentaho-reporting-flow-engine-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !loong64 !mips64 !powerpcspe !ppc64el !s390x !sparc] , @@ -605,6 +606,8 @@ Breaks: libreoffice-base (<< 1:6.4.0~beta1-2~), libreoffice-l10n (<< 7.0), libreoffice-librelogo (<< 1:7.0.0~alpha), libreoffice-report-builder (<< 1:7.0.0~alpha), + libreoffice-sdbc-firebird (<< 4:24.2.2-2), + libreoffice-sdbc-mysql (<< 4:24.2.2-2), libreoffice-sdbc-postgresql (<< 1:7.0.0~alpha), libreoffice-style-andromeda (<< 4:${oover}~), libreoffice-style-crystal (<< 4:${oover}~), diff --git a/debian/control.in b/debian/control.in index a44b695b48..bd289e1605 100644 --- a/debian/control.in +++ b/debian/control.in @@ -341,6 +341,8 @@ Breaks: libreoffice-core (<< 4:${oover}~), libreoffice-l10n (<< 7.0), libreoffice-librelogo (<< 1:7.0.0~alpha), libreoffice-sdbc-postgresql (<< 1:7.0.0~alpha), + libreoffice-sdbc-mysql (<< 4:24.2.2-2), + libreoffice-sdbc-firebird (<< 4:24.2.2-2), libreoffice-report-builder (<< 1:7.0.0~alpha), libreoffice-evolution (<< 1:7.0.0~alpha), libreoffice-gnome (<< 1:7.0.0~alpha), diff --git a/debian/libreoffice-mysql-connector.maintscript b/debian/libreoffice-mysql-connector.maintscript deleted file mode 100644 index 92715c940b..0000000000 --- a/debian/libreoffice-mysql-connector.maintscript +++ /dev/null @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libreoffice-mysql-connector /usr/share/doc/libreoffice-core 1:6.4.0~alpha1~git20191013 diff --git a/debian/libreoffice-sdbc-firebird.ucf b/debian/libreoffice-sdbc-firebird.ucf new file mode 100644 index 0000000000..3ed28022ab --- /dev/null +++ b/debian/libreoffice-sdbc-firebird.ucf @@ -0,0 +1 @@ +/usr/lib/libreoffice/share/.registry/firebird_sdbc.xcd /etc/libreoffice/registry/firebird_sdbc.xcd diff --git a/debian/libreoffice-sdbc-mysql.ucf b/debian/libreoffice-sdbc-mysql.ucf new file mode 100644 index 0000000000..403d2d9efc --- /dev/null +++ b/debian/libreoffice-sdbc-mysql.ucf @@ -0,0 +1 @@ +/usr/lib/libreoffice/share/.registry/mysqlc.xcd /etc/libreoffice/registry/mysqlc.xcd diff --git a/debian/patches/series b/debian/patches/series index 2c12454c06..aea9d1e126 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -50,3 +50,4 @@ fix-system-abseil-build.diff fix-riscv64-bridge.diff pdfium-ports.diff python-3.12.diff +split-sdbc-firebird-mariadb.diff diff --git a/debian/patches/split-sdbc-firebird-mariadb.diff b/debian/patches/split-sdbc-firebird-mariadb.diff new file mode 100644 index 0000000000..020a3f5019 --- /dev/null +++ b/debian/patches/split-sdbc-firebird-mariadb.diff @@ -0,0 +1,58 @@ +diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk +index 1e2e473e0b4d..3741e94fd729 100644 +--- a/postprocess/CustomTarget_registry.mk ++++ b/postprocess/CustomTarget_registry.mk +@@ -466,13 +467,17 @@ postprocess_DRIVERS += hsqldb jdbc mysql_jdbc + endif + + ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) +-postprocess_FILES_main += \ ++postprocess_XCDS += firebird_sdbc.xcd ++postprocess_DEPS_firebird_sdbc := main ++postprocess_FILES_firebird_sdbc += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/firebird)/org/openoffice/Office/DataAccess/Drivers-firebird.xcu + postprocess_DRIVERS += firebird_sdbc + endif + + ifeq ($(ENABLE_MARIADBC),TRUE) +-postprocess_FILES_main += \ ++postprocess_XCDS += mysqlc.xcd ++postprocess_DEPS_mysqlc := main ++postprocess_FILES_mysqlc += \ + $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysqlc)/org/openoffice/Office/DataAccess/Drivers-mysqlc.xcu + postprocess_DRIVERS += mysqlc + endif +diff --git a/scp2/source/base/firebird.scp b/scp2/source/base/firebird.scp +index 61cfff9cc496..0fdb2ffc6e66 100644 +--- a/scp2/source/base/firebird.scp ++++ b/scp2/source/base/firebird.scp +@@ -20,15 +20,27 @@ + + #include "AutoInstall/firebirdsdbc" + +-#if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD ) ++#if defined( ENABLE_FIREBIRD_SDBC ) ++ ++#if !defined( SYSTEM_FIREBIRD ) + + Module gid_Module_Optional_Firebird + Name = "Firebird"; + Description = "Firebird embedded database"; + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root_Brand; +- Files = (auto_firebirdsdbc_ALL); ++ Files = (auto_firebirdsdbc_ALL, ++ gid_File_FirebirdSdbc_Xcd); + Styles = (HIDDEN_ROOT); + End + + #endif ++ ++File gid_File_FirebirdSdbc_Xcd ++ TXT_FILE_BODY; ++ Dir = gid_Brand_Dir_Share_Registry; ++ Name = "firebird_sdbc.xcd"; ++ Styles = (PACKED); ++End ++ ++#endif 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