From 851b9c86e713c844a1b279d4711690e346560067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> Date: Sat, 4 May 2024 09:53:03 +0200 Subject: [PATCH 1/4] Apply NMU diff Thanks: Steve Langasek --- debian/changelog | 7 +++++++ debian/control | 9 ++++++--- debian/libwlroots12.shlibs | 1 - debian/{libwlroots12.dirs => libwlroots12t64.dirs} | 0 debian/{libwlroots12.install => libwlroots12t64.install} | 0 debian/libwlroots12t64.lintian-overrides | 1 + debian/libwlroots12t64.shlibs | 1 + 7 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 debian/libwlroots12.shlibs rename debian/{libwlroots12.dirs => libwlroots12t64.dirs} (100%) rename debian/{libwlroots12.install => libwlroots12t64.install} (100%) create mode 100644 debian/libwlroots12t64.lintian-overrides create mode 100644 debian/libwlroots12t64.shlibs diff --git a/debian/changelog b/debian/changelog index ef9c8995d..7c59a3ce1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,13 @@ wlroots (0.17.2-1) experimental; urgency=medium -- Guido Günther <agx@sigxcpu.org> Tue, 12 Mar 2024 19:16:00 +0100 +wlroots (0.17.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename libraries for 64-bit time_t transition. Closes: #1063089 + + -- Steve Langasek <vorlon@debian.org> Thu, 29 Feb 2024 02:36:15 +0000 + wlroots (0.17.1-2) unstable; urgency=medium * Upload to unstable. diff --git a/debian/control b/debian/control index a83ac6cea..2859a0285 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: wlroots Priority: optional Maintainer: Sway and related packages team <team+swaywm@tracker.debian.org> Uploaders: Guido Günther <agx@sigxcpu.org>, Birger Schacht <birger@rantanplan.org> -Build-Depends: +Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), glslang-tools, hwdata, @@ -54,7 +54,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libwlroots12 (= ${binary:Version}), + libwlroots12t64 (= ${binary:Version}), libcap-dev, libdisplay-info-dev, libdrm-dev (>= 2.4.114), @@ -91,7 +91,10 @@ Description: Modular wayland compositor library - development headers . This package contains the development headers. -Package: libwlroots12 +Package: libwlroots12t64 +Provides: ${t64:Provides} +Replaces: libwlroots12 +Breaks: libwlroots12 (<< ${source:Version}) Architecture: any Multi-Arch: same Depends: diff --git a/debian/libwlroots12.shlibs b/debian/libwlroots12.shlibs deleted file mode 100644 index 7de3920d2..000000000 --- a/debian/libwlroots12.shlibs +++ /dev/null @@ -1 +0,0 @@ -libwlroots 12 libwlroots12 (>= 0.17.0) diff --git a/debian/libwlroots12.dirs b/debian/libwlroots12t64.dirs similarity index 100% rename from debian/libwlroots12.dirs rename to debian/libwlroots12t64.dirs diff --git a/debian/libwlroots12.install b/debian/libwlroots12t64.install similarity index 100% rename from debian/libwlroots12.install rename to debian/libwlroots12t64.install diff --git a/debian/libwlroots12t64.lintian-overrides b/debian/libwlroots12t64.lintian-overrides new file mode 100644 index 000000000..7e0fb6a7c --- /dev/null +++ b/debian/libwlroots12t64.lintian-overrides @@ -0,0 +1 @@ +libwlroots12t64: package-name-doesnt-match-sonames libwlroots12 diff --git a/debian/libwlroots12t64.shlibs b/debian/libwlroots12t64.shlibs new file mode 100644 index 000000000..69597f4d3 --- /dev/null +++ b/debian/libwlroots12t64.shlibs @@ -0,0 +1 @@ +libwlroots 12 libwlroots12t64 (>= 0.17.0) -- GitLab From 2a8b2e52aa3d21cc0a5bbc35febfd95b1331799e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> Date: Sat, 4 May 2024 09:39:23 +0200 Subject: [PATCH 2/4] Use pkgconf --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 2859a0285..dc2e2816e 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), libxcb-xinput-dev, libxkbcommon-dev, meson, - pkg-config, + pkgconf, wayland-protocols (>= 1.24), xwayland, Standards-Version: 4.6.2 -- GitLab From d7a207bca3152b317aed85d72b8b416585165f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> Date: Sat, 4 May 2024 09:43:00 +0200 Subject: [PATCH 3/4] Bump versions wayland-protocols dependency Closes: #1029381, #1064497 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dc2e2816e..e451f34d3 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), libxkbcommon-dev, meson, pkgconf, - wayland-protocols (>= 1.24), + wayland-protocols (>= 1.32), xwayland, Standards-Version: 4.6.2 Section: libs -- GitLab From 1cd2465f2eb42e07f1286cc4656e246d4d967074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> Date: Sat, 4 May 2024 09:31:56 +0200 Subject: [PATCH 4/4] Document changes and release 0.17.2-2 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7c59a3ce1..943128817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +wlroots (0.17.2-2) unstable; urgency=medium + + * Upload to unstable + * Acknowledge NMU (Closes: #1063089) + * Use pkgconf + * Bump versions wayland-protocols dependency + Closes: #1029381, #1064497 + + -- Guido Günther <agx@sigxcpu.org> Sat, 04 May 2024 09:31:44 +0200 + wlroots (0.17.2-1) experimental; urgency=medium * Upload to experimental to not disturb ongoing transitions -- GitLab