From aad157ee452828ad07a8d34272650a51cb7c22aa Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Jun 2024 13:48:18 +0200 Subject: Adding debian version 4:24.2.4-1. Signed-off-by: Daniel Baumann --- debian/019bc17f5c8dda1a56e771cdb2d750be5a5d886a | 511 ++++++++++++++++++++++++ debian/changelog | 10 + debian/control | 1 + debian/control.in | 1 + debian/python3-uno.lintian-overrides | 4 - debian/rules | 2 +- 6 files changed, 524 insertions(+), 5 deletions(-) create mode 100644 debian/019bc17f5c8dda1a56e771cdb2d750be5a5d886a diff --git a/debian/019bc17f5c8dda1a56e771cdb2d750be5a5d886a b/debian/019bc17f5c8dda1a56e771cdb2d750be5a5d886a new file mode 100644 index 0000000000..ea8ed34e0d --- /dev/null +++ b/debian/019bc17f5c8dda1a56e771cdb2d750be5a5d886a @@ -0,0 +1,511 @@ + + + + + + + + + + + +Make sure ucf is available before installing python3-uno (LP: #2067762) (019bc17f) · Commits · Debian LibreOffice Maintainers / libreoffice / libreoffice · GitLab + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Skip to content +
+ +
+
+ +
+ + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + +
+
+ +
+
+
+
+
+
+ + + + + +
+
+
+ + +Commit +019bc17f + + +authored + +by +Rico Tzschichholz's avatar + +Rico Tzschichholz + + +
+ +Browse files + + + +
+
+
+

+Make sure ucf is available before installing python3-uno (LP: #2067762) +

+
package:python3-uno:4:24.2.3-0ubuntu0.24.04.2
 Removing obsolete configuration file /etc/libreoffice/registry/pyuno.xcd ...
 awk: error while loading shared libraries: libreadline.so.8: cannot open shared object file: No such file or directory
 dpkg: error processing archive /tmp/apt-dpkg-install-g7RPpP/01-python3-uno_4%3a24.2.3-0ubuntu0.24.04.2_amd64.deb (--unpack):
  new python3-uno package pre-installation script subprocess returned error exit status 127
+
+
+
+
+ + + +
+parent +02232cbd +
+
+
+
+ + +
+ + + +
+
+ + +
+
+
+ +Hide whitespace changes + + + +
+ +Inline + + + + +Side-by-side + + + +
+
+
+ +
+
+
+
+ +
+
+ +
+
    + +
+
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + +
+ +
+
+
+
+
+
+ + + + +
+ +
+
+ + + +
+ + + + + +0% + + + + + + + + +or +. + + +
+ + +
+
+
+
+ + +You are about to add + +0 +people + +to the discussion. Proceed with caution. + +
+
+
+
+Finish editing this message first! +
+
+
+ +
+Please register or to comment +
+ +
+ +
+
+ +
+
+ + +
+
+ + + + + + + + diff --git a/debian/changelog b/debian/changelog index 8a60279882..4b5ca23a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libreoffice (4:24.2.4-1) unstable; urgency=medium + + * New upstream release + + * merge from Ubuntu: + [ Rico Tzschichholz ] + Make sure ucf is available before installing python3-uno + + -- Rene Engelhard Wed, 05 Jun 2024 13:30:31 +0200 + libreoffice (4:24.2.3-2) unstable; urgency=medium * debian/patches/use-PyConfig.diff: backport from master; diff --git a/debian/control b/debian/control index 1724e33f68..e6abbf21b4 100644 --- a/debian/control +++ b/debian/control @@ -1022,6 +1022,7 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~), ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} +Pre-Depends: ucf, awk Conflicts: python-uno Replaces: libreoffice-common (<< 1:4.4.0~beta2), libreoffice-core (= 1:4.3.0~beta1-1) diff --git a/debian/control.in b/debian/control.in index da77b5243e..0966a7f0c2 100644 --- a/debian/control.in +++ b/debian/control.in @@ -745,6 +745,7 @@ Depends: libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${bi ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} +Pre-Depends: ucf, awk Conflicts: python-uno Replaces: libreoffice-core (= 1:4.3.0~beta1-1), libreoffice-common (<< 1:4.4.0~beta2) Build-Profiles: diff --git a/debian/python3-uno.lintian-overrides b/debian/python3-uno.lintian-overrides index 69225ca354..2b53a2627c 100644 --- a/debian/python3-uno.lintian-overrides +++ b/debian/python3-uno.lintian-overrides @@ -1,6 +1,2 @@ # "aged out" due to debhelpers changelog trimming (see #1021502) python3-uno: debian-news-entry-has-unknown-version 1:3.5.2-2 [usr/share/doc/python3-uno/NEWS.Debian.gz:1] -# the old package does have a dependency on ucf. the ucf snippets are only ran on upgrades -# which means that the ucf installed back then is still there. No need for the new package to depend -# on ucf just for this -python3-uno: maintainer-script-needs-depends-on-ucf ucf (does not satisfy ucf) [preinst:15] diff --git a/debian/rules b/debian/rules index 346905ec1f..3bb8ef4788 100755 --- a/debian/rules +++ b/debian/rules @@ -83,7 +83,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf # NOT in proper libreoffice-3-6 branch # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1 GIT_TAG=libreoffice-$(lo_sources_ver) -GIT_BRANCH=libreoffice-24-2-3 +GIT_BRANCH=libreoffice-24-2-4 endif ifeq "$(USE_SOURCE_TARBALLS)" "y" lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2) -- cgit v1.2.3