--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: src:wayland: [PATCH] libwayland-dev is not Multi-Arch:same
- From: Dima Kogan <dima@secretsauce.net>
- Date: Tue, 18 Feb 2014 00:17:46 -0800
- Message-id: <874n3w96mt.fsf@secretsauce.net>
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
--- End Message ---
--- Begin Message ---
Source: wayland
Source-Version: 1.11.0-1
We believe that the bug you reported is fixed in the latest version of
wayland, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 739400@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Héctor Orón Martínez <zumbi@debian.org> (supplier of updated wayland package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 02 Jun 2016 11:37:00 +0200
Source: wayland
Binary: libwayland-client0 libwayland-server0 libwayland-cursor0 libwayland-dev libwayland-doc libwayland-bin
Architecture: source i386 all
Version: 1.11.0-1
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Héctor Orón Martínez <zumbi@debian.org>
Description:
libwayland-bin - wayland compositor infrastructure - binary utilities
libwayland-client0 - wayland compositor infrastructure - client library
libwayland-cursor0 - wayland compositor infrastructure - cursor library
libwayland-dev - wayland compositor infrastructure - development files
libwayland-doc - wayland compositor infrastructure - documentation files
libwayland-server0 - wayland compositor infrastructure - server library
Closes: 739400
Changes:
wayland (1.11.0-1) unstable; urgency=medium
.
* New upstream release
* d/control: make libwayland-dev multiarch aware
- based on a patch from Dima Kogan.
(Closes: #739400)
* d/libwayland-client0.symbols: update with new symbols
Checksums-Sha1:
26c60b41ad9d37752a31f2a9823d57c259c11dbb 2366 wayland_1.11.0-1.dsc
1155078c776a0bac3da86b9e972cd41c21a4a009 568264 wayland_1.11.0.orig.tar.gz
ac310b8eca9a700ec064b0339b783332120e1110 7943 wayland_1.11.0-1.diff.gz
2ba887956f8883fe8870b8ad0b59df9234a05d4c 37662 libwayland-bin-dbgsym_1.11.0-1_i386.deb
d1ba5b3c94142d7dd6171583242abbe0770bfb1d 20830 libwayland-bin_1.11.0-1_i386.deb
0d3f8cac3608ed4460f8221d686cd806cfd22d52 37594 libwayland-client0-dbgsym_1.11.0-1_i386.deb
f7ca04f803905b5c60f083dbc27d47645fc7e932 24976 libwayland-client0_1.11.0-1_i386.deb
c029438d6f0cb938083b9db48b61b3f2246f7c0f 19268 libwayland-cursor0-dbgsym_1.11.0-1_i386.deb
2a804bcb6389e6a396e3d3ff235063fe1a31fa5c 13812 libwayland-cursor0_1.11.0-1_i386.deb
5e0f903f8efa0f19ae87d7b5a42226740b63939f 95186 libwayland-dev_1.11.0-1_i386.deb
7d8e019f30d0d4e9c99cc63aba849c645f5b534e 156040 libwayland-doc_1.11.0-1_all.deb
5edb9023904252a8468987a6afd469082d699e04 48964 libwayland-server0-dbgsym_1.11.0-1_i386.deb
fc4f024199e046d2ba0dbe1a01f242f38a83ce9e 30420 libwayland-server0_1.11.0-1_i386.deb
Checksums-Sha256:
1e63a9573032573164384a76c7f167619e031a7f90510d5332fc0077fe1ea615 2366 wayland_1.11.0-1.dsc
eb728b97c8b912115dfd8e8e64bb984a28c915238460bbd4b67e2c728b5efd24 568264 wayland_1.11.0.orig.tar.gz
b6d85bbec766052165f1c259c46450c958279fd896e2fc6ca760c277687b3618 7943 wayland_1.11.0-1.diff.gz
b7dfdac63336e45d5744b14a944dc1bb1ae44e7db3a4e58f21957e28a49cb03e 37662 libwayland-bin-dbgsym_1.11.0-1_i386.deb
c1c0961cff067c8263ba03c3191cc11402a9a86fcf80e8ec6860fc76b01ad9da 20830 libwayland-bin_1.11.0-1_i386.deb
1f6938cdacc341a94bff93872fd88f11a4159bf211da988f4e325d24af309a37 37594 libwayland-client0-dbgsym_1.11.0-1_i386.deb
f82588117b09b222f9c772adc6ae82655a792fc400cdbe6afb9fffea2a1d6bbd 24976 libwayland-client0_1.11.0-1_i386.deb
b786396a1bca367bbdd76b4d5d20f60b2bae1359da1983c426286bef2475f4b8 19268 libwayland-cursor0-dbgsym_1.11.0-1_i386.deb
ff44c0144dd2cace4887b7c4faace782b6b7d8f82fc5be8e085d652fe35c6baf 13812 libwayland-cursor0_1.11.0-1_i386.deb
24b207fd1e14240e875746cc37af43d603b2d3aa0b5eaf393f6bf18516f2d0c2 95186 libwayland-dev_1.11.0-1_i386.deb
e436214a7ef6669a21e02b2944862dd5607d6d0c75dceec4190bd03b4737920f 156040 libwayland-doc_1.11.0-1_all.deb
5355ac1bc90a17281f26352f1a39e6a240617084b512c8105f72bde9b927b397 48964 libwayland-server0-dbgsym_1.11.0-1_i386.deb
53d1cf5e8bf97444b96d228272063e79f9fa4438657e52da0a8fbc816e5154d5 30420 libwayland-server0_1.11.0-1_i386.deb
Files:
ba1784e4196690658afe5c5337368d7e 2366 x11 optional wayland_1.11.0-1.dsc
8b80bb7338f8aea7c1d6a67541d97901 568264 x11 optional wayland_1.11.0.orig.tar.gz
07b8292a73a51c822ccd76f739adf3e8 7943 x11 optional wayland_1.11.0-1.diff.gz
9aaea29a16383e75049b3e1dee793562 37662 debug extra libwayland-bin-dbgsym_1.11.0-1_i386.deb
d33390cc3e47499369ff5fdc97503c54 20830 libdevel extra libwayland-bin_1.11.0-1_i386.deb
70f03ffb8cfc1392e5b71e0f0df0af54 37594 debug extra libwayland-client0-dbgsym_1.11.0-1_i386.deb
f71af4df292ecfafe7fdacb0b605017b 24976 libs optional libwayland-client0_1.11.0-1_i386.deb
f0cf2c45306ae9148bbedbbb9ed1d5bc 19268 debug extra libwayland-cursor0-dbgsym_1.11.0-1_i386.deb
d16d5803908eb0c73b2e09f21b445718 13812 libs optional libwayland-cursor0_1.11.0-1_i386.deb
3f9dc63e2c4f9bbd3dfa512094eb6426 95186 libdevel extra libwayland-dev_1.11.0-1_i386.deb
6cc032e96f7ff6395a8e43884b123d6f 156040 doc extra libwayland-doc_1.11.0-1_all.deb
4a11c0b4d03c3485274bfcde5c540713 48964 debug extra libwayland-server0-dbgsym_1.11.0-1_i386.deb
7394b7af9ee8a23ca832b35990e04978 30420 libs optional libwayland-server0_1.11.0-1_i386.deb
-----BEGIN PGP SIGNATURE-----
iQIcBAEBCgAGBQJXUBxMAAoJEK8ig6p24qx7ndkQALrUqd4/zE2RjxySV9VGAWk+
a+hJOMW8HuGc60kQ606Dexqv0AnRqBmamDQY9fionW9g22UbsvbHEj98cTwS8Xfk
W3W8pq1W5VumcfsdKB0AQ8+ci8mxuZZOa85nsDWfOLrgfkdjEsJon9tGsyDR79Ad
X9mKBdzqeowZBwN3AhS+KFgzGNJDLueOeYgLdXbpLU8VVNZnHIGy8dxe/6utwWUS
NqLBhxqP3aEKz7HUi0Azb+IQ+/O49Aii3tkxLPfOVVWn4IlRINKqkEdQMj/Mhzrh
tcB/W+7iytW+EDhQCS+1slLUtV2OVPYV93jJmMRn3rqS/TRkrmpTF5iWZ7+tnqeY
uL7s/Oz1rckv8FU5KfP0KDnn5SfdfOGY/CKr/2APHkXe/Dyd5Z25/raIVAdU0l+R
zMlOWSfZwZ+POMmF8rOTQqwTi5LIm8UwxG7OlVXyKVw3RWQ/5S7X2arkko1g7GOm
Qogg+Ti3sw174eN+55wTJ9HCq2kp4rPKuCoQsYLw0dnDLMxokN99De3b6yIQX6Jp
UQ70+Smu+6bqCecKd5eHrriNtv4bG/IaahS+Yccl9dYHFgGXWqp1rHlaR7//O9x6
FEYtl8MpyTm7GbiBe5brIzakywBgC6zTpBIDCEcHZu0e0nus3+EjYxFluAXZ7dAN
YL5zpe6Gts1I9fXeKwzV
=1r4C
-----END PGP SIGNATURE-----
--- End Message ---