Bug#739400: src:wayland: [PATCH] libwayland-dev is not Multi-Arch:same
Package: src:wayland
Severity: normal
Hi. I'm looking at making QT dev packages Multi-Arch same. There are
several dependencies that need to be multi-arched first, and
libwayland-dev is one of them. The chain is
qtbase5-dev depends on
libgles2-mesa-dev depends on
libegl1-mesa-dev depends on
libwayland-dev
I'm attaching a proposed patch that makes libwayland-dev
Multi-Arch:same. This is done by splitting that package into -dev,
-tools and -doc. The -tools package contains the wayland-scanner
executable, and is Multi-Arch:foreign (is this correct?). The -doc
package contains manpages. These were split off because each build of
the manpages embeds a timestamp into the output, so you can get
differing manpage files in different arches. I can strip off the
timestamp instead, and keep the manpages as a part of the -dev package;
tell me if this is preferable.
>From af0b163e3087268eb5d1e03e84e1d1512457a6e0 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@oblong.com>
Date: Sun, 16 Feb 2014 21:48:44 -0800
Subject: [PATCH] split -dev package into -dev, -tools and -doc
As a result -dev is now Multi-Arch: same
---
debian/control | 34 ++++++++++++++++++++++++++++++++++
debian/libwayland-dev.install | 10 ----------
debian/libwayland-doc.install | 6 ++++++
debian/libwayland-tools.install | 2 ++
4 files changed, 42 insertions(+), 10 deletions(-)
create mode 100644 debian/libwayland-doc.install
create mode 100644 debian/libwayland-tools.install
diff --git a/debian/control b/debian/control
index dfb6c57..e38e9ec 100644
--- a/debian/control
+++ b/debian/control
@@ -147,6 +147,7 @@ Depends:
libwayland-cursor0 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
+Multi-Arch: same
Description: wayland compositor infrastructure - development files
Wayland is a protocol for a compositor to talk to its clients as well
as a C library implementation of that protocol. The compositor can be
@@ -157,3 +158,36 @@ Description: wayland compositor infrastructure - development files
.
This package contains the development headers for the Wayland libraries.
Non-developers likely have little use for this package.
+
+Package: libwayland-tools
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Multi-Arch: foreign
+Description: wayland compositor infrastructure - development files
+ Wayland is a protocol for a compositor to talk to its clients as well
+ as a C library implementation of that protocol. The compositor can be
+ a standalone display server running on Linux kernel modesetting and
+ evdev input devices, an X application, or a wayland client
+ itself. The clients can be traditional applications, X servers
+ (rootless or fullscreen) or other display servers.
+ .
+ This package contains the development tools
+
+Package: libwayland-doc
+Section: doc
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}
+Description: wayland compositor infrastructure - development files
+ Wayland is a protocol for a compositor to talk to its clients as well
+ as a C library implementation of that protocol. The compositor can be
+ a standalone display server running on Linux kernel modesetting and
+ evdev input devices, an X application, or a wayland client
+ itself. The clients can be traditional applications, X servers
+ (rootless or fullscreen) or other display servers.
+ .
+ This package contains manpages and documentation
diff --git a/debian/libwayland-dev.install b/debian/libwayland-dev.install
index 5d635af..5e5b5ca 100644
--- a/debian/libwayland-dev.install
+++ b/debian/libwayland-dev.install
@@ -1,12 +1,6 @@
-# Tool to build various other packages:
-usr/bin/wayland-scanner
-
# Headers:
usr/include
-# Man pages
-usr/share/man/man3
-
# Use no wildcards to ensure we spot any update:
usr/lib/*/libwayland-client.a
usr/lib/*/libwayland-client.so
@@ -20,7 +14,3 @@ usr/lib/*/pkgconfig/wayland-server.pc
usr/share/pkgconfig/wayland-scanner.pc
usr/share/aclocal/wayland-scanner.m4
usr/share/wayland/wayland-scanner.mk
-
-# Documentation
-usr/share/wayland/wayland.xml
-usr/share/wayland/wayland.dtd
diff --git a/debian/libwayland-doc.install b/debian/libwayland-doc.install
new file mode 100644
index 0000000..197cd6e
--- /dev/null
+++ b/debian/libwayland-doc.install
@@ -0,0 +1,6 @@
+# Man pages
+usr/share/man/man3
+
+# Documentation
+usr/share/wayland/wayland.xml
+usr/share/wayland/wayland.dtd
diff --git a/debian/libwayland-tools.install b/debian/libwayland-tools.install
new file mode 100644
index 0000000..ba096c5
--- /dev/null
+++ b/debian/libwayland-tools.install
@@ -0,0 +1,2 @@
+# Tool to build various other packages:
+usr/bin/wayland-scanner
--
1.7.10.4
Reply to: