From c86c0cedb85d1ab3e59a949eed8c428155493e36 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Thu, 5 Feb 2026 04:30:48 +0100 Subject: DEB libcaldav: Changes to silence lintian reports. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Added build and run time dependencies. + Added SO version to binary package name. + Added reason for epoch change to changelog. + Extended package description. Signed-off-by: Slávek Banko --- debian/_base/dependencies/libcaldav/debian/changelog | 7 +++++++ debian/_base/dependencies/libcaldav/debian/control | 17 +++++++++-------- .../dependencies/libcaldav/debian/libcaldav.install | 1 - .../dependencies/libcaldav/debian/libcaldav0.install | 1 + debian/_base/dependencies/libcaldav/debian/rules | 18 ++++++++++-------- .../libcaldav/debian/source.lintian-overrides | 9 +++++++++ ubuntu/_base/dependencies/libcaldav/debian/changelog | 7 +++++++ ubuntu/_base/dependencies/libcaldav/debian/control | 17 +++++++++-------- .../dependencies/libcaldav/debian/libcaldav.install | 1 - .../dependencies/libcaldav/debian/libcaldav0.install | 1 + ubuntu/_base/dependencies/libcaldav/debian/rules | 18 ++++++++++-------- .../libcaldav/debian/source.lintian-overrides | 9 +++++++++ 12 files changed, 72 insertions(+), 34 deletions(-) delete mode 100644 debian/_base/dependencies/libcaldav/debian/libcaldav.install create mode 100644 debian/_base/dependencies/libcaldav/debian/libcaldav0.install create mode 100644 debian/_base/dependencies/libcaldav/debian/source.lintian-overrides delete mode 100644 ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install create mode 100644 ubuntu/_base/dependencies/libcaldav/debian/libcaldav0.install create mode 100644 ubuntu/_base/dependencies/libcaldav/debian/source.lintian-overrides diff --git a/debian/_base/dependencies/libcaldav/debian/changelog b/debian/_base/dependencies/libcaldav/debian/changelog index 13d81ef1d..5c342a117 100644 --- a/debian/_base/dependencies/libcaldav/debian/changelog +++ b/debian/_base/dependencies/libcaldav/debian/changelog @@ -1,3 +1,10 @@ +libcaldav (4:14.1.6~pre1-0) forky; urgency=low + + * Added SO version to binary package name. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Wed, 04 Feb 2026 21:41:51 +0100 + libcaldav (0.6.5-2debian2) maverick; urgency=low * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources diff --git a/debian/_base/dependencies/libcaldav/debian/control b/debian/_base/dependencies/libcaldav/debian/control index 00b867858..2080fd3fb 100644 --- a/debian/_base/dependencies/libcaldav/debian/control +++ b/debian/_base/dependencies/libcaldav/debian/control @@ -2,23 +2,24 @@ Source: libcaldav Section: graphics Priority: optional Maintainer: TDE Debian Team -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev Standards-Version: 3.8.3 -Package: libcaldav +Package: libcaldav0 Architecture: any Multi-Arch: same Section: libs -Depends: ${shlibs:Depends} -Description: - libcaldav provides a C interface for caldav PIM clients +Breaks: libcaldav +Replaces: libcaldav +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: libcaldav - a caldav PIM clients library + libcaldav provides a C interface for caldav PIM clients. Package: libcaldav-dev Architecture: any -Multi-Arch: foreign Section: libdevel -Depends: libcaldav (= ${binary:Version}) -Description: +Depends: libcaldav0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: libcaldav - a caldav PIM clients library libcaldav provides a C interface for caldav PIM clients . This is the development package containing header files and link diff --git a/debian/_base/dependencies/libcaldav/debian/libcaldav.install b/debian/_base/dependencies/libcaldav/debian/libcaldav.install deleted file mode 100644 index f9fa56fcc..000000000 --- a/debian/_base/dependencies/libcaldav/debian/libcaldav.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.so.* diff --git a/debian/_base/dependencies/libcaldav/debian/libcaldav0.install b/debian/_base/dependencies/libcaldav/debian/libcaldav0.install new file mode 100644 index 000000000..f9fa56fcc --- /dev/null +++ b/debian/_base/dependencies/libcaldav/debian/libcaldav0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.so.* diff --git a/debian/_base/dependencies/libcaldav/debian/rules b/debian/_base/dependencies/libcaldav/debian/rules index 899d31ee9..adf5b8d4c 100755 --- a/debian/_base/dependencies/libcaldav/debian/rules +++ b/debian/_base/dependencies/libcaldav/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) ifeq ($(DEB_TIME64_API),true) -DEB_TIME64_SUFFIX = 0t64 +DEB_TIME64_SUFFIX = t64 else DEB_TIME64_SUFFIX = endif @@ -31,16 +31,17 @@ post-patches:: ifeq ($(DEB_TIME64_API),true) # update library package name for TIME64 ABI ls -d debian/* | \ - grep -E "/libcaldav\." | \ + grep -E "/libcaldav0\." | \ grep -v "\.t64$$" | \ while read a; do \ [ -d $$a ] || [ -f $$a.t64 ] || \ - (cp -a $$a debian/libcaldav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + (cp -a $$a debian/libcaldav0$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ done [ -f debian/control.t64 ] || \ sed -i.t64 \ - -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ - -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + -e "s/^Package: \\(libcaldav0\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libcaldav\\)$$/\\1: \\2, \\20/" \ + -e "s/\\(libcaldav0\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ debian/control endif @@ -56,12 +57,13 @@ ifeq ($(DEB_TIME64_API),true) mv $$a $${a%.t64}; \ done ls -d debian/* | \ - grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \ + grep -E "/libcaldav0$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm [ -f debian/control.t64 ] || \ sed -i.t64 \ - -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ - -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + -e "s/^Package: \\(libcaldav0\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libcaldav\\)$$/\\1: \\2, \\20/" \ + -e "s/\\(libcaldav0\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ debian/control else [ ! -f debian/control.t64 ] || \ diff --git a/debian/_base/dependencies/libcaldav/debian/source.lintian-overrides b/debian/_base/dependencies/libcaldav/debian/source.lintian-overrides new file mode 100644 index 000000000..59b22676b --- /dev/null +++ b/debian/_base/dependencies/libcaldav/debian/source.lintian-overrides @@ -0,0 +1,9 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +libcaldav source: source-nmu-has-incorrect-version-number +libcaldav source: binary-nmu-debian-revision-in-source +libcaldav source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +libcaldav source: custom-compression-in-debian-source-options diff --git a/ubuntu/_base/dependencies/libcaldav/debian/changelog b/ubuntu/_base/dependencies/libcaldav/debian/changelog index 13d81ef1d..5c342a117 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/changelog +++ b/ubuntu/_base/dependencies/libcaldav/debian/changelog @@ -1,3 +1,10 @@ +libcaldav (4:14.1.6~pre1-0) forky; urgency=low + + * Added SO version to binary package name. + * The epoch change is for historical reasons from the KDE3 era. + + -- Slávek Banko Wed, 04 Feb 2026 21:41:51 +0100 + libcaldav (0.6.5-2debian2) maverick; urgency=low * Fixed RECURRENCE-ID modification with Zimbra CalDAV resources diff --git a/ubuntu/_base/dependencies/libcaldav/debian/control b/ubuntu/_base/dependencies/libcaldav/debian/control index 00b867858..2080fd3fb 100644 --- a/ubuntu/_base/dependencies/libcaldav/debian/control +++ b/ubuntu/_base/dependencies/libcaldav/debian/control @@ -2,23 +2,24 @@ Source: libcaldav Section: graphics Priority: optional Maintainer: TDE Debian Team -Build-Depends: tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev +Build-Depends: cdbs, tde-cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, libcurl4-gnutls-dev (>= 7.19), libglib2.0-dev Standards-Version: 3.8.3 -Package: libcaldav +Package: libcaldav0 Architecture: any Multi-Arch: same Section: libs -Depends: ${shlibs:Depends} -Description: - libcaldav provides a C interface for caldav PIM clients +Breaks: libcaldav +Replaces: libcaldav +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: libcaldav - a caldav PIM clients library + libcaldav provides a C interface for caldav PIM clients. Package: libcaldav-dev Architecture: any -Multi-Arch: foreign Section: libdevel -Depends: libcaldav (= ${binary:Version}) -Description: +Depends: libcaldav0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: libcaldav - a caldav PIM clients library libcaldav provides a C interface for caldav PIM clients . This is the development package containing header files and link diff --git a/ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install deleted file mode 100644 index f9fa56fcc..000000000 --- a/ubuntu/_base/dependencies/libcaldav/debian/libcaldav.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.so.* diff --git a/ubuntu/_base/dependencies/libcaldav/debian/libcaldav0.install b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav0.install new file mode 100644 index 000000000..f9fa56fcc --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/libcaldav0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcaldav.so.* diff --git a/ubuntu/_base/dependencies/libcaldav/debian/rules b/ubuntu/_base/dependencies/libcaldav/debian/rules index 899d31ee9..adf5b8d4c 100755 --- a/ubuntu/_base/dependencies/libcaldav/debian/rules +++ b/ubuntu/_base/dependencies/libcaldav/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_TIME64_API = $(shell echo | cc $(dpkg-buildflags --get CPPFLAGS) -dM -E -x c++ - | grep -q "_TIME_BITS 64" && echo true || false) ifeq ($(DEB_TIME64_API),true) -DEB_TIME64_SUFFIX = 0t64 +DEB_TIME64_SUFFIX = t64 else DEB_TIME64_SUFFIX = endif @@ -31,16 +31,17 @@ post-patches:: ifeq ($(DEB_TIME64_API),true) # update library package name for TIME64 ABI ls -d debian/* | \ - grep -E "/libcaldav\." | \ + grep -E "/libcaldav0\." | \ grep -v "\.t64$$" | \ while read a; do \ [ -d $$a ] || [ -f $$a.t64 ] || \ - (cp -a $$a debian/libcaldav$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ + (cp -a $$a debian/libcaldav0$(DEB_TIME64_SUFFIX).$${a##*.} && mv $$a $$a.t64); \ done [ -f debian/control.t64 ] || \ sed -i.t64 \ - -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ - -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + -e "s/^Package: \\(libcaldav0\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libcaldav\\)$$/\\1: \\2, \\20/" \ + -e "s/\\(libcaldav0\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ debian/control endif @@ -56,12 +57,13 @@ ifeq ($(DEB_TIME64_API),true) mv $$a $${a%.t64}; \ done ls -d debian/* | \ - grep -E "/libcaldav$(DEB_TIME64_SUFFIX)\." | \ + grep -E "/libcaldav0$(DEB_TIME64_SUFFIX)\." | \ xargs -r rm [ -f debian/control.t64 ] || \ sed -i.t64 \ - -e "s/^Package: \\(libcaldav\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)\\nReplaces: \\1\\nBreaks: \\1/" \ - -e "s/\\(libcaldav\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ + -e "s/^Package: \\(libcaldav0\\)$$/Package: \\1$(DEB_TIME64_SUFFIX)/" \ + -e "s/^\\(Replaces\\|Breaks\\): \\(libcaldav\\)$$/\\1: \\2, \\20/" \ + -e "s/\\(libcaldav0\\) (=/\\1$(DEB_TIME64_SUFFIX) (=/" \ debian/control else [ ! -f debian/control.t64 ] || \ diff --git a/ubuntu/_base/dependencies/libcaldav/debian/source.lintian-overrides b/ubuntu/_base/dependencies/libcaldav/debian/source.lintian-overrides new file mode 100644 index 000000000..59b22676b --- /dev/null +++ b/ubuntu/_base/dependencies/libcaldav/debian/source.lintian-overrides @@ -0,0 +1,9 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +libcaldav source: source-nmu-has-incorrect-version-number +libcaldav source: binary-nmu-debian-revision-in-source +libcaldav source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +libcaldav source: custom-compression-in-debian-source-options -- cgit v1.2.3