From 20451453bd9908b824e1efa7d210dc4f4fc2858e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 11:36:18 +0200 Subject: Merging debian version 4:24.2.1-3. Signed-off-by: Daniel Baumann --- debian/changelog | 6 ++++++ debian/rules | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f4da120206..31fd2010d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libreoffice (4:24.2.1-3) unstable; urgency=medium + + * don't pass -Nlibreoffice-evolution to debhelper, it's disabled everywhere + + -- Rene Engelhard Mon, 04 Mar 2024 06:17:06 +0100 + libreoffice (4:24.2.1-2~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/rules b/debian/rules index 743a124c8f..7eeb43146c 100755 --- a/debian/rules +++ b/debian/rules @@ -1565,6 +1565,7 @@ endif ifeq "$(ENABLE_EVO2)" "n" CONFIGURE_FLAGS += --disable-evolution2 + #DEBHELPER_OPTIONS += -Nlibreoffice-evolution else CONFIGURE_FLAGS += --enable-evolution2 BUILD_DEPS += , libebook1.2-dev -- cgit v1.2.3