debian/changelog | 10 ++++++ debian/control | 63 ++++-------------------------------------- debian/libwayland-dev.install | 3 -- debian/libwayland-doc.install | 3 ++ debian/rules | 12 ++++++-- 5 files changed, 28 insertions(+), 63 deletions(-)
New commits: commit b68680e20fdbb27eb42845e4abe71066daf396e8 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Apr 20 21:39:13 2016 +0200 Release to unstable diff --git a/debian/changelog b/debian/changelog index 6e94e14..bcbb87c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wayland (1.10.0-2) UNRELEASED; urgency=medium +wayland (1.10.0-2) unstable; urgency=medium * Don't build the documentation on binary-arch only builds. Move the build-dependencies needed for the documentation to build-depends-indep. @@ -6,7 +6,7 @@ wayland (1.10.0-2) UNRELEASED; urgency=medium * Move the manpages to libwayland-doc. * Switch to dbgsym packages. - -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 20 Apr 2016 19:58:36 +0200 + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 20 Apr 2016 21:38:58 +0200 wayland (1.10.0-1) unstable; urgency=medium commit 226ffd3974de14cc2dd5b13caba48107ebb8c8de Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Apr 20 21:27:49 2016 +0200 Switch to dbgsym packages diff --git a/debian/changelog b/debian/changelog index cf99c33..6e94e14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ wayland (1.10.0-2) UNRELEASED; urgency=medium build-dependencies needed for the documentation to build-depends-indep. Closes: #821170. * Move the manpages to libwayland-doc. + * Switch to dbgsym packages. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 20 Apr 2016 19:58:36 +0200 diff --git a/debian/control b/debian/control index 08fbc66..c610c86 100644 --- a/debian/control +++ b/debian/control @@ -44,24 +44,6 @@ Description: wayland compositor infrastructure - client library This package ships the library that implements the client side of the Wayland protocol. -Package: libwayland-client0-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - libwayland-client0 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, -Description: wayland compositor infrastructure - client library (debug) - 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 provides debugging symbols for the libwayland-client0 package. - Package: libwayland-server0 Section: libs Architecture: any @@ -84,24 +66,6 @@ Description: wayland compositor infrastructure - server library This package ships the library that implements the server side of the Wayland protocol. -Package: libwayland-server0-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - libwayland-server0 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, -Description: wayland compositor infrastructure - server library (debug) - 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 provides debugging symbols for the libwayland-server0 package. - Package: libwayland-cursor0 Section: libs Architecture: any @@ -122,24 +86,6 @@ Description: wayland compositor infrastructure - cursor library . This package ships a helper library to manage cursors. -Package: libwayland-cursor0-dbg -Section: debug -Priority: extra -Architecture: any -Depends: - libwayland-cursor0 (= ${binary:Version}), - ${shlibs:Depends}, - ${misc:Depends}, -Description: wayland compositor infrastructure - cursor library (debug) - 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 provides debugging symbols for the libwayland-cursor0 package. - Package: libwayland-dev Section: libdevel Architecture: any diff --git a/debian/rules b/debian/rules index bb0539c..8ad1821 100755 --- a/debian/rules +++ b/debian/rules @@ -23,9 +23,9 @@ override_dh_makeshlibs: # Debug package: override_dh_strip: - dh_strip -plibwayland-client0 --dbg-package=libwayland-client0-dbg - dh_strip -plibwayland-cursor0 --dbg-package=libwayland-cursor0-dbg - dh_strip -plibwayland-server0 --dbg-package=libwayland-server0-dbg + dh_strip -plibwayland-client0 --dbgsym-migration='libwayland-client0 (<< 1.10.0-2)' + dh_strip -plibwayland-cursor0 --dbgsym-migration='libwayland-cursor0 (<< 1.10.0-2)' + dh_strip -plibwayland-server0 --dbgsym-migration='libwayland-server0 (<< 1.10.0-2)' dh_strip -a --remaining-packages override_dh_auto_test: commit 9ae261d13e30f93839d8c9cbfc8a1c796dfb2406 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Apr 20 21:12:17 2016 +0200 Move the manpages to libwayland-doc diff --git a/debian/changelog b/debian/changelog index 9cd627e..cf99c33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ wayland (1.10.0-2) UNRELEASED; urgency=medium * Don't build the documentation on binary-arch only builds. Move the build-dependencies needed for the documentation to build-depends-indep. Closes: #821170. + * Move the manpages to libwayland-doc. -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 20 Apr 2016 19:58:36 +0200 diff --git a/debian/control b/debian/control index 499ed25..08fbc66 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,6 @@ Build-Depends: quilt, dh-autoreconf, pkg-config, - xsltproc, - docbook-xsl, libexpat1-dev, libffi-dev, libxml2-dev, @@ -18,6 +16,8 @@ Build-Depends-Indep: doxygen, graphviz, xmlto, + xsltproc, + docbook-xsl, Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/wayland Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/wayland/wayland.git @@ -167,6 +167,8 @@ Architecture: all Priority: extra Depends: ${misc:Depends}, +Conflicts: libwayland-dev (<< 1.10.0-2) +Replaces: libwayland-dev (<< 1.10.0-2) Description: wayland compositor infrastructure - documentation 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 diff --git a/debian/libwayland-dev.install b/debian/libwayland-dev.install index 00e685c..955af85 100644 --- a/debian/libwayland-dev.install +++ b/debian/libwayland-dev.install @@ -4,9 +4,6 @@ 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 diff --git a/debian/libwayland-doc.install b/debian/libwayland-doc.install index d9e230c..1d4f5dd 100644 --- a/debian/libwayland-doc.install +++ b/debian/libwayland-doc.install @@ -1 +1,4 @@ usr/share/doc/wayland/Wayland/en-US/html/ + +# Man pages +usr/share/man/man3 commit d52de9a1e90530cd9cc3a8dda2a6bcceb801b283 Author: Emilio Pozuelo Monfort <po...@debian.org> Date: Wed Apr 20 20:00:04 2016 +0200 Don't build the documentation on binary-arch only builds diff --git a/debian/changelog b/debian/changelog index ee1389f..9cd627e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +wayland (1.10.0-2) UNRELEASED; urgency=medium + + * Don't build the documentation on binary-arch only builds. Move the + build-dependencies needed for the documentation to build-depends-indep. + Closes: #821170. + + -- Emilio Pozuelo Monfort <po...@debian.org> Wed, 20 Apr 2016 19:58:36 +0200 + wayland (1.10.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 75a51bb..499ed25 100644 --- a/debian/control +++ b/debian/control @@ -9,14 +9,15 @@ Build-Depends: quilt, dh-autoreconf, pkg-config, - doxygen, - graphviz, - xmlto, xsltproc, docbook-xsl, libexpat1-dev, libffi-dev, libxml2-dev, +Build-Depends-Indep: + doxygen, + graphviz, + xmlto, Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-xorg/wayland/wayland Vcs-Browser: http://anonscm.debian.org/cgit/pkg-xorg/wayland/wayland.git diff --git a/debian/rules b/debian/rules index fb50932..bb0539c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,12 @@ SOURCE=wayland +BUILD_DOC= + +# Don't build the documentation when not building arch:all packages +override_dh_auto_configure-arch: + dh_auto_configure -- --disable-documentation + # Kill *.la files, and forget no-one: override_dh_install: find debian/tmp -name '*.la' -delete