xorg: Changes to 'debian-unstable'
debian/changelog |8 debian/x11-common.postinst |3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 2c7fd3d94825f4fd9a770a824a712dfcda109835 Author: Julien Cristau Date: Wed Nov 23 08:42:42 2016 +0100 Call db_purge without arguments in postinst Fixes error uncovered by adding "set -e" in 1:7.7+17 (closes: #845398). Thanks, Samuel Thibault and Tianon Gravi! The bug was introduced by me in 1:7.7+10 but was hidden until now because errors were being ignored. Yay me. diff --git a/debian/changelog b/debian/changelog index 8c53b1e..c794f9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xorg (1:7.7+18) UNRELEASED; urgency=medium + + * Call db_purge without arguments in postinst to fix error uncovered by +adding "set -e" in 1:7.7+17 (closes: #845398). Thanks, Samuel Thibault +and Tianon Gravi! + + -- Julien Cristau Wed, 23 Nov 2016 08:34:41 +0100 + xorg (1:7.7+17) unstable; urgency=medium [ Andreas Boll ] diff --git a/debian/x11-common.postinst b/debian/x11-common.postinst index 2230165..e84e126 100644 --- a/debian/x11-common.postinst +++ b/debian/x11-common.postinst @@ -4,8 +4,7 @@ set -e if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule - db_purge x11-common/xwrapper/allowed_users - db_purge x11-common/xwrapper/actual_allowed_users + db_purge fi #DEBHELPER#
xorg: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0dc2ca8b5d161437e49af9eb9adc5eecb7a9d950 Author: Julien Cristau Date: Wed Nov 23 08:50:59 2016 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index c794f9b..fd0a6a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -xorg (1:7.7+18) UNRELEASED; urgency=medium +xorg (1:7.7+18) unstable; urgency=medium * Call db_purge without arguments in postinst to fix error uncovered by adding "set -e" in 1:7.7+17 (closes: #845398). Thanks, Samuel Thibault and Tianon Gravi! - -- Julien Cristau Wed, 23 Nov 2016 08:34:41 +0100 + -- Julien Cristau Wed, 23 Nov 2016 08:50:50 +0100 xorg (1:7.7+17) unstable; urgency=medium
xorg: Changes to 'refs/tags/xorg-1_7.7+18'
Tag 'xorg-1_7.7+18' created by Julien Cristau at 2016-11-23 07:54 + Tagging upload of xorg 1:7.7+18 to unstable. -BEGIN PGP SIGNATURE- iQJIBAABCAAyFiEEVXgdqzTmGgnvuIvhnbAjVVb4z60FAlg1SyIUHGpjcmlzdGF1 QGRlYmlhbi5vcmcACgkQnbAjVVb4z60IQg//UxXWZNVUjoeYPD9HCZolUgP7Fhbg bIuuwkOXI2J8+H1tKi2WR6tKPU4p4TyRSW6YwbQpg3t3TDMVmwjeT5wOtLNLQP1M 9IGG8OqnUBSrN+pTQtJug8BKE5mXEcW52HqnCiorrpWL1ul2svg+HFEhFdpGLwkt VtRFyQQApa3KdGPiFEg5FJqkNp95F2XSnokH43L2ZrT0G23FdR6xl81iXsQ7DtMe lYk5rC2EtJA04+6JkX0x7QZaEr3SNV8eIZCsHk7NhJFZPcYufkPrmNi6QX8qGXhF 5LSN7Fuc1/PL0Mjogwdr215IGB6MD8HgnyC+PAT9AM31UcgB4kNfVISJYp1qDJ1p 9Hl1j3ZZ9m6KMbrU3g18kQpiJneAndlnG1zeiA37j0Fbd8iyA0tvcgb7aa6HCDGd XiGsnIJDnTptme3H7/BDradnlcyY4+NppjfMcej21Ikfe/fYZcWO+3At8Pwzax5u 7aH1op76wDNVl+NeAH8li8Wm5Kvf2Cgf1n/LoNwRgkveshxvnoN4eWf8D4pjiGwG 7B8Rc7Yer1+LvNA+LYALHg5yBPJ9hVs3clALYs+NiXqXiv1rynGWm6Vg9R02J8XB 0BKeyXE/5Dv0qUGVIYPzlkan6Q8vLUOV4VJrUd23692eNAPK7rzQk0LdosaclKuT xfYkc0z6ZCwXtMY= =22eY -END PGP SIGNATURE- Changes since xorg-1_7.7+17: Julien Cristau (2): Call db_purge without arguments in postinst Upload to unstable --- debian/changelog |8 debian/x11-common.postinst |3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) ---
Processing of xorg_7.7+18_source.changes
xorg_7.7+18_source.changes uploaded successfully to localhost along with the files: xorg_7.7+18.dsc xorg_7.7+18.tar.gz Greetings, Your Debian queue daemon (running on host usper.debian.org)
Bug#845398: marked as done (x11-common: Can't configure)
Your message dated Wed, 23 Nov 2016 09:04:35 + with message-id and subject line Bug#845398: fixed in xorg 1:7.7+18 has caused the Debian Bug report #845398, regarding x11-common: Can't configure to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 845398: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=845398 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: x11-common Version: 1:7.7+17 Severity: grave Justification: renders package unusable Hello, x11-common can't be installed any more now that x11-common.postinst has set -e: Setting up x11-common (1:7.7+17) ... dpkg: error processing package x11-common (--configure): subprocess installed post-installation script returned error exit status 20 Errors were encountered while processing: x11-common E: Sub-process /usr/bin/dpkg returned an error code (1) This is because postinst calls db_purge x11-common/xwrapper/allowed_users db_purge x11-common/xwrapper/actual_allowed_users According to debconf-devel(7), the PURGE command doesn't take any parameter, it is not meant to remove just one entry. I guess what was meant was rather db_unregister x11-common/xwrapper/allowed_users db_unregister x11-common/xwrapper/actual_allowed_users to remove those old entries. Samuel -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'buildd-unstable'), (500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages x11-common depends on: ii lsb-base 9.20161101 x11-common recommends no packages. x11-common suggests no packages. -- debconf information: x11-common/xwrapper/actual_allowed_users: anybody * x11-common/xwrapper/allowed_users: Anybody -- Samuel je viens d'inventer mutt version magritte :D ? dans mutt tape "cceci" return --- End Message --- --- Begin Message --- Source: xorg Source-Version: 1:7.7+18 We believe that the bug you reported is fixed in the latest version of xorg, 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 845...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Julien Cristau (supplier of updated xorg 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 ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Wed, 23 Nov 2016 08:50:50 +0100 Source: xorg Binary: x11-common xserver-xorg xserver-xorg-video-all xserver-xorg-input-all xorg xorg-dev xbase-clients xutils Architecture: source Version: 1:7.7+18 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Julien Cristau Description: x11-common - X Window System (X.Org) infrastructure xbase-clients - miscellaneous X clients - metapackage xorg - X.Org X Window System xorg-dev - X.Org X Window System development libraries xserver-xorg - X.Org X server xserver-xorg-input-all - X.Org X server -- input driver metapackage xserver-xorg-video-all - X.Org X server -- output driver metapackage xutils - X Window System utility programs metapackage Closes: 845398 Changes: xorg (1:7.7+18) unstable; urgency=medium . * Call db_purge without arguments in postinst to fix error uncovered by adding "set -e" in 1:7.7+17 (closes: #845398). Thanks, Samuel Thibault and Tianon Gravi! Checksums-Sha1: 1380713b8423ff6f2b181d5a65aa12760e0b0007 2016 xorg_7.7+18.dsc 2b99c8175a2231e6ee36b9bf9ba353672b30fbc1 288649 xorg_7.7+18.tar.gz Checksums-Sha256: c4153fe30e39514f42850fe755f6c3061d033cc39de1b0699fb323efb031965b 2016 xorg_7.7+18.dsc 5ad85af315eab218a146484a15297f3ded2aecb8e8504a110bb494ed09d24de2 288649 xorg_7.7+18.tar.gz Files: c2bf41a365f695adbf84c4b3e8b3576b 2016 x11 optional xorg_7.7+18.dsc 7d5c72af26db853a718bc46de3402d7c 288649 x11 optional xorg_7.7+18.tar.gz -BEGIN PGP SIGNATURE- iQJIBAEBCAAyFiEEVXgdqzTmGgnvuIvhnbAjVVb4
Bug#845405: marked as done (x11-common: configure fails at "db_purge" with exit status 20 "Incorrect number of arguments")
Your message dated Wed, 23 Nov 2016 09:04:35 + with message-id and subject line Bug#845398: fixed in xorg 1:7.7+18 has caused the Debian Bug report #845398, regarding x11-common: configure fails at "db_purge" with exit status 20 "Incorrect number of arguments" to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 845398: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=845398 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: x11-common Version: 1:7.7+17 After today's upload, the configure step of "x11-common" fails (presumably thanks to the addition of "set -x"): > $ sudo DEBCONF_DEBUG=developer dpkg --configure x11-common > Setting up x11-common (1:7.7+17) ... > debconf (developer): frontend started > debconf (developer): frontend running, package name is x11-common > debconf (developer): starting /var/lib/dpkg/info/x11-common.postinst > configure 1:7.7+16 > debconf (developer): <-- PURGE x11-common/xwrapper/allowed_users > debconf (developer): --> 20 Incorrect number of arguments > dpkg: error processing package x11-common (--configure): > subprocess installed post-installation script returned error exit status 20 > Errors were encountered while processing: > x11-common It would appear that "db_purge" is only intended for use during package removal, and that perhaps "db_unregister" was intended instead? >From the debconf-devel manpage: >UNREGISTER question > This removes a question from the database. > >PURGE Call this in your postrm when your package is purged. It removes > all of your package's questions from debconf's database. ♥, - Tianon 4096R / B42F 6819 007F 00F8 8E36 4FD4 036A 9C25 BF35 7DD4 --- End Message --- --- Begin Message --- Source: xorg Source-Version: 1:7.7+18 We believe that the bug you reported is fixed in the latest version of xorg, 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 845...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Julien Cristau (supplier of updated xorg 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 ftpmas...@ftp-master.debian.org) -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Wed, 23 Nov 2016 08:50:50 +0100 Source: xorg Binary: x11-common xserver-xorg xserver-xorg-video-all xserver-xorg-input-all xorg xorg-dev xbase-clients xutils Architecture: source Version: 1:7.7+18 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Julien Cristau Description: x11-common - X Window System (X.Org) infrastructure xbase-clients - miscellaneous X clients - metapackage xorg - X.Org X Window System xorg-dev - X.Org X Window System development libraries xserver-xorg - X.Org X server xserver-xorg-input-all - X.Org X server -- input driver metapackage xserver-xorg-video-all - X.Org X server -- output driver metapackage xutils - X Window System utility programs metapackage Closes: 845398 Changes: xorg (1:7.7+18) unstable; urgency=medium . * Call db_purge without arguments in postinst to fix error uncovered by adding "set -e" in 1:7.7+17 (closes: #845398). Thanks, Samuel Thibault and Tianon Gravi! Checksums-Sha1: 1380713b8423ff6f2b181d5a65aa12760e0b0007 2016 xorg_7.7+18.dsc 2b99c8175a2231e6ee36b9bf9ba353672b30fbc1 288649 xorg_7.7+18.tar.gz Checksums-Sha256: c4153fe30e39514f42850fe755f6c3061d033cc39de1b0699fb323efb031965b 2016 xorg_7.7+18.dsc 5ad85af315eab218a146484a15297f3ded2aecb8e8504a110bb494ed09d24de2 288649 xorg_7.7+18.tar.gz Files: c2bf41a365f695adbf84c4b3e8b3576b 2016 x11 optional xorg_7.7+18.dsc 7d5c72af26db853a718bc46de3402d7c 288649 x11 optional xorg_7.7+18.tar.gz -BEGIN PGP SIGNATURE- iQJIBAEBCAAyFiEEVXgdqzTmGgnvuIvhnbAjVVb4z60FAlg1SvsUHGpjcmlzdGF1 QGRlYmlhbi5vcmcACgkQnbAjVVb4z63QVQ//fCrvKvW6i8ib+Q1x5U0v4HuVDE7t M1M2tC9F1UvmPOlqUHW6jn1hZ69QHUWCvbFQP7XQBUOp/Nr6872YEU2C7Gq6kTDy kpkAW38zijpzX39BsSUCnrWXIzXreGiG1tKEvQ4LP2toxRBHIBRxwDS+2MS0VH3v TUoWql/LLtBX8FP9cd2AJewPDL0vxuUJOZ3zFw7iimeHa6tyxfdyyg10KDL/KzbK E2mlFblew4PmiK0g/ytE7wcWtM/4Ulr7EYn4pf8DOWz3W4YICQ55s7Up9dj6hcAA CYgWjIlEOV7wNH3Kw7HVO2ZZ49F+hMewfjLmmYfuOXKP420KWUsm7QlSI0hZYLoF 2j06unl5/XNWgbkX8AENrsWGUtkdeLPbqH68K2TmRzeCxPUTENk6CHb
xorg_7.7+18_source.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Wed, 23 Nov 2016 08:50:50 +0100 Source: xorg Binary: x11-common xserver-xorg xserver-xorg-video-all xserver-xorg-input-all xorg xorg-dev xbase-clients xutils Architecture: source Version: 1:7.7+18 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Julien Cristau Description: x11-common - X Window System (X.Org) infrastructure xbase-clients - miscellaneous X clients - metapackage xorg - X.Org X Window System xorg-dev - X.Org X Window System development libraries xserver-xorg - X.Org X server xserver-xorg-input-all - X.Org X server -- input driver metapackage xserver-xorg-video-all - X.Org X server -- output driver metapackage xutils - X Window System utility programs metapackage Closes: 845398 Changes: xorg (1:7.7+18) unstable; urgency=medium . * Call db_purge without arguments in postinst to fix error uncovered by adding "set -e" in 1:7.7+17 (closes: #845398). Thanks, Samuel Thibault and Tianon Gravi! Checksums-Sha1: 1380713b8423ff6f2b181d5a65aa12760e0b0007 2016 xorg_7.7+18.dsc 2b99c8175a2231e6ee36b9bf9ba353672b30fbc1 288649 xorg_7.7+18.tar.gz Checksums-Sha256: c4153fe30e39514f42850fe755f6c3061d033cc39de1b0699fb323efb031965b 2016 xorg_7.7+18.dsc 5ad85af315eab218a146484a15297f3ded2aecb8e8504a110bb494ed09d24de2 288649 xorg_7.7+18.tar.gz Files: c2bf41a365f695adbf84c4b3e8b3576b 2016 x11 optional xorg_7.7+18.dsc 7d5c72af26db853a718bc46de3402d7c 288649 x11 optional xorg_7.7+18.tar.gz -BEGIN PGP SIGNATURE- iQJIBAEBCAAyFiEEVXgdqzTmGgnvuIvhnbAjVVb4z60FAlg1SvsUHGpjcmlzdGF1 QGRlYmlhbi5vcmcACgkQnbAjVVb4z63QVQ//fCrvKvW6i8ib+Q1x5U0v4HuVDE7t M1M2tC9F1UvmPOlqUHW6jn1hZ69QHUWCvbFQP7XQBUOp/Nr6872YEU2C7Gq6kTDy kpkAW38zijpzX39BsSUCnrWXIzXreGiG1tKEvQ4LP2toxRBHIBRxwDS+2MS0VH3v TUoWql/LLtBX8FP9cd2AJewPDL0vxuUJOZ3zFw7iimeHa6tyxfdyyg10KDL/KzbK E2mlFblew4PmiK0g/ytE7wcWtM/4Ulr7EYn4pf8DOWz3W4YICQ55s7Up9dj6hcAA CYgWjIlEOV7wNH3Kw7HVO2ZZ49F+hMewfjLmmYfuOXKP420KWUsm7QlSI0hZYLoF 2j06unl5/XNWgbkX8AENrsWGUtkdeLPbqH68K2TmRzeCxPUTENk6CHbwNO3+VdMZ EUlN/9SyWr0FgXcjW4hg8jEgsPZy7pW7oOzRqE7WCE4zQhNnhGT1rStoQbSDaYW6 hpDnGbJEWdY4uz9Sz6rgy828+LPbyiqZmO1JTYdExyv9i6+WqM3vwJUPeW7JhqPX pZE6o8sWVirKJWbcGA8Vkq7VEZ28DQgOXO6yH5lNBJD2C+AAXEvW/pTezB01FE5T O8oTAtdesw5gXTWRrpHsCLmM2LvXCCLkCAAoh5hB5nH7DggeJgdKad4pJYF+K8en KKKhHzMtWqxJXy0= =nTMz -END PGP SIGNATURE- Thank you for your contribution to Debian.
Processed: your mail
Processing commands for cont...@bugs.debian.org: > reassign 839381 linux Bug #839381 [xserver-xorg-video-amdgpu] xserver-xorg-video-amdgpu: very long Xorg initilization time in recent kernels Bug reassigned from package 'xserver-xorg-video-amdgpu' to 'linux'. No longer marked as found in versions xserver-xorg-video-amdgpu/1.1.2-1. Ignoring request to alter fixed versions of bug #839381 to the same values previously set > End of message, stopping processing here. Please contact me if you need assistance. -- 839381: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839381 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
mesa: Changes to 'ubuntu'
debian/changelog | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 467c777827583709277b027171df1d91a08dc27a
Author: Timo Aaltonen
Date: Wed Nov 23 17:30:12 2016 +0200
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 471e67d..cd9f261 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (13.0.1-1ubuntu1) UNRELEASED; urgency=medium
+mesa (13.0.1-1ubuntu1) zesty; urgency=medium
* Merge from Debian experimental.
* dri3-fix-totem-with-libva.diff: Dropped, upstream.
* egl-platform-mir.patch: Refreshed.
- -- Timo Aaltonen Mon, 07 Nov 2016 10:57:41 +0200
+ -- Timo Aaltonen Wed, 23 Nov 2016 16:36:34 +0200
mesa (13.0.1-1) experimental; urgency=medium
commit b0430341c3629409820600b298f526baa3ec2b9f
Author: Timo Aaltonen
Date: Wed Nov 23 14:16:03 2016 +0200
release to zesty
diff --git a/debian/changelog b/debian/changelog
index 62d62bc..2c2b991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (12.0.4-2ubuntu1) UNRELEASED; urgency=medium
+mesa (12.0.4-2ubuntu1) zesty; urgency=medium
* Merge from Debian
- New upstream bugfix release. (LP: #1641017)
* dri3-fix-totem-with-libva.diff: Dropped, upstream.
- -- Timo Aaltonen Wed, 23 Nov 2016 11:40:25 +0200
+ -- Timo Aaltonen Wed, 23 Nov 2016 14:04:45 +0200
mesa (12.0.4-2) unstable; urgency=medium
commit 3a7a81f87420cceab148f1751974f59b8bbad3dc
Author: Timo Aaltonen
Date: Wed Nov 23 13:58:43 2016 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index 4ab4474..62d62bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (12.0.4-2ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian
+- New upstream bugfix release. (LP: #1641017)
+ * dri3-fix-totem-with-libva.diff: Dropped, upstream.
+
+ -- Timo Aaltonen Wed, 23 Nov 2016 11:40:25 +0200
+
mesa (12.0.4-2) unstable; urgency=medium
* Limit new glx symbols to !hurd-any. Should fix FTBFS on hurd.
diff --git a/debian/patches/dri3-fix-totem-with-libva.diff
b/debian/patches/dri3-fix-totem-with-libva.diff
deleted file mode 100644
index 1da3c26..000
--- a/debian/patches/dri3-fix-totem-with-libva.diff
+++ /dev/null
@@ -1,128 +0,0 @@
-From 5113845fae9b95dba0da59229a2e9947cef4196f Mon Sep 17 00:00:00 2001
-From: Martin Peres
-Date: Tue, 4 Oct 2016 13:08:43 +0300
-Subject: [PATCH] [WIP] dri3: import prime buffers in the currently-bound
- screen
-
-This tries to mirrors the codepath taken by DRI2 in IntelSetTexBuffer2()
-and fixes many applications when using DRI3:
- - Totem with libva on hw-accelerated decoding
- - obs-studio, using Window Capture (Xcomposite) as a Source
- - gstreamer with VAAPI
-
-v2:
- - introduce get_dri_screen() in the dri3 loader's vtable (krh)
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71759
- src/egl/drivers/dri2/platform_x11_dri3.c | 12
- src/glx/dri3_glx.c | 11 +++
- src/loader/loader_dri3_helper.c | 12 +++-
- src/loader/loader_dri3_helper.h | 1 +
- src/mesa/drivers/dri/i965/intel_screen.c | 1 +
- 5 files changed, 36 insertions(+), 1 deletion(-)
-
a/src/egl/drivers/dri2/platform_x11_dri3.c
-+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
-@@ -103,6 +103,17 @@ egl_dri3_get_dri_context(struct loader_d
-return dri2_ctx->dri_context;
- }
-
-+static __DRIscreen *
-+egl_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+ _EGLContext *ctx = _eglGetCurrentContext();
-+ struct dri2_egl_context *dri2_ctx;
-+ if (!ctx)
-+ return NULL;
-+ dri2_ctx = dri2_egl_context(ctx);
-+ return dri2_egl_display(dri2_ctx->base.Resource.Display)->dri_screen;
-+}
-+
- static void
- egl_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -119,6 +130,7 @@ static struct loader_dri3_vtable egl_dri
-.set_drawable_size = egl_dri3_set_drawable_size,
-.in_current_context = egl_dri3_in_current_context,
-.get_dri_context = egl_dri3_get_dri_context,
-+ .get_dri_screen = egl_dri3_get_dri_screen,
-.flush_drawable = egl_dri3_flush_drawable,
-.show_fps = NULL,
- };
a/src/glx/dri3_glx.c
-+++ b/src/glx/dri3_glx.c
-@@ -132,6 +132,16 @@ glx_dri3_get_dri_context(struct loader_d
-return (gc != &dummyContext) ? dri3Ctx->driContext : NULL;
- }
-
-+static __DRIscreen *
-+glx_dri3_get_dri_screen(struct loader_dri3_drawable *draw)
-+{
-+ struct glx_context *gc = __glXGetCurrentContext();
-+ struct dri3_context *pcp = (struct dri3_context *)
__glXGetCurrentContext();
-+ struct dri3_screen *psc = (struct dri3_screen *) pcp->base.psc;
-+
-+ return (gc != &dummyContext && psc) ? psc->driScreen : NULL;
-+}
-+
- static void
- glx_dri3_flush_drawable(struct loader_dri3_drawable *draw, unsigned flags)
- {
-@@ -169,6 +179,7 @@ static struct loader_dri3_vtable glx_dri
-.set_drawable_size = glx_dri3_set_drawable_size,
-.in_cur
xorg-server: Changes to 'refs/tags/xorg-server-2_1.19.0-2'
Tag 'xorg-server-2_1.19.0-2' created by Emilio Pozuelo Monfort at 2016-11-23 18:46 + Tagging upload of xorg-server 2:1.19.0-2 to unstable. -BEGIN PGP SIGNATURE- iQIcBAABCAAGBQJYNeP4AAoJEJ1GxIjkNoMCKdQQAMv7vI1/DMU/6j+FYaKXI701 Fwyy/IQFdvIdeCvS4ASZWZbaQZerAYpuvdMJZIJrk0Y7LEVQjIi83r1klpjesNxP b5z78vllCuN94WUYctHuJ10efcUrRiawXry+sU5AErSkERQaSgahs0yR5HDvljE6 divInNQW/viOURn1KOtv2ZfTWk7NA5kbZjEW+dGyI3RfUF+oYShx7AfRySrEmrzj fNkBrb7z7EEFRy7axo763UW7JCRMUjqvXSM8OyLRazKhE/y4K0RBhgsetLSof/eI x+ZcXeEfoRgKxm8fC74o61BarLhA0qKrVHnXqJcuT7++goVvv81a7CFne+quUY1U FN5tTo0pre6GI+bCI7rsGXr10A1Im/gFdcaP+HbxcdZZ/x9dE2Y3y80XfrJfH9i/ 3Y6/Mwi/ldYUIr7qjzpxcU5fXzgmZ04llaH5stZ8Z9RCjy/GPzMGEB67CK8iLPwo 9TSx9s9jdW+F0XKG2QlcHXtrVKagrdlz7et92A70w/g4i/Ebb+2SROgHrnCeTsW+ NeOXAkTs+gtJuP+ruB7zBoiazQuxpDsLHpI4b5pdFdsSIJ1LgCTJhC5Vf/EiACJ5 Oto070lgTgABoDK/HRibpZx7onnBT8C6QOvNmSGQssr65+6tNzGBC6yu7wUDME/v 6dVbh/enxJRgUsTaKb04 =N6Tr -END PGP SIGNATURE- Changes since xorg-server-2_1.19.0-1: Emilio Pozuelo Monfort (5): Disable glamor on the udeb build Refresh debian/patches/02_kbsd-input-devd.diff Port kfreebsd patch to NotifyFd Bump Standards-Version to 3.9.8 Upload to unstable --- debian/changelog | 10 debian/control |2 debian/patches/02_kbsd-input-devd.diff | 72 ++--- debian/rules |1 4 files changed, 44 insertions(+), 41 deletions(-) ---
xorg-server: Changes to 'debian-unstable'
debian/changelog | 10
debian/control |2
debian/patches/02_kbsd-input-devd.diff | 72 ++---
debian/rules |1
4 files changed, 44 insertions(+), 41 deletions(-)
New commits:
commit 4609203dbfe3b7e413678f5fc42ea0c1cb12e676
Author: Emilio Pozuelo Monfort
Date: Wed Nov 23 19:32:13 2016 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 9d1287e..0f2a199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
+xorg-server (2:1.19.0-2) unstable; urgency=medium
* Disable glamor on the udeb build. It's not needed there.
This has the side effect of fixing the Hurd build.
@@ -6,7 +6,7 @@ xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
- Ported to NotifyFd. Fixes the kFreeBSD build.
* Bump Standards-Version to 3.9.8; no changes needed.
- -- Emilio Pozuelo Monfort Wed, 23 Nov 2016 18:49:56 +0100
+ -- Emilio Pozuelo Monfort Wed, 23 Nov 2016 19:32:09 +0100
xorg-server (2:1.19.0-1) unstable; urgency=medium
commit c0b55546f8fe96ed9540f604386f12f49851eec4
Author: Emilio Pozuelo Monfort
Date: Wed Nov 23 19:30:17 2016 +0100
Bump Standards-Version to 3.9.8
diff --git a/debian/changelog b/debian/changelog
index c41bd5f..9d1287e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
This has the side effect of fixing the Hurd build.
* debian/patches/02_kbsd-input-devd.diff:
- Ported to NotifyFd. Fixes the kFreeBSD build.
+ * Bump Standards-Version to 3.9.8; no changes needed.
-- Emilio Pozuelo Monfort Wed, 23 Nov 2016 18:49:56 +0100
diff --git a/debian/control b/debian/control
index 9e544af..fcea06e 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,7 @@ Build-Depends:
libdbus-1-dev (>= 1.0) [linux-any],
# systemd-daemon
libsystemd-dev [linux-any],
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/xserver/xorg-server.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/xserver/xorg-server.git
Homepage: https://www.x.org/
commit 21cbf5b30ae307a9a4ad407c96e7b01835bd7b5a
Author: Emilio Pozuelo Monfort
Date: Wed Nov 23 19:27:47 2016 +0100
Port kfreebsd patch to NotifyFd
diff --git a/debian/changelog b/debian/changelog
index a8bae03..c41bd5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.19.0-2) UNRELEASED; urgency=medium
* Disable glamor on the udeb build. It's not needed there.
This has the side effect of fixing the Hurd build.
+ * debian/patches/02_kbsd-input-devd.diff:
+- Ported to NotifyFd. Fixes the kFreeBSD build.
-- Emilio Pozuelo Monfort Wed, 23 Nov 2016 18:49:56 +0100
diff --git a/debian/patches/02_kbsd-input-devd.diff
b/debian/patches/02_kbsd-input-devd.diff
index 67af714..1365e2f 100644
--- a/debian/patches/02_kbsd-input-devd.diff
+++ b/debian/patches/02_kbsd-input-devd.diff
@@ -7,6 +7,10 @@ Based on original code by Baptiste Daroussin, with some fixes
made
by Koop Mast and myself.
Signed-off-by: Robert Millan
+
+v2 - Emilio Pozuelo Monfort
+
+ - Ported to NotifyFd API.
---
config/Makefile.am |4 +
config/config-backends.h|5 +
@@ -66,7 +70,7 @@ Signed-off-by: Robert Millan
--- /dev/null
+++ b/config/devd.c
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,375 @@
+/*
+ * Copyright © 2012 Baptiste Daroussin
+ * Copyright © 2014 Robert Millan
@@ -370,39 +374,29 @@ Signed-off-by: Robert Millan
+}
+
+static void
-+wakeup_handler(void *data, int err, void *read_mask)
++socket_handler(int fd, int ready, void *data)
+{
+char *line = NULL;
+char *walk;
+
-+if (err < 0)
++if (socket_getline(sock_devd, &line) < 0)
+return;
+
-+if (FD_ISSET(sock_devd, (fd_set *) read_mask)) {
-+if (socket_getline(sock_devd, &line) < 0)
-+return;
-+
-+walk = strchr(line + 1, ' ');
-+if (walk != NULL)
-+walk[0] = '\0';
-+
-+switch (*line) {
-+case DEVD_EVENT_ADD:
-+device_added(line + 1);
-+break;
-+case DEVD_EVENT_REMOVE:
-+device_removed(line + 1);
-+break;
-+default:
-+break;
-+}
-+free(line);
++walk = strchr(line + 1, ' ');
++if (walk != NULL)
++walk[0] = '\0';
++
++switch (*line) {
++case DEVD_EVENT_ADD:
++device_added(line + 1);
++break;
++case DEVD_EVENT_REMOVE:
++device_removed(line + 1);
++break;
++default:
++break;
+}
-+}
-+
-+static void
-+block_handler(void *data, struct timeval **tv, void *read_mask)
-+{
++free(line);
+}
+
+int
@@ -438,8 +432,7 @@ Signed-off-by: Robert Millan
+return 0;
+}
+
-+RegisterBlockAndWakeupHan
Processing of xorg-server_1.19.0-2_source.changes
xorg-server_1.19.0-2_source.changes uploaded successfully to localhost along with the files: xorg-server_1.19.0-2.dsc xorg-server_1.19.0.orig.tar.gz xorg-server_1.19.0-2.diff.gz Greetings, Your Debian queue daemon (running on host usper.debian.org)
xorg-server_1.19.0-2_source.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Wed, 23 Nov 2016 19:32:09 +0100 Source: xorg-server Binary: xserver-xorg-core xserver-xorg-core-udeb xserver-xorg-dev xdmx xdmx-tools xnest xvfb xserver-xephyr xserver-xorg-core-dbg xserver-common xorg-server-source xwayland xserver-xorg-legacy Architecture: source Version: 2:1.19.0-2 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Emilio Pozuelo Monfort Description: xdmx - distributed multihead X server xdmx-tools - Distributed Multihead X tools xnest - Nested X server xorg-server-source - Xorg X server - source files xserver-common - common files used by various X servers xserver-xephyr - nested X server xserver-xorg-core - Xorg X server - core server xserver-xorg-core-dbg - Xorg - the X.Org X server (debugging symbols) xserver-xorg-core-udeb - Xorg X server - core server (udeb) xserver-xorg-dev - Xorg X server - development files xserver-xorg-legacy - setuid root Xorg server wrapper xvfb - Virtual Framebuffer 'fake' X server xwayland - Xwayland X server Changes: xorg-server (2:1.19.0-2) unstable; urgency=medium . * Disable glamor on the udeb build. It's not needed there. This has the side effect of fixing the Hurd build. * debian/patches/02_kbsd-input-devd.diff: - Ported to NotifyFd. Fixes the kFreeBSD build. * Bump Standards-Version to 3.9.8; no changes needed. Checksums-Sha1: e13e80e0dc0719a3ada5e2db96f46b27da612a90 4873 xorg-server_1.19.0-2.dsc 46bf02bb2fa79835d846aa2551044b02a8c47cde 8447945 xorg-server_1.19.0.orig.tar.gz 08ff243d1603dd4c80db2b3195975e46d385da04 140217 xorg-server_1.19.0-2.diff.gz Checksums-Sha256: 488530c97824212b29900bd7bf2d9e9da24d583f364a79fa770ed701eb2ee76c 4873 xorg-server_1.19.0-2.dsc c3e8660a74e2902e6ecaa66aa774e15d1ab66c2c19a023bd9e74e651ef005a43 8447945 xorg-server_1.19.0.orig.tar.gz c621fd501cf6d34652069597673308246eea28132277d57515ae6834793f2e20 140217 xorg-server_1.19.0-2.diff.gz Files: 803a3f05b623af9bf29bdecd4ab87b15 4873 x11 optional xorg-server_1.19.0-2.dsc c894123c915e4f858dd07a611bacd917 8447945 x11 optional xorg-server_1.19.0.orig.tar.gz aae5d20389c237fabf37bb818dabfbdd 140217 x11 optional xorg-server_1.19.0-2.diff.gz -BEGIN PGP SIGNATURE- iQIcBAEBCAAGBQJYNeQHAAoJEJ1GxIjkNoMCCxEQALn9w7De4Sse33mGkYIHTdzb yuhmcb+WmH5M/gLyMbqZKJmDE6CKebR1gsy02PhUnZofDgfS69fmwFFz1VRL56sE QdZD2iQtAjJAtcGBUzchV+Tcan/DcBfvqrUkEKnIoeCTd5S6GDR0Gq5kU3mX2awH UjHRG2Ur02yeUIVCAftUZqS9vsxNGsAXLQy34nCC/kLKd9WLNDVDKCf7CLneLnVH C/av6T5B68DM5ILGqn9rNuZP1XSYxBX3Hg9XdZVgo7Wy2eXjTBI1pqzEVhq2VEPi ZkbWaofUE45mfhraFHM85SRpiK1lKQj+GYb8UrI0tjxaH6h3dtk7v8ybo4pJ+7iz RBHbtSwKiRobhMgY46/+jehjqHQRS6YRIBP2zsGj2wNbw0x216YjZ+Hc0SMrhv0m EzERxzGGI0wDPszanvq5kywXXVzSOUFczbd78GrSqGlUV2ayo9MITJwNt9BVsf7E EZZOlFTwsuV+xNP4V5xdM705gc/my/w2RHa90rXdOOw2Dwik2btePbMljjKWXasd Ahj71Vh0p8ZyLGJq0nnUgGtba9OgtHKaTFHM0Ml9JGvDFqg9qrw8VaM7YSkmiPIZ kDYCQHfPzN3RpXCEv3NM6y/5p3RD3Ou4jksiqUxPs8Qg9wt23mFV6Yz0NIebiBm9 CO0Jsj3CrtuOEojIyxEk =0kRC -END PGP SIGNATURE- Thank you for your contribution to Debian.
Bug#845477: Depends: xorg-input-abi-22 but it is not installable
Package: xserver-xorg-input-libinput Version: 0.22.0-1 Severity: important Dear Maintainer, on Debian stretch/sid I can't install xerver-xorg-input-libinput since the last dist-upgrade. A dependency is missing now: apt-get install xserver-xorg-input-libinput Reading package lists... Done Building dependency tree Reading state information... Done Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. The following information may help to resolve the situation: The following packages have unmet dependencies: xserver-xorg-input-libinput : Depends: xorg-input-abi-22 but it is not installable E: Unable to correct problems, you have held broken packages. # apt-cache show xserver-xorg-input-libinput Package: xserver-xorg-input-libinput Version: 0.22.0-1 Installed-Size: 117 Maintainer: Debian X Strike Force Architecture: amd64 Provides: xorg-driver-input Depends: libc6 (>= 2.7), libinput10 (>= 1.5.0), xorg-input-abi-22, xserver-xorg-core (>= 2:1.17.99.902) Description-en: X.Org X server -- libinput input driver This package provides the driver for input devices using libinput library. It can handle keyboards, mice and touchpads, and essentially replaces the separate -evdev and -synaptics drivers. . More information about X.Org can be found at: http://www.X.org> . This package is built from the X.org xf86-input-libinput driver module. Description-md5: baef4d91fc625885bc891d7fe4f0f1cc Section: x11 Priority: optional Filename: pool/main/x/xserver-xorg-input-libinput/xserver-xorg-input-libinput_0.22.0-1_amd64.deb Size: 51240 MD5sum: 134c4538118b253c7b948bb57f3ed01c SHA256: 68826375745f5b8cdcc9060d90fc4364d75a80f1f096af75cc8fc90fbbe6f6e3 When my displaymanager (sddm) starts, the system (a laptop) freezes and all I can do is pushing the powerbutton and start into grub recovery mode. Thank you. -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 4.8.0-1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
Bug#845477: marked as done (Depends: xorg-input-abi-22 but it is not installable)
Your message dated Wed, 23 Nov 2016 21:06:28 +0100 with message-id <7d99a496-0656-1852-bf02-df53b71c7...@debian.org> and subject line Re: Bug#845477: Depends: xorg-input-abi-22 but it is not installable has caused the Debian Bug report #845477, regarding Depends: xorg-input-abi-22 but it is not installable to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 845477: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=845477 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems --- Begin Message --- Package: xserver-xorg-input-libinput Version: 0.22.0-1 Severity: important Dear Maintainer, on Debian stretch/sid I can't install xerver-xorg-input-libinput since the last dist-upgrade. A dependency is missing now: apt-get install xserver-xorg-input-libinput Reading package lists... Done Building dependency tree Reading state information... Done Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. The following information may help to resolve the situation: The following packages have unmet dependencies: xserver-xorg-input-libinput : Depends: xorg-input-abi-22 but it is not installable E: Unable to correct problems, you have held broken packages. # apt-cache show xserver-xorg-input-libinput Package: xserver-xorg-input-libinput Version: 0.22.0-1 Installed-Size: 117 Maintainer: Debian X Strike Force Architecture: amd64 Provides: xorg-driver-input Depends: libc6 (>= 2.7), libinput10 (>= 1.5.0), xorg-input-abi-22, xserver-xorg-core (>= 2:1.17.99.902) Description-en: X.Org X server -- libinput input driver This package provides the driver for input devices using libinput library. It can handle keyboards, mice and touchpads, and essentially replaces the separate -evdev and -synaptics drivers. . More information about X.Org can be found at: http://www.X.org> . This package is built from the X.org xf86-input-libinput driver module. Description-md5: baef4d91fc625885bc891d7fe4f0f1cc Section: x11 Priority: optional Filename: pool/main/x/xserver-xorg-input-libinput/xserver-xorg-input-libinput_0.22.0-1_amd64.deb Size: 51240 MD5sum: 134c4538118b253c7b948bb57f3ed01c SHA256: 68826375745f5b8cdcc9060d90fc4364d75a80f1f096af75cc8fc90fbbe6f6e3 When my displaymanager (sddm) starts, the system (a laptop) freezes and all I can do is pushing the powerbutton and start into grub recovery mode. Thank you. -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 4.8.0-1-amd64 (SMP w/2 CPU cores) Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) --- End Message --- --- Begin Message --- On 23/11/16 19:40, Debianer wrote: > Package: xserver-xorg-input-libinput > Version: 0.22.0-1 > Severity: important > > Dear Maintainer, > > on Debian stretch/sid I can't install xerver-xorg-input-libinput since > the last dist-upgrade. A dependency is missing now: Yes, ongoing xserver transition. You'll have to wait for some time, possibly a few days. Emilio--- End Message ---
Bug#845477: Depends: xorg-input-abi-22 but it is not installable
On Wed, 23 Nov 2016 21:06:28 +0100 Emilio Pozuelo Monfort wrote: Yes, ongoing xserver transition. You'll have to wait for some time, possibly a few days. Thanks for answering, good luck! oz
Processing of libxfont1_1.5.2-3_source.changes
libxfont1_1.5.2-3_source.changes uploaded successfully to localhost along with the files: libxfont1_1.5.2-3.dsc libxfont1_1.5.2-3.diff.gz Greetings, Your Debian queue daemon (running on host usper.debian.org)
libxfont: Changes to 'refs/tags/libxfont1-1_1.5.2-3'
Tag 'libxfont1-1_1.5.2-3' created by Timo Aaltonen at 2016-11-23 22:17 + Tagging upload of libxfont1 1:1.5.2-3 to unstable. -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABCAAGBQJYNhV8AAoJEMtwMWWoiYTct2EP/3Ko1PbvaABH/ZdcLtGsW3Wu QD/yA9mpF01TtZ0pUBJsmlp3N/Z0mEQRiN4dtOO7xepDVnA/B2eSiKXoYcU8eoFN GV2J3GCa5hF7nnGgEnfxmAVcFuW2Opggc13zvgHbCwRNaQtBRlpXdaZKO/DKAK/A JKh/9i1sHsneXwgGsjmCgz1EMC4x8Bkdjq7Yj+qcpCYg+lr+Teu53tWuO/n8ygpz 2C5VbCCOdaSG2mEc41s1tDeSKEeIECRUX5SRyJYmv9YlvFEGeSVYghDu2A/SIVxP ia1F4OoYqp8VXRcH6Dhq+6bv/q66yaM7MfHyNgIp0z98NI65HhD5bCM4jof+TjWO 1+JOjNH02IgrfCveuAnNmfuKYxMKDTuWQ8AZdFs/l0BLEeklOJOJf6DulCjQHDel cl+E8qdmo1gvEwr4o6obkAlZxm1sgEyO4tIhygSBRwUmu8KaIZHI4QBqJAJa0Mr+ tpJ2HxQ7fZClFuu29YE/SwIz7MBC8CMqW6c/NXfJ4E1jfFuphTlvUn7qt8k4hqe9 uWc+ooiePpqw4hKFbat4WllGkrlmO7IV631ASfszSm+v9T/GADtd/BZKFzLBDK2q XCaM+6uGqVE+KSvuPlZF6gknk0p8vqPsmHdG8IPLuSZyDJIKZq9KBUgL9C4A2uAd yDYJj888l//cUuALe3xQ =uyzd -END PGP SIGNATURE- Changes since libxfont1-1_1.5.2-2: Timo Aaltonen (5): Drop libxfont1-udeb. Switch to -dbgsym. Bump debhelper compat to 10. Drop --with quilt and --parallel flags, they are enabled by default now. keep confflags in one place release to sid --- debian/changelog |9 + debian/compat |2 +- debian/control| 29 + debian/libxfont1-dev.install |4 ++-- debian/libxfont1-udeb.install |2 -- debian/rules | 33 - 6 files changed, 21 insertions(+), 58 deletions(-) ---
libxfont: Changes to 'debian-unstable-libxfont1'
debian/changelog |9 +
debian/compat |2 +-
debian/control| 29 +
debian/libxfont1-dev.install |4 ++--
debian/libxfont1-udeb.install |2 --
debian/rules | 33 -
6 files changed, 21 insertions(+), 58 deletions(-)
New commits:
commit ba9419fc4eeed2b55c07311ffb2747524a7c15d3
Author: Timo Aaltonen
Date: Thu Nov 24 00:17:05 2016 +0200
release to sid
diff --git a/debian/changelog b/debian/changelog
index 75872a4..99c0dbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
+libxfont1 (1:1.5.2-3) unstable; urgency=medium
* Drop libxfont1-udeb.
* Switch to -dbgsym.
* Bump debhelper compat to 10. Drop --with quilt and --parallel flags,
they are enabled by default now.
- -- Timo Aaltonen Thu, 24 Nov 2016 00:00:12 +0200
+ -- Timo Aaltonen Thu, 24 Nov 2016 00:16:53 +0200
libxfont1 (1:1.5.2-2) unstable; urgency=medium
commit 372002a061a90e7a9943356d3b24a595515cf2a4
Author: Timo Aaltonen
Date: Thu Nov 24 00:16:42 2016 +0200
keep confflags in one place
diff --git a/debian/rules b/debian/rules
index 2872adf..9547dd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
LDFLAGS := $(LDFLAGS:-Wl,-Bsymbolic-functions=)
CONFFLAGS += \
+ --with-bzip2 \
+ --with-xmlto \
--disable-fc \
--enable-builtins \
--enable-pcfformat \
@@ -25,7 +27,7 @@ CONFFLAGS += \
override_dh_auto_configure:
- dh_auto_configure -- --with-bzip2--with-xmlto$(CONFFLAGS)
+ dh_auto_configure -- $(CONFFLAGS)
override_dh_install:
find debian/tmp -name '*.la' -delete
commit 76d1482e46b6461c5727fa43b2ad748c86972d84
Author: Timo Aaltonen
Date: Thu Nov 24 00:13:04 2016 +0200
Bump debhelper compat to 10. Drop --with quilt and --parallel flags, they
are enabled by default now.
diff --git a/debian/changelog b/debian/changelog
index d79204e..75872a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
* Drop libxfont1-udeb.
* Switch to -dbgsym.
+ * Bump debhelper compat to 10. Drop --with quilt and --parallel flags,
+they are enabled by default now.
-- Timo Aaltonen Thu, 24 Nov 2016 00:00:12 +0200
diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 21765be..82d4450 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force
Uploaders: Timo Aaltonen
Build-Depends:
- debhelper (>= 8.1.3),
+ debhelper (>= 10),
dh-autoreconf,
quilt,
pkg-config,
diff --git a/debian/rules b/debian/rules
index 3bfc518..2872adf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,4 +38,4 @@ override_dh_makeshlibs:
dh_makeshlibs -V'libxfont1 (>= 1:1.4.2)'
%:
- dh $@ --with quilt,autoreconf --parallel --builddirectory=build/
+ dh $@ --with quilt --builddirectory=build/
commit a8b928e75fc6800cc60cfe380eb498ad8faa3ed0
Author: Timo Aaltonen
Date: Thu Nov 24 00:11:35 2016 +0200
Switch to -dbgsym.
diff --git a/debian/changelog b/debian/changelog
index 224bd55..d79204e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxfont1 (1:1.5.2-3) UNRELEASED; urgency=medium
* Drop libxfont1-udeb.
+ * Switch to -dbgsym.
-- Timo Aaltonen Thu, 24 Nov 2016 00:00:12 +0200
diff --git a/debian/control b/debian/control
index 24f0e15..21765be 100644
--- a/debian/control
+++ b/debian/control
@@ -40,25 +40,6 @@ Description: X11 font rasterisation library
This module can be found at
git://anongit.freedesktop.org/git/xorg/lib/libXfont
-Package: libxfont1-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfont1 (= ${binary:Version})
-Multi-Arch: same
-Description: X11 font rasterisation library (debug package)
- libXfont provides various services for X servers, most notably font
- selection and rasterisation (through external libraries).
- .
- This package contains the debug versions of the library found in libxfont1.
- Non-developers likely have little use for this package.
- .
- More information about X.Org can be found at:
- http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXfont
-
Package: libxfont1-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index 084f11a..3bfc518 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-PACKAGE = libxfont1
-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
@@ -34,8 +32,7 @@ override
libxfont1_1.5.2-3_source.changes ACCEPTED into unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Format: 1.8 Date: Thu, 24 Nov 2016 00:16:53 +0200 Source: libxfont1 Binary: libxfont1 libxfont1-dev Architecture: source Version: 1:1.5.2-3 Distribution: unstable Urgency: medium Maintainer: Debian X Strike Force Changed-By: Timo Aaltonen Description: libxfont1 - X11 font rasterisation library libxfont1-dev - X11 font rasterisation library (development headers) Changes: libxfont1 (1:1.5.2-3) unstable; urgency=medium . * Drop libxfont1-udeb. * Switch to -dbgsym. * Bump debhelper compat to 10. Drop --with quilt and --parallel flags, they are enabled by default now. Checksums-Sha1: d0af081275fe5389cbeb21186c359d4a68b9a57b 2125 libxfont1_1.5.2-3.dsc 97f1d7f2d766dcc4a8497fd96cf27084e00dbf00 15475 libxfont1_1.5.2-3.diff.gz Checksums-Sha256: bc37d7331ef87f711e948982af730422878cafb5a23a359442a1ef83da2a1451 2125 libxfont1_1.5.2-3.dsc 1b8cd89b5ea6a7ee4b0155042a600d33e23bae793366089bbfb8d80027ba8b13 15475 libxfont1_1.5.2-3.diff.gz Files: 1c395bc02e7a4b7df15eeb780fcdfe86 2125 x11 optional libxfont1_1.5.2-3.dsc 685e65ebb0a96812dcf8177993cff404 15475 x11 optional libxfont1_1.5.2-3.diff.gz -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAEBCAAGBQJYNhV/AAoJEMtwMWWoiYTcuwAP/2zd7MxtyJwNj6UsWNK37Fc3 mDkn/+KvedAN59ka7RURv8t0tQrPt8chI61uPvepy2kxwk8zGuQ4vyLshoTF3YHT IQeWuDl2Iw9n/TgtnKjSQEwQMow5w0qhgM788S8JJsrH0VdtrZOWpNXba7rvBIoP JRTplB49yVDkRZd3Y8okjjf7wL2ObwbS4rUMiG3zLDMPFLk8TABecKfqhDeSdHgb HDEn5ZAPV7HUwyT8rwwcVeBFkznF8E/48MGuFboqXTpEoFQBbowo+T71l0rfLzi1 9CPp8aZkNgvgJsvsv/98mZGrnNxHEQ6rT3HFNCeu0mAY+Sfm88zHP1GCXVVe4GPu lmqq3zqq4WFXD3t/BYYbRIo9pDgH4PaolEnGxQYLmRqxDQBPf3OZHeRsx8kGmFLn PWUuHh1h6k4iBSCvnIlNn5g9xeUS85QpwLQdeogQxABbg6fRomobC1N19pbqfyOw NVOpyMjNm72h9PhNmAEcL/dj2ReiUeII9GRBzYGFUbQk3aCdaHhD31FdhjmPATjY tO3m+sbYaSvW3Uoj2QnWAEMRqZUOiq3N6QI77626ER+lmyFK9P8MrOdO2v3UMqPV sd3DGIx8xdPjTAjJ+mP0NRB+ufspqONfVqQNxaGQDJ+Kbi2tD3c6QT6FyiBh5F8t gwwDe+wBAAyPuWLb+ca7 =wNg8 -END PGP SIGNATURE- Thank you for your contribution to Debian.
