summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 09:36:18 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 09:37:18 +0000
commit20451453bd9908b824e1efa7d210dc4f4fc2858e (patch)
treea2c7d85296e3e6fd32d271d1725d69aa7c65b8bc
parentReleasing progress-linux version 4:24.2.1-2~progress7.99u1. (diff)
downloadlibreoffice-20451453bd9908b824e1efa7d210dc4f4fc2858e.tar.xz
libreoffice-20451453bd9908b824e1efa7d210dc4f4fc2858e.zip
Merging debian version 4:24.2.1-3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules1
2 files changed, 7 insertions, 0 deletions
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 <rene@debian.org> 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