From cb1743675ef2097c28d7ac69f48a59e50ecae05d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:32:25 +0200 Subject: Merging debian version 4:24.2.1-2. Signed-off-by: Daniel Baumann --- debian/changelog | 8 +++++++- debian/control | 20 +------------------- debian/control.in | 2 +- debian/libreoffice-evolution.postinst.debhelper | 9 +++++++++ debian/libreoffice-evolution.postrm.debhelper | 17 +++++++++++++++++ debian/libreoffice-evolution.preinst.debhelper | 3 +++ debian/libreoffice-evolution.prerm.debhelper | 3 +++ debian/libreoffice-evolution.substvars | 5 +++++ debian/libuno-cppu3.substvars | 5 +++++ debian/libuno-cppuhelpergcc3-3.substvars | 5 +++++ debian/libuno-purpenvhelpergcc3-3.substvars | 5 +++++ debian/libuno-sal3.substvars | 5 +++++ debian/libuno-salhelpergcc3-3.substvars | 5 +++++ debian/rules | 8 ++++---- debian/tests/control | 2 +- 15 files changed, 76 insertions(+), 26 deletions(-) create mode 100644 debian/libreoffice-evolution.postinst.debhelper create mode 100644 debian/libreoffice-evolution.postrm.debhelper create mode 100644 debian/libreoffice-evolution.preinst.debhelper create mode 100644 debian/libreoffice-evolution.prerm.debhelper create mode 100644 debian/libreoffice-evolution.substvars create mode 100644 debian/libuno-cppu3.substvars create mode 100644 debian/libuno-cppuhelpergcc3-3.substvars create mode 100644 debian/libuno-purpenvhelpergcc3-3.substvars create mode 100644 debian/libuno-sal3.substvars create mode 100644 debian/libuno-salhelpergcc3-3.substvars diff --git a/debian/changelog b/debian/changelog index 499b99a474..81f68fefa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libreoffice (4:24.2.1-2) unstable; urgency=medium + + * debian/rules: temporarily disable libreoffice-evolution + + -- Rene Engelhard Sun, 03 Mar 2024 18:47:08 +0000 + libreoffice (4:24.2.1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: @@ -46,7 +52,7 @@ libreoffice (4:24.2.1-1) unstable; urgency=medium upstream makefile does -Os anyways - add some more safety nets for t64: - Build-Depend on dpkg-dev (>= 1.22.5) on affected archs - - Build-Depend on libxmlsec1-dev (>= 1.2.39-4) on affected archs + - Build-Depend on libxmlsec1-dev (>= 1.2.39-5) on affected archs -- Rene Engelhard Wed, 28 Feb 2024 18:06:52 +0100 diff --git a/debian/control b/debian/control index 36d132d165..e78ff0985a 100644 --- a/debian/control +++ b/debian/control @@ -62,7 +62,6 @@ Build-Depends: autoconf, libdragonbox-dev, libe-book-dev (<< 0.2~), libe-book-dev (>= 0.1), - libebook1.2-dev, libeot-dev, libepoxy-dev, libepubgen-dev (<< 0.2~), @@ -254,7 +253,7 @@ Standards-Version: 4.0.1 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/libreoffice Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/libreoffice XSBC-Original-Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice -XSBC-Original-Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-24.2 +XSBC-Original-Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git Homepage: http://www.libreoffice.org Package: libreoffice @@ -5377,23 +5376,6 @@ Description: PostgreSQL SDBC driver for LibreOffice LibreOffice without any wrapper layer such as ODBC or JDBC. Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC -Package: libreoffice-evolution -Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64 -Section: gnome -Depends: libreoffice-base, - libreoffice-common (>= 1:7.0.0~alpha~), - libreoffice-core (= ${binary:Version}), - ${libebook-dep}, - ${misc:Depends}, - ${shlibs:Depends} -Recommends: evolution -Description: office productivity suite -- Evolution addressbook support - LibreOffice is a full-featured office productivity suite that provides - a near drop-in replacement for Microsoft(R) Office. - . - This package allows LibreOffice to access Evolution address books. - You need to install evolution separately. - Package: libreoffice-subsequentcheckbase Section: libs Architecture: all diff --git a/debian/control.in b/debian/control.in index 71f86993bc..6c5d7bfec1 100644 --- a/debian/control.in +++ b/debian/control.in @@ -20,7 +20,7 @@ Standards-Version: 4.0.1 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/libreoffice Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/libreoffice XSBC-Original-Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice -XSBC-Original-Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-24.2 +XSBC-Original-Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git Homepage: http://www.libreoffice.org Package: libreoffice diff --git a/debian/libreoffice-evolution.postinst.debhelper b/debian/libreoffice-evolution.postinst.debhelper new file mode 100644 index 0000000000..41b98edfe7 --- /dev/null +++ b/debian/libreoffice-evolution.postinst.debhelper @@ -0,0 +1,9 @@ +# Automatically added by dh_ucf/13.11.4 +if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then + ucf --three-way "/usr/lib/libreoffice/share/.registry/evoab.xcd" "/etc/libreoffice/registry/evoab.xcd" + ucfr --force libreoffice-evolution "/etc/libreoffice/registry/evoab.xcd" +fi +# End automatically added section +# Automatically added by dh_installdeb/13.11.4 +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libreoffice-evolution /usr/share/doc/libreoffice-core 1:6.4.0\~alpha1\~git20191013 -- "$@" +# End automatically added section diff --git a/debian/libreoffice-evolution.postrm.debhelper b/debian/libreoffice-evolution.postrm.debhelper new file mode 100644 index 0000000000..a1ef7d0fe7 --- /dev/null +++ b/debian/libreoffice-evolution.postrm.debhelper @@ -0,0 +1,17 @@ +# Automatically added by dh_installdeb/13.11.4 +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libreoffice-evolution /usr/share/doc/libreoffice-core 1:6.4.0\~alpha1\~git20191013 -- "$@" +# End automatically added section +# Automatically added by dh_ucf/13.11.4 +if [ "$1" = "purge" ]; then + for ext in .ucf-new .ucf-old .ucf-dist ""; do + rm -f "/etc/libreoffice/registry/evoab.xcd$ext" + done + + if [ -x "`command -v ucf`" ]; then + ucf --purge "/etc/libreoffice/registry/evoab.xcd" + fi + if [ -x "`command -v ucfr`" ]; then + ucfr --force --purge libreoffice-evolution "/etc/libreoffice/registry/evoab.xcd" + fi +fi +# End automatically added section diff --git a/debian/libreoffice-evolution.preinst.debhelper b/debian/libreoffice-evolution.preinst.debhelper new file mode 100644 index 0000000000..3c7e323daa --- /dev/null +++ b/debian/libreoffice-evolution.preinst.debhelper @@ -0,0 +1,3 @@ +# Automatically added by dh_installdeb/13.11.4 +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libreoffice-evolution /usr/share/doc/libreoffice-core 1:6.4.0\~alpha1\~git20191013 -- "$@" +# End automatically added section diff --git a/debian/libreoffice-evolution.prerm.debhelper b/debian/libreoffice-evolution.prerm.debhelper new file mode 100644 index 0000000000..3c7e323daa --- /dev/null +++ b/debian/libreoffice-evolution.prerm.debhelper @@ -0,0 +1,3 @@ +# Automatically added by dh_installdeb/13.11.4 +dpkg-maintscript-helper symlink_to_dir /usr/share/doc/libreoffice-evolution /usr/share/doc/libreoffice-core 1:6.4.0\~alpha1\~git20191013 -- "$@" +# End automatically added section diff --git a/debian/libreoffice-evolution.substvars b/debian/libreoffice-evolution.substvars new file mode 100644 index 0000000000..268f02ba43 --- /dev/null +++ b/debian/libreoffice-evolution.substvars @@ -0,0 +1,5 @@ +misc:Depends=ucf +shlibs:Depends=libc6 (>= 2.32), libgcc-s1 (>= 3.0), libglib2.0-0 (>= 2.24.0), libstdc++6 (>= 11), libuno-cppu3 (>= 4.4.0~alpha), libuno-cppuhelpergcc3-3 (>= 1:7.4.0~alpha), libuno-sal3 (>= 5.1.0~alpha), libuno-salhelpergcc3-3 (>= 1.4.0), uno-libs-private +java:Depends= +java:Recommends= +misc:Pre-Depends= diff --git a/debian/libuno-cppu3.substvars b/debian/libuno-cppu3.substvars new file mode 100644 index 0000000000..0aa1077d59 --- /dev/null +++ b/debian/libuno-cppu3.substvars @@ -0,0 +1,5 @@ +shlibs:Depends=libc6 (>= 2.32), libgcc-s1 (>= 3.0), libstdc++6 (>= 12), libuno-sal3 (>= 6.4.0~beta), libuno-salhelpergcc3-3 (>= 1.4.0) +java:Depends= +java:Recommends= +misc:Depends= +misc:Pre-Depends= diff --git a/debian/libuno-cppuhelpergcc3-3.substvars b/debian/libuno-cppuhelpergcc3-3.substvars new file mode 100644 index 0000000000..18ae49fb08 --- /dev/null +++ b/debian/libuno-cppuhelpergcc3-3.substvars @@ -0,0 +1,5 @@ +shlibs:Depends=libc6 (>= 2.32), libgcc-s1 (>= 3.0), libstdc++6 (>= 11), libuno-cppu3 (>= 4.4.0~alpha), libuno-sal3 (>= 5.1.0~alpha), libuno-salhelpergcc3-3 (>= 1.4.0) +java:Depends= +java:Recommends= +misc:Depends= +misc:Pre-Depends= diff --git a/debian/libuno-purpenvhelpergcc3-3.substvars b/debian/libuno-purpenvhelpergcc3-3.substvars new file mode 100644 index 0000000000..a549910a5b --- /dev/null +++ b/debian/libuno-purpenvhelpergcc3-3.substvars @@ -0,0 +1,5 @@ +shlibs:Depends=libc6 (>= 2.4), libgcc-s1 (>= 3.0), libstdc++6 (>= 5), libuno-cppu3 (>= 1.4.0), libuno-sal3 (>= 1.4.0) +java:Depends= +java:Recommends= +misc:Depends= +misc:Pre-Depends= diff --git a/debian/libuno-sal3.substvars b/debian/libuno-sal3.substvars new file mode 100644 index 0000000000..ad59e1c4bc --- /dev/null +++ b/debian/libuno-sal3.substvars @@ -0,0 +1,5 @@ +shlibs:Depends=libc6 (>= 2.34), libgcc-s1 (>= 7), libstdc++6 (>= 12), zlib1g (>= 1:1.1.4) +java:Depends= +java:Recommends= +misc:Depends= +misc:Pre-Depends= diff --git a/debian/libuno-salhelpergcc3-3.substvars b/debian/libuno-salhelpergcc3-3.substvars new file mode 100644 index 0000000000..e3224d9581 --- /dev/null +++ b/debian/libuno-salhelpergcc3-3.substvars @@ -0,0 +1,5 @@ +shlibs:Depends=libc6 (>= 2.34), libgcc-s1 (>= 7), libstdc++6 (>= 12), libuno-sal3 (>= 1.8.0) +java:Depends= +java:Recommends= +misc:Depends= +misc:Pre-Depends= diff --git a/debian/rules b/debian/rules index e4b1d00a4e..273b3c7ba5 100755 --- a/debian/rules +++ b/debian/rules @@ -333,7 +333,7 @@ BUILD_GTK3=y endif endif BUILD_GTK4=y -ENABLE_EVO2=y +ENABLE_EVO2=n ENABLE_GIO=y ENABLE_DCONF=y ENABLE_RANDR=y @@ -958,7 +958,7 @@ endif ifneq (,$(filter xmlsec, $(SYSTEM_STUFF))) BUILD_DEPS += , libxmlsec1-dev (>= 1.2.35) ifneq ($(BOOKWORM_BACKPORT),y) - BUILD_DEPS += , libxmlsec1-dev (>= 1.2.39-5) [$(filter $(OOO_CHECK_FATAL_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] + BUILD_DEPS += , libxmlsec1-dev (>= 1.2.39-5) [$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] endif endif ifneq (,$(filter expat, $(SYSTEM_STUFF))) @@ -2192,7 +2192,7 @@ endif debian/tests/control.new: debian/tests/control.in debian/rules echo "#" > debian/tests/control.new echo "# NOTE: This file is autogenerated. DO NOT manually edit it! " >> debian/tests/control.new - echo "# Edit debian/control*in and rules (whatever applicable), run debian/rules control" >> debian/tests/control.new + echo "# Edit debian/tests/control*in and rules (whatever applicable), run debian/rules control" >> debian/tests/control.new echo "# and move control.new to control if the difference is sane." >> debian/tests/control.new echo "#" >> debian/tests/control.new sed -e "s|%OOO_JAVA_ARCHS%|$(OOO_JAVA_ARCHS)|g" \ @@ -2211,7 +2211,7 @@ endif diff -u debian/tests/control debian/tests/control.new && rm -f debian/tests/control.new || (\ echo "Generated control file differs! Check the result!"; \ - echo "Note: Edit control*.in and rules instead of control!"; \ + echo "Note: Edit tests/control*.in and rules instead of control!"; \ echo "If the difference is correct move control.new to control"; \ exit 1) diff --git a/debian/tests/control b/debian/tests/control index 3c1532a1e2..dcb9a4c92a 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,6 +1,6 @@ # # NOTE: This file is autogenerated. DO NOT manually edit it! -# Edit debian/control*in and rules (whatever applicable), run debian/rules control +# Edit debian/tests/control*in and rules (whatever applicable), run debian/rules control # and move control.new to control if the difference is sane. # Tests: testtools-bridgetest-without-java -- cgit v1.2.3