diff options
22 files changed, 241 insertions, 143 deletions
diff --git a/debian/changelog b/debian/changelog index e2436cb366..8dd01a6ada 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libreoffice (4:24.2.0-2) experimental; urgency=medium + + * debian/patches/sw-do-not-require-cui.diff: do not require cui in sw, from + upstream (closes: #1058653) + + * debian/rules: + - don't create debian/control and debian/test/control but an intermediate + control.new + - run debian/rules control in the clean target again but don't directly + overwrite debian/control - diff -u against control.new and warn instead + * debian/libuno*, debian/control.ure.in, debian/rules: + Rename libraries for 64-bit time_t transition. + + -- Rene Engelhard <rene@debian.org> Tue, 30 Jan 2024 21:04:30 +0000 + libreoffice (4:24.2.0-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index a21df56f49..c0c0683cf7 100644 --- a/debian/control +++ b/debian/control @@ -1,3 +1,8 @@ +# +# NOTE: This file is autogenerated. DO NOT manually edit it! +# Edit debian/control*in and rules (whatever applicable), run debian/rules control +# and move control.new to control if the difference is sane. +# Source: libreoffice Section: editors Priority: optional @@ -18,6 +23,7 @@ Build-Depends: autoconf, debhelper-compat (= 12), default-jdk (>= 2:1.17) [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386 !powerpcspe !s390 !sparc] <!nojava>, dh-python <!nopython>, + diffutils, firebird-dev, flex, fontforge-nox | fontforge, @@ -4796,12 +4802,15 @@ Description: LibreOffice UNO runtime environment -- private libraries used by pu This package contains some private UNO/URE libraries which are used by public ones (e.g. cppu). -Package: libuno-sal3 +Package: libuno-sal3t64 Section: libs 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 Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: libuno-sal3, uno-libs3, ure (<< 5.0.0~rc2-1) +Breaks: libreoffice-core (<< 1:4.3.0~), + libuno-sal3 (<< ${source:Version}), + uno-libs3 +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- SAL public library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -4814,12 +4823,15 @@ Description: LibreOffice UNO runtime environment -- SAL public library . This package contains the System Abstraction Layer (SAL) library. -Package: libuno-salhelpergcc3-3 +Package: libuno-salhelpergcc3-3t64 Section: libs 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 Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: libuno-salhelpergcc3-3, uno-libs3, ure (<< 5.0.0~rc2-1) +Breaks: libreoffice-core (<< 1:4.3.0~), + libuno-salhelpergcc3-3 (<< ${source:Version}), + uno-libs3 +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -4832,12 +4844,15 @@ Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library . This package contains C++ helpers to make use of sal easier. -Package: libuno-cppu3 +Package: libuno-cppu3t64 Section: libs 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 Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: libuno-cppu3, uno-libs3, ure (<< 5.0.0~rc2-1) +Breaks: libreoffice-core (<< 1:4.3.0~), + libuno-cppu3 (<< ${source:Version}), + uno-libs3 +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- CPPU public library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -4851,14 +4866,17 @@ Description: LibreOffice UNO runtime environment -- CPPU public library This package contains CPPU, the type definitions/implementations for the core of UNO. -Package: libuno-cppuhelpergcc3-3 +Package: libuno-cppuhelpergcc3-3t64 Section: libs 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 Depends: uno-libs-private (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: libuno-cppuhelpergcc3-3, uno-libs3, ure (<< 5.0.0~rc2-1) +Breaks: libreoffice-core (<< 1:4.3.0~), + libuno-cppuhelpergcc3-3 (<< ${source:Version}), + uno-libs3 +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- CPPU helper library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -4872,12 +4890,15 @@ Description: LibreOffice UNO runtime environment -- CPPU helper library This package contains the cppuhelper library (helpers for using cppu in C++, e.g. templates for implementing UNO components, bootstrapping stuff) -Package: libuno-purpenvhelpergcc3-3 +Package: libuno-purpenvhelpergcc3-3t64 Section: libs 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 Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: uno-libs3, ure (<< 5.0.0~rc2-1) -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: libuno-purpenvhelpergcc3-3, uno-libs3, ure (<< 5.0.0~rc2-1) +Breaks: libreoffice-core (<< 1:4.3.0~), + libuno-purpenvhelpergcc3-3 (<< ${source:Version}), + uno-libs3 +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- "purpose environment" helper The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. diff --git a/debian/control.ure.in b/debian/control.ure.in index b36f010e2b..cbe7102031 100644 --- a/debian/control.ure.in +++ b/debian/control.ure.in @@ -17,12 +17,13 @@ Description: LibreOffice UNO runtime environment -- private libraries used by pu This package contains some private UNO/URE libraries which are used by public ones (e.g. cppu). -Package: libuno-sal3 +Package: libuno-sal3t64 Section: libs Architecture: %OOO_ARCHS% Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: ure (<< 5.0.0~rc2-1), uno-libs3 -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-sal3 +Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-sal3 (<< ${source:Version}) +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- SAL public library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -35,12 +36,13 @@ Description: LibreOffice UNO runtime environment -- SAL public library . This package contains the System Abstraction Layer (SAL) library. -Package: libuno-salhelpergcc3-3 +Package: libuno-salhelpergcc3-3t64 Section: libs Architecture: %OOO_ARCHS% Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: ure (<< 5.0.0~rc2-1), uno-libs3 -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-salhelpergcc3-3 +Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-salhelpergcc3-3 (<< ${source:Version}) +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -53,12 +55,13 @@ Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library . This package contains C++ helpers to make use of sal easier. -Package: libuno-cppu3 +Package: libuno-cppu3t64 Section: libs Architecture: %OOO_ARCHS% Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: ure (<< 5.0.0~rc2-1), uno-libs3 -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-cppu3 +Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-cppu3 (<< ${source:Version}) +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- CPPU public library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -72,12 +75,13 @@ Description: LibreOffice UNO runtime environment -- CPPU public library This package contains CPPU, the type definitions/implementations for the core of UNO. -Package: libuno-cppuhelpergcc3-3 +Package: libuno-cppuhelpergcc3-3t64 Section: libs Architecture: %OOO_ARCHS% Depends: ${misc:Depends}, ${shlibs:Depends}, uno-libs-private (= ${binary:Version}) -Replaces: ure (<< 5.0.0~rc2-1), uno-libs3 -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-cppuhelpergcc3-3 +Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-cppuhelpergcc3-3 (<< ${source:Version}) +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- CPPU helper library The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. @@ -91,12 +95,13 @@ Description: LibreOffice UNO runtime environment -- CPPU helper library This package contains the cppuhelper library (helpers for using cppu in C++, e.g. templates for implementing UNO components, bootstrapping stuff) -Package: libuno-purpenvhelpergcc3-3 +Package: libuno-purpenvhelpergcc3-3t64 Section: libs Architecture: %OOO_ARCHS% Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: ure (<< 5.0.0~rc2-1), uno-libs3 -Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3 +Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-purpenvhelpergcc3-3 +Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-purpenvhelpergcc3-3 (<< ${source:Version}) +Provides: ${t64:Provides} Description: LibreOffice UNO runtime environment -- "purpose environment" helper The Uno Runtime Environment (URE) is the well-known UNO component model of LibreOffice, packaged up as an individual product. diff --git a/debian/libuno-cppu3.lintian-overrides b/debian/libuno-cppu3.lintian-overrides deleted file mode 100644 index 8a71f33686..0000000000 --- a/debian/libuno-cppu3.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libuno-cppu3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppu.so.3) [symbols] diff --git a/debian/libuno-cppu3t64.lintian-overrides b/debian/libuno-cppu3t64.lintian-overrides new file mode 100644 index 0000000000..ad1c692104 --- /dev/null +++ b/debian/libuno-cppu3t64.lintian-overrides @@ -0,0 +1,2 @@ +libuno-cppu3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppu.so.3) [symbols] +libuno-cppu3t64: package-name-doesnt-match-sonames libuno-cppu3 diff --git a/debian/libuno-cppu3.symbols b/debian/libuno-cppu3t64.symbols index 258414ca30..c745fb9677 100644 --- a/debian/libuno-cppu3.symbols +++ b/debian/libuno-cppu3t64.symbols @@ -1,5 +1,5 @@ -libuno_cppu.so.3 libuno-cppu3 #MINVER# -| libuno-cppu3 #MINVER#, libstdc++6 (>= 4.1.1) +libuno_cppu.so.3 libuno-cppu3t64 #MINVER# +| libuno-cppu3t64 #MINVER#, libstdc++6 (>= 4.1.1) (symver)UDK_3_0_0 1.4.0 (symver)UDK_3.1 1.4.0 (symver)UDK_3.2 1.4.0 diff --git a/debian/libuno-cppuhelpergcc3-3.lintian-overrides b/debian/libuno-cppuhelpergcc3-3.lintian-overrides deleted file mode 100644 index d5f90ada11..0000000000 --- a/debian/libuno-cppuhelpergcc3-3.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libuno-cppuhelpergcc3-3: symbols-declares-dependency-on-other-package uno-libs-private (libuno_cppuhelpergcc3.so.3) [symbols] -libuno-cppuhelpergcc3-3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppuhelpergcc3.so.3) [symbols] diff --git a/debian/libuno-cppuhelpergcc3-3t64.lintian-overrides b/debian/libuno-cppuhelpergcc3-3t64.lintian-overrides new file mode 100644 index 0000000000..3e4ed0e9e9 --- /dev/null +++ b/debian/libuno-cppuhelpergcc3-3t64.lintian-overrides @@ -0,0 +1,3 @@ +libuno-cppuhelpergcc3-3t64: symbols-declares-dependency-on-other-package uno-libs-private (libuno_cppuhelpergcc3.so.3) [symbols] +libuno-cppuhelpergcc3-3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppuhelpergcc3.so.3) [symbols] +libuno-cppuhelpergcc3-3t64: package-name-doesnt-match-sonames libuno-cppuhelpergcc3-3 diff --git a/debian/libuno-cppuhelpergcc3-3.symbols b/debian/libuno-cppuhelpergcc3-3t64.symbols index 30be52c3ac..814f8b3f7a 100644 --- a/debian/libuno-cppuhelpergcc3-3.symbols +++ b/debian/libuno-cppuhelpergcc3-3t64.symbols @@ -1,5 +1,5 @@ -libuno_cppuhelpergcc3.so.3 libuno-cppuhelpergcc3-3 #MINVER#, uno-libs-private -| libuno-cppuhelpergcc3-3 #MINVER#, uno-libs-private, libstdc++6 (>= 4.1.1) +libuno_cppuhelpergcc3.so.3 libuno-cppuhelpergcc3-3t64 #MINVER#, uno-libs-private +| libuno-cppuhelpergcc3-3t64 #MINVER#, uno-libs-private, libstdc++6 (>= 4.1.1) (symver)UDK_3_0_0 1.4.0 (symver)UDK_3.1 1.4.0 (symver)UDK_3.2 1.4.0 diff --git a/debian/libuno-purpenvhelpergcc3-3.lintian-overrides b/debian/libuno-purpenvhelpergcc3-3.lintian-overrides deleted file mode 100644 index 8a716d2dcf..0000000000 --- a/debian/libuno-purpenvhelpergcc3-3.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libuno-purpenvhelpergcc3-3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_purpenvhelpergcc3.so.3) [symbols] diff --git a/debian/libuno-purpenvhelpergcc3-3t64.lintian-overrides b/debian/libuno-purpenvhelpergcc3-3t64.lintian-overrides new file mode 100644 index 0000000000..fca2887d13 --- /dev/null +++ b/debian/libuno-purpenvhelpergcc3-3t64.lintian-overrides @@ -0,0 +1,2 @@ +libuno-purpenvhelpergcc3-3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_purpenvhelpergcc3.so.3) [symbols] +libuno-purpenvhelpergcc3-3t64: package-name-doesnt-match-sonames libuno-purpenvhelpergcc3-3 diff --git a/debian/libuno-purpenvhelpergcc3-3.symbols b/debian/libuno-purpenvhelpergcc3-3t64.symbols index e9054a798d..75b85e93e4 100644 --- a/debian/libuno-purpenvhelpergcc3-3.symbols +++ b/debian/libuno-purpenvhelpergcc3-3t64.symbols @@ -1,5 +1,5 @@ -libuno_purpenvhelpergcc3.so.3 libuno-purpenvhelpergcc3-3 #MINVER# -| libuno-purpenvhelpergcc3-3 #MINVER#, libstdc++6 (>= 4.1.1) +libuno_purpenvhelpergcc3.so.3 libuno-purpenvhelpergcc3-3t64 #MINVER# +| libuno-purpenvhelpergcc3-3t64 #MINVER#, libstdc++6 (>= 4.1.1) (symver)UDK_3_0_0 1.4.0 (symver)GLIBCXX_3.4 3.6 1 # add new stuff BELOW this line diff --git a/debian/libuno-sal3.lintian-overrides b/debian/libuno-sal3.lintian-overrides deleted file mode 100644 index 6a166e4967..0000000000 --- a/debian/libuno-sal3.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libuno-sal3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_sal.so.3) [symbols] diff --git a/debian/libuno-sal3t64.lintian-overrides b/debian/libuno-sal3t64.lintian-overrides new file mode 100644 index 0000000000..48f5f465aa --- /dev/null +++ b/debian/libuno-sal3t64.lintian-overrides @@ -0,0 +1,2 @@ +libuno-sal3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_sal.so.3) [symbols] +libuno-sal3t64: package-name-doesnt-match-sonames libuno-sal3 diff --git a/debian/libuno-sal3.symbols b/debian/libuno-sal3t64.symbols index 6449051867..7e174a6f67 100644 --- a/debian/libuno-sal3.symbols +++ b/debian/libuno-sal3t64.symbols @@ -1,5 +1,5 @@ -libuno_sal.so.3 libuno-sal3 #MINVER# -| libuno-sal3 #MINVER#, libstdc++6 (>= 4.1.1) +libuno_sal.so.3 libuno-sal3t64 #MINVER# +| libuno-sal3t64 #MINVER#, libstdc++6 (>= 4.1.1) (symver)UDK_3_0_0 1.4.0 (symver)UDK_3.1 1.4.0 (symver)UDK_3.2 1.4.0 diff --git a/debian/libuno-salhelpergcc3-3.lintian-overrides b/debian/libuno-salhelpergcc3-3.lintian-overrides deleted file mode 100644 index 1e71601792..0000000000 --- a/debian/libuno-salhelpergcc3-3.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libuno-salhelpergcc3-3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_salhelpergcc3.so.3) [symbols] diff --git a/debian/libuno-salhelpergcc3-3t64.lintian-overrides b/debian/libuno-salhelpergcc3-3t64.lintian-overrides new file mode 100644 index 0000000000..956945a733 --- /dev/null +++ b/debian/libuno-salhelpergcc3-3t64.lintian-overrides @@ -0,0 +1,2 @@ +libuno-salhelpergcc3-3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_salhelpergcc3.so.3) [symbols] +libuno-salhelpergcc3-3t64: package-name-doesnt-match-sonames libuno-salhelpergcc3-3 diff --git a/debian/libuno-salhelpergcc3-3.symbols b/debian/libuno-salhelpergcc3-3t64.symbols index 3ff04b785c..f9b9bacff3 100644 --- a/debian/libuno-salhelpergcc3-3.symbols +++ b/debian/libuno-salhelpergcc3-3t64.symbols @@ -1,5 +1,5 @@ -libuno_salhelpergcc3.so.3 libuno-salhelpergcc3-3 #MINVER# -| libuno-salhelpergcc3-3 #MINVER#, libstdc++6 (>= 4.1.1) +libuno_salhelpergcc3.so.3 libuno-salhelpergcc3-3t64 #MINVER# +| libuno-salhelpergcc3-3t64 #MINVER#, libstdc++6 (>= 4.1.1) (symver)UDK_3_0_0 1.4.0 (symver)UDK_3.1 1.4.0 (symver)LIBO_UDK_3.6 3.6.0~beta diff --git a/debian/patches/series b/debian/patches/series index b25a3b7f78..4eba62e51f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -48,3 +48,4 @@ we-dont-have-the-needed-fonts.diff adapt-for-new-carlito.diff fix-system-abseil-build.diff fix-riscv64-bridge.diff +sw-do-not-require-cui.diff diff --git a/debian/patches/sw-do-not-require-cui.diff b/debian/patches/sw-do-not-require-cui.diff new file mode 100644 index 0000000000..449d6f4817 --- /dev/null +++ b/debian/patches/sw-do-not-require-cui.diff @@ -0,0 +1,28 @@ +From 8d26ca7f9ac37b5ada0a2c463b37181bcc8301a8 Mon Sep 17 00:00:00 2001 +From: Noel Grandin <noel.grandin@collabora.co.uk> +Date: Tue, 30 Jan 2024 14:13:41 +0200 +Subject: tdf#158695 convert-to bogusly needs libcui (--disable-gui build) + +Change-Id: I8e13902c4ee9b4b17e921b68b0626f7728cb0c18 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162749 +Tested-by: Jenkins +Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> +--- + sw/Library_sw.mk | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk +index bd5d831f7f2f..707f5506d6a6 100644 +--- a/sw/Library_sw.mk ++++ b/sw/Library_sw.mk +@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_libraries,sw,\ + comphelper \ + cppu \ + cppuhelper \ +- cui \ + $(call gb_Helper_optional,DBCONNECTIVITY, \ + dbtools) \ + docmodel \ +-- +cgit v1.2.3 + diff --git a/debian/rules b/debian/rules index 32c93ec2b2..606581d31b 100755 --- a/debian/rules +++ b/debian/rules @@ -104,6 +104,7 @@ BUILD_DEPS=\ bc,\ bison,\ bzip2,\ + diffutils, \ flex, \ fontforge-nox | fontforge, \ gperf,\ @@ -1940,23 +1941,27 @@ endif # Files created in debian directory $(MAKE) -f debian/rules clean-debdir - # we must not regenerate this automatically per policy.... - #$(MAKE) -f debian/rules control + $(MAKE) -f debian/rules control # Generate control files, because we have so many different languages # and need to run autopkgtests based on Architectures -control: debian/control debian/tests/control +control: debian/control.new debian/tests/control.new # Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org> -debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang debian/rules +debian/control.new: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang debian/rules + echo "#" > debian/control.new + echo "# NOTE: This file is autogenerated. DO NOT manually edit it! " >> debian/control.new + echo "# Edit debian/control*in and rules (whatever applicable), run debian/rules control" >> debian/control.new + echo "# and move control.new to control if the difference is sane." >> debian/control.new + echo "#" >> debian/control.new chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \ -e "s#%[A-Za-z]*=[^%]*%##g#" \ -e "s#%BUILD_DEPS_ARCH%#$(strip $(BUILD_DEPS_ARCH))#g" \ -e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \ -e "s#@BUGS@#$(BUGS)#g" \ - < debian/control.in > debian/control + < debian/control.in >> debian/control.new for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \ LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \ @@ -2018,7 +2023,7 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang -e "s|@FONT_RECOMMENDS@|$$FONT_RECOMMENDS|g" \ -e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \ -e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \ - >> debian/control < debian/control.lang.in; \ + >> debian/control.new < debian/control.lang.in; \ done ifneq "$(ENABLE_HELP)" "n" @@ -2029,152 +2034,169 @@ ifneq "$(ENABLE_HELP)" "n" CCODE=`echo $$LCODE | sed 's/-.*//'`; \ sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \ -e "s|@CCODE@|$$CCODE|g" \ - >> debian/control < debian/control.help.in; \ + >> debian/control.new < debian/control.help.in; \ done # en_US is in -common perl -pi -e 's|(Depends: libreoffice-writer \| language-support-translations-en), libreoffice-l10n-en-us|\1|' \ - debian/control + debian/control.new perl -pi -e 's|(Depends: libreoffice-writer, libreoffice-l10n-en-us)|\1, fonts-deva|' \ - debian/control + debian/control.new endif - cat debian/control.ure.in >> debian/control + cat debian/control.ure.in >> debian/control.new ifeq "$(ENABLE_JAVA)" "y" ifeq "$(ENABLE_MEDIAWIKI)" "y" - cat debian/control.mediawiki.in >> debian/control + cat debian/control.mediawiki.in >> debian/control.new endif ifeq "$(ENABLE_REPORTBUILDER)" "y" - cat debian/control.reportbuilder.in >> debian/control + cat debian/control.reportbuilder.in >> debian/control.new endif ifeq "$(ENABLE_NLPSOLVER)" "y" - cat debian/control.nlpsolver.in >> debian/control + cat debian/control.nlpsolver.in >> debian/control.new endif endif - cat debian/control.fonts.in >> debian/control + cat debian/control.fonts.in >> debian/control.new ifeq "$(PACKAGE_SDK)" "y" - cat debian/control.sdk.in >> debian/control + cat debian/control.sdk.in >> debian/control.new endif ifeq "$(PACKAGE_LOKIT)" "y" - cat debian/control.lokit.in >> debian/control + cat debian/control.lokit.in >> debian/control.new endif ifeq "$(BUILD_GTK3)" "y" - cat debian/control.gtk3.in >> debian/control + cat debian/control.gtk3.in >> debian/control.new endif ifeq "$(BUILD_GTK4)" "y" - cat debian/control.gtk4.in >> debian/control + cat debian/control.gtk4.in >> debian/control.new endif ifeq "$(ENABLE_KF5)" "y" - cat debian/control.kf5.in >> debian/control + cat debian/control.kf5.in >> debian/control.new endif ifeq "$(ENABLE_KF6)" "y" - cat debian/control.kf6.in >> debian/control + cat debian/control.kf6.in >> debian/control.new endif ifeq "$(ENABLE_QT5)" "y" - cat debian/control.qt5.in >> debian/control + cat debian/control.qt5.in >> debian/control.new endif ifeq "$(ENABLE_QT6)" "y" - cat debian/control.qt6.in >> debian/control + cat debian/control.qt6.in >> debian/control.new endif ifeq "$(BUILD_PLASMA)" "y" - cat debian/control.plasma.in >> debian/control + cat debian/control.plasma.in >> debian/control.new endif - cat debian/control.postgresql.in >> debian/control + cat debian/control.postgresql.in >> debian/control.new ifeq "$(ENABLE_EVO2)" "y" - cat debian/control.evolution.in >> debian/control + cat debian/control.evolution.in >> debian/control.new endif - cat debian/control.test-packages.in >> debian/control + cat debian/control.test-packages.in >> debian/control.new ifeq "$(PACKAGE_LIBRELOGO)" "y" - cat debian/control.librelogo.in >> debian/control -endif - cat debian/control.firebird.in >> debian/control - - perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control - perl -pi -e "s,%OOO_NOGUI_ARCHS%,$(OOO_NOGUI_ARCHS),g" debian/control - perl -pi -e "s,%OOO_64BIT_ARCHS%,$(OOO_64BIT_ARCHS),g" debian/control - perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control - perl -pi -e "s,%OOO_LE_ARCHS%,$(OOO_LE_ARCHS),g" debian/control - perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control - perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control - perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control - perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control - perl -pi -e "s,%OOO_REPORTBUILDER_ARCHS%,$(OOO_REPORTBUILDER_ARCHS),g" debian/control - perl -pi -e "s,%OOO_NO_REPORTBUILDER_ARCHS%,$(OOO_NO_REPORTBUILDER_ARCHS),g" debian/control - perl -pi -e "s,%OOO_FIREBIRD_ARCHS%,$(OOO_FIREBIRD_ARCHS),g" debian/control - perl -pi -e "s,%OOO_NO_FIREBIRD_ARCHS%,$(OOO_NO_FIREBIRD_ARCHS),g" debian/control - perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control - perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control + cat debian/control.librelogo.in >> debian/control.new +endif + cat debian/control.firebird.in >> debian/control.new + + perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_NOGUI_ARCHS%,$(OOO_NOGUI_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_64BIT_ARCHS%,$(OOO_64BIT_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_LE_ARCHS%,$(OOO_LE_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control.new + perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_REPORTBUILDER_ARCHS%,$(OOO_REPORTBUILDER_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_NO_REPORTBUILDER_ARCHS%,$(OOO_NO_REPORTBUILDER_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_FIREBIRD_ARCHS%,$(OOO_FIREBIRD_ARCHS),g" debian/control.new + perl -pi -e "s,%OOO_NO_FIREBIRD_ARCHS%,$(OOO_NO_FIREBIRD_ARCHS),g" debian/control.new + perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control.new + perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control.new ifeq "$(BUILD_PLASMA)" "y" - perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-plasma/' debian/control + perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-plasma/' debian/control.new else - perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome/' debian/control + perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome/' debian/control.new endif ifeq (sk,$(findstring sk,$(HELPISOS))) - perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control + perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control.new endif ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS))) - perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control - perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control - perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control + perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control.new + perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control.new + perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control.new endif ifeq "$(MYSQL_FLAVOUR)" "mysql" - perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control + perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control.new endif ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) # be sure to use our rebuilt font - perl -pi -e "s/(Build-Conflicts: .*)/\1,fonts-opensymbol <!nocheck>,/" debian/control + perl -pi -e "s/(Build-Conflicts: .*)/\1,fonts-opensymbol <!nocheck>,/" debian/control.new endif ifneq "$(ALLOW_CLANG)" "y" - perl -pi -e "s/(Build-Conflicts: .*)/\1,clang,/" debian/control + perl -pi -e "s/(Build-Conflicts: .*)/\1,clang,/" debian/control.new else - perl -pi -e "s/(Build-Conflicts: .*)/\1,clang [$(filter-out $(OOO_CLANG_ARCHS),$(OOO_ARCHS))],/" debian/control + perl -pi -e "s/(Build-Conflicts: .*)/\1,clang [$(filter-out $(OOO_CLANG_ARCHS),$(OOO_ARCHS))],/" debian/control.new endif ifeq "$(USE_SYSTEMD)" "n" - perl -pi -e "s/(Build-Conflicts: .*)/\1,systemd-coredump <!nocheck>,/" debian/control + perl -pi -e "s/(Build-Conflicts: .*)/\1,systemd-coredump <!nocheck>,/" debian/control.new endif - $(PYTHON) debian/scripts/joinctrl.py < debian/control > debian/control.tmp - mv debian/control.tmp debian/control + $(PYTHON) debian/scripts/joinctrl.py < debian/control.new > debian/control.tmp + mv debian/control.tmp debian/control.new # make -l10n-fi suggest libreoffice-spellcheck-fi to # match myspell-fi and libreoffice-soikko/-voikko - perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control - perl -pi -e 's/hyphen-fi/hyphen-fi | libreoffice-hyphenation-fi/' debian/control + perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control.new + perl -pi -e 's/hyphen-fi/hyphen-fi | libreoffice-hyphenation-fi/' debian/control.new ifeq "$(USE_DBUS)" "y" ifeq "$(ENABLE_BLUETOOTH)" "y" - perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control)/' debian/control + perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control)/' debian/control.new endif - perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control + perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control.new endif ifneq "$(DICT_DIR)" "/usr/share/hunspell" - perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control + perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control.new endif ifeq "$(ENABLE_APPARMOR_PROFILES)" "y" - perl -pi -e 's/ttf-mscorefonts-installer/ttf-mscorefonts-installer, apparmor/' debian/control + perl -pi -e 's/ttf-mscorefonts-installer/ttf-mscorefonts-installer, apparmor/' debian/control.new endif -.DELETE_ON_ERROR: debian/control + diff -u debian/control debian/control.new && rm -f debian/control.new || (\ + echo "Generated control file differs! Check the result!"; \ + echo "Note: Edit control*.in and rules instead of control!"; \ + echo "If the difference is correct move control.new to control"; \ + exit 1) -debian/tests/control: debian/tests/control.in debian/rules +#.DELETE_ON_ERROR: debian/control.new + +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 "# 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" \ -e "s|%OOO_JUNIT_ARCHS%|$(OOO_JUNIT_ARCHS)|g" \ -e "s|%OOO_NOGUI_ARCHS%|$(OOO_NOGUI_ARCHS)|g" \ -e "s|%OOO_JAVA_AND_NOGUI_ARCHS%|$(filter $(OOO_JAVA_ARCHS),$(OOO_NOGUI_ARCHS))|g" \ -e "s|%OOO_CHECK_FATAL_ARCHS%|$(OOO_CHECK_FATAL_ARCHS)|g" \ -e "s|%AUTOPKGTEST_CPPUNIT_PACKAGES%|$(shell echo $(AUTOPKGTEST_CPPUNIT_PACKAGES) | sed -e "s/\ /,/g")|g" \ - > debian/tests/control < debian/tests/control.in + >> debian/tests/control.new < debian/tests/control.in # otherwise Architecture: is empty (and empty means "any" in autopgktest, # cf. https://salsa.debian.org/ci-team/autopkgtest/-/blob/master/lib/testdesc.py#L546) ifneq (,$(OOO_JUNIT_ARCHS)) sed -e "s|%OOO_JUNIT_ARCHS%|$(OOO_JUNIT_ARCHS)|g" \ - >> debian/tests/control < debian/tests/control.junit.in + >> debian/tests/control.new < debian/tests/control.junit.in endif -.DELETE_ON_ERROR: debian/tests/control + 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 "If the difference is correct move control.new to control"; \ + exit 1) + +#.DELETE_ON_ERROR: debian/tests/control.new # All 'important' targets have 2 lines. The one that is run by # dpkg-buildpackage or the user, and the one that does the actual work. This @@ -3145,18 +3167,18 @@ ifeq "$(ENABLE_JAVA)" "y" endif # and the public libs to their respective packages for i in sal cppu; do \ - mkdir -p debian/libuno-$${i}3/$(OODIR)/program; \ - mkdir -p debian/libuno-$${i}3/usr/lib/$(DEB_HOST_MULTIARCH); \ + mkdir -p debian/libuno-$${i}3t64/$(OODIR)/program; \ + mkdir -p debian/libuno-$${i}3t64/usr/lib/$(DEB_HOST_MULTIARCH); \ mv debian/ure/$(OODIR)/program/libuno_$${i}.so.3 \ - debian/libuno-$${i}3/$(OODIR)/program; \ - ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}3/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \ + debian/libuno-$${i}3t64/$(OODIR)/program; \ + ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}3t64/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \ done for i in salhelpergcc3 cppuhelpergcc3 purpenvhelpergcc3; do \ - mkdir -p debian/libuno-$${i}-3/$(OODIR)/program; \ - mkdir -p debian/libuno-$${i}-3/usr/lib/$(DEB_HOST_MULTIARCH); \ + mkdir -p debian/libuno-$${i}-3t64/$(OODIR)/program; \ + mkdir -p debian/libuno-$${i}-3t64/usr/lib/$(DEB_HOST_MULTIARCH); \ mv debian/ure/$(OODIR)/program/libuno_$${i}.so.3 \ - debian/libuno-$${i}-3/$(OODIR)/program; \ - ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}-3/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \ + debian/libuno-$${i}-3t64/$(OODIR)/program; \ + ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}-3t64/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \ done # we also need libxmlreaderlo.so, libreglo.so and libunoidllo.so (libuno_cppuhelpergcc3.so.3 # needs it) and libstorelo.so (libreglo.so needs it) @@ -3958,7 +3980,7 @@ endif dh_bugfiles -a -A dh_link -a ifeq "$(BUILD_DBGSYM_PACKAGES)" "y" - for i in libuno-cppu3 libuno-sal3 libreoffice-core libreoffice-writer; do \ + for i in libuno-cppu3t64 libuno-sal3t64 libreoffice-core libreoffice-writer; do \ rm -rf debian/.debhelper/$$i/dbgsym-root; \ done ifeq "$(BUILD_NOGUI_PACKAGES)" "y" @@ -3984,12 +4006,12 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y" # move sal and cppu gdb helpers into their respective packages for i in sal cppu; do \ - mkdir -p debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \ - mkdir -p debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \ + mkdir -p debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \ + mkdir -p debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \ mv debian/.debhelper/libreoffice-core/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program/libuno_$$i.so.3-gdb.py \ - debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \ + debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \ mv debian/.debhelper/libreoffice-core/dbgsym-root/usr/share/libreoffice/gdb/libreoffice/$$i.py \ - debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \ + debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \ done # move sw and writerfilter gdb helpers to writer-dbgsym @@ -4040,7 +4062,7 @@ ifeq "$(ENABLE_INTROSPECTION)" "y" endif dh_strip_nondeterminism -a for i in sal3 cppu3 salhelpergcc3-3 cppuhelpergcc3-3 purpenvhelpergcc3-3; do \ - dh_makeshlibs -plibuno-$$i -V"libuno-$$i (>= 4:$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -c2 -V -v$(BINARY_VERSION); \ + dh_makeshlibs -plibuno-$${i}t64 -V"libuno-$${i}t64 (>= 4:$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -c2 -V -v$(BINARY_VERSION); \ done dh_makeshlibs -n -pure -V"ure (>= 4:$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -d -V -v$(BINARY_VERSION) dh_installdeb -a @@ -4095,17 +4117,17 @@ endif endif dh_shlibdeps -a -Nlibreoffice-core-nogui -Nure \ - -Lure -Llibuno-sal3 -Llibpuno-cppu3 -Llibuno-salhelpergcc3-3 -Llibcppuhelpergcc3-3 -Llibuno-purpenvhelpergcc3-3 \ - -l$(CURDIR)/debian/libuno-sal3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \ + -Lure -Llibuno-sal3t64 -Llibpuno-cppu3t64 -Llibuno-salhelpergcc3-3t64 -Llibcppuhelpergcc3-3t64 -Llibuno-purpenvhelpergcc3-3t64 \ + -l$(CURDIR)/debian/libuno-sal3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \ $(SHLIBS_OVERRIDE) dh_shlibdeps -pure \ - -Llibuno-sal3 -Llibpuno-cppu3 -Llibuno-salhelpergcc3-3 -Llibcppuhelpergcc3-3 -Llibuno-purpenvhelpergcc3-3 \ - -l$(CURDIR)/debian/libuno-sal3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program \ + -Llibuno-sal3t64 -Llibpuno-cppu3t64 -Llibuno-salhelpergcc3-3t64 -Llibcppuhelpergcc3-3t64 -Llibuno-purpenvhelpergcc3-3t64 \ + -l$(CURDIR)/debian/libuno-sal3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program \ -- -xure ifeq "$(BUILD_NOGUI_PACKAGES)" "y" dh_shlibdeps -plibreoffice-core-nogui \ - -Lure -Llibuno-sal3 -Llibpuno-cppu3 -Llibuno-salhelpergcc3-3 -Llibcppuhelpergcc3-3 -Llibuno-purpenvhelpergcc3-3 \ - -l$(CURDIR)/debian/libuno-sal3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core-nogui/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \ + -Lure -Llibuno-sal3t64 -Llibpuno-cppu3t64 -Llibuno-salhelpergcc3-3t64 -Llibcppuhelpergcc3-3t64 -Llibuno-purpenvhelpergcc3-3t64 \ + -l$(CURDIR)/debian/libuno-sal3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core-nogui/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \ $(SHLIBS_OVERRIDE) endif ifneq (,$(filter coinmp, $(SYSTEM_STUFF))) @@ -4114,10 +4136,6 @@ endif perl -pi -e "s/coinor-libcoinmp1v5/coinor-libcoinmp1v5 $(COINMP_MINVER)/" \ debian/libreoffice-calc.substvars endif - # FIXME. Otherwise the unoEditGlossary openDialog test crashes and hangs. go sure to make sure it doesn't - # happen on runtime. No idea whether alpha1 would suffice but it doesn't really matter in practice anyway :) - perl -pi -e "s/, libuno-sal3 \(>= 1:7.3.0~beta1\),/, libuno-sal3 \(>= 1:7.4.0~beta1\),/" \ - debian/libreoffice-core.substvars ifeq "$(ENABLE_JAVA)" "y" for p in $(ARCH_DEP_PACKAGES); do \ jh_depends -p$$p -Xure -Xbase-files; \ @@ -4156,7 +4174,7 @@ endif -V'liberation-fonts-recommends=$(LIBERATION_FONTS_RECOMMENDS)' \ -v$(BINARY_VERSION) ifeq "$(BUILD_DBGSYM_PACKAGES)" "y" - for i in libuno-sal3 libuno-cppu3 libuno-salhelpergcc3-3 libuno-cppuhelpergcc3-3 libuno-purpenvhelpergcc3-3 \ + for i in libuno-sal3t64 libuno-cppu3t64 libuno-salhelpergcc3-3t64 libuno-cppuhelpergcc3-3t64 libuno-purpenvhelpergcc3-3t64 \ libreoffice-core libreoffice-writer; do \ perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, python3-six/' \ debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \ diff --git a/debian/tests/control b/debian/tests/control index 2c7b47c062..d4de77c0a4 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,8 @@ +# +# NOTE: This file is autogenerated. DO NOT manually edit it! +# Edit debian/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 Depends: @builddeps@, ure Restrictions: allow-stderr, rw-build-tree, superficial @@ -103,7 +108,7 @@ Restrictions: allow-stderr, skippable #Tests: cppunit-subsequentcheck #Architecture: amd64 arm64 armhf -#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird +#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3t64,libuno-cppu3t64,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird #Restrictions: build-needed, rw-build-tree, allow-stderr # ## Those tests even work when there is no /usr/lib/libreoffice there in any way. @builddeps@ is enough. @@ -111,12 +116,12 @@ Restrictions: allow-stderr, skippable ## or whatever update broke it we should know #Tests: slowcheck #Architecture: amd64 arm64 armhf -##Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird +##Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3t64,libuno-cppu3t64,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird #Restrictions: build-needed, rw-build-tree, allow-stderr, superficial # #Tests: unitcheck #Architecture: amd64 arm64 armhf -#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird +#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3t64,libuno-cppu3t64,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird #Restrictions: build-needed, rw-build-tree, allow-stderr, superficial, skippable Test-Command: for i in /etc/apparmor.d/usr.lib.libreoffice.program.*; do /sbin/apparmor_parser --add --skip-cache --skip-kernel-load $i; done |