From 3938b724a53d18a1d8c7aca5af6ffca57d150d4e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:39:37 +0200 Subject: Merging debian version 4:24.2.1-4. Signed-off-by: Daniel Baumann --- debian/changelog | 10 ++++++++++ debian/control | 19 +++++++++++++++++++ debian/control.evolution.in | 1 + 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 | 4 +++- 14 files changed, 33 insertions(+), 63 deletions(-) delete mode 100644 debian/libreoffice-evolution.postinst.debhelper delete mode 100644 debian/libreoffice-evolution.postrm.debhelper delete mode 100644 debian/libreoffice-evolution.preinst.debhelper delete mode 100644 debian/libreoffice-evolution.prerm.debhelper delete mode 100644 debian/libreoffice-evolution.substvars delete mode 100644 debian/libuno-cppu3.substvars delete mode 100644 debian/libuno-cppuhelpergcc3-3.substvars delete mode 100644 debian/libuno-purpenvhelpergcc3-3.substvars delete mode 100644 debian/libuno-sal3.substvars delete mode 100644 debian/libuno-salhelpergcc3-3.substvars diff --git a/debian/changelog b/debian/changelog index e6e0869c1f..210ded326f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libreoffice (4:24.2.1-4) unstable; urgency=medium + + * debian/rules: + - re-enable libreoffice-evolution; rm evolocal.odb if evolution is + disabled, though (otherwise ends up in -common) (closes: #1065461) + * debian/control.evolution.in: + - add Replaces: libreoffice-common (= 4:24.2.1-3) + + -- Rene Engelhard Tue, 05 Mar 2024 07:05:44 +0100 + libreoffice (4:24.2.1-3~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index e78ff0985a..29c994460d 100644 --- a/debian/control +++ b/debian/control @@ -62,6 +62,7 @@ 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~), @@ -5376,6 +5377,24 @@ 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} +Replaces: libreoffice-common (= 4:24.2.1-3) +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.evolution.in b/debian/control.evolution.in index 8b387cad9e..ded447fdb9 100644 --- a/debian/control.evolution.in +++ b/debian/control.evolution.in @@ -7,6 +7,7 @@ Depends: libreoffice-base, ${libebook-dep}, ${misc:Depends}, ${shlibs:Depends} +Replaces: libreoffice-common (= 4:24.2.1-3) Recommends: evolution Description: office productivity suite -- Evolution addressbook support LibreOffice is a full-featured office productivity suite that provides diff --git a/debian/libreoffice-evolution.postinst.debhelper b/debian/libreoffice-evolution.postinst.debhelper deleted file mode 100644 index 41b98edfe7..0000000000 --- a/debian/libreoffice-evolution.postinst.debhelper +++ /dev/null @@ -1,9 +0,0 @@ -# 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 deleted file mode 100644 index a1ef7d0fe7..0000000000 --- a/debian/libreoffice-evolution.postrm.debhelper +++ /dev/null @@ -1,17 +0,0 @@ -# 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 deleted file mode 100644 index 3c7e323daa..0000000000 --- a/debian/libreoffice-evolution.preinst.debhelper +++ /dev/null @@ -1,3 +0,0 @@ -# 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 deleted file mode 100644 index 3c7e323daa..0000000000 --- a/debian/libreoffice-evolution.prerm.debhelper +++ /dev/null @@ -1,3 +0,0 @@ -# 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 deleted file mode 100644 index 268f02ba43..0000000000 --- a/debian/libreoffice-evolution.substvars +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 0aa1077d59..0000000000 --- a/debian/libuno-cppu3.substvars +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 18ae49fb08..0000000000 --- a/debian/libuno-cppuhelpergcc3-3.substvars +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index a549910a5b..0000000000 --- a/debian/libuno-purpenvhelpergcc3-3.substvars +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index ad59e1c4bc..0000000000 --- a/debian/libuno-sal3.substvars +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index e3224d9581..0000000000 --- a/debian/libuno-salhelpergcc3-3.substvars +++ /dev/null @@ -1,5 +0,0 @@ -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 7eeb43146c..ab21c4a38e 100755 --- a/debian/rules +++ b/debian/rules @@ -333,7 +333,7 @@ BUILD_GTK3=y endif endif BUILD_GTK4=y -ENABLE_EVO2=n +ENABLE_EVO2=y ENABLE_GIO=y ENABLE_DCONF=y ENABLE_RANDR=y @@ -2928,6 +2928,8 @@ ifeq "$(ENABLE_EVO2)" "y" mkdir -p $(PKGDIR)-evolution/$(OODIR)/share/registry mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \ $(PKGDIR)-evolution/$(OODIR)/presets/database +else + rm -f $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb endif ifeq "$(PACKAGE_BASE)" "y" -- cgit v1.2.3