debian/changelog | 34 ++++++++++++++++++++++++++++++++-- debian/compat | 2 +- debian/control | 7 ++----- debian/rules | 2 +- debian/x11-common.postinst | 4 ++-- 5 files changed, 38 insertions(+), 11 deletions(-)
New commits: commit 66373f4bd28bfe64d9e6f49cd75bb2757e77e3e1 Author: Timo Aaltonen <[email protected]> Date: Mon Apr 24 16:39:22 2017 +0300 update changelog, release diff --git a/debian/changelog b/debian/changelog index 242d090..48d61cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg (1:7.7+18ubuntu1) artful; urgency=medium + + * Merge from Debian. + - drop -synaptics from -input-all Recommends (LP: #1685542) + + -- Timo Aaltonen <[email protected]> Mon, 24 Apr 2017 16:38:55 +0300 + xorg (1:7.7+18) unstable; urgency=medium * Call db_purge without arguments in postinst to fix error uncovered by commit 1f4d2a18493f894bf63cc7587d7ef3806be1cd26 Author: Timo Aaltonen <[email protected]> Date: Tue Apr 4 00:48:02 2017 +0300 release to zesty diff --git a/debian/changelog b/debian/changelog index 6accf06..8c68096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xorg (1:7.7+16ubuntu3) UNRELEASED; urgency=medium +xorg (1:7.7+16ubuntu3) zesty; urgency=medium * control: Drop alt recommends on xorg-driver-video, because it makes no sense for Recommends. * control: Drop xserver-xorg-video-freedreno from video-all (arm). (LP: #1679323) - -- Timo Aaltonen <[email protected]> Wed, 01 Feb 2017 10:44:07 +0200 + -- Timo Aaltonen <[email protected]> Tue, 04 Apr 2017 00:47:23 +0300 xorg (1:7.7+16ubuntu2) zesty; urgency=medium commit e65d05182e7ce5958fd46435bbe3bfae36ab7fd4 Author: Timo Aaltonen <[email protected]> Date: Tue Apr 4 00:47:20 2017 +0300 control: Drop xserver-xorg-video-freedreno from video-all (arm). (LP: #1679323) diff --git a/debian/changelog b/debian/changelog index 29066a0..6accf06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xorg (1:7.7+16ubuntu3) UNRELEASED; urgency=medium * control: Drop alt recommends on xorg-driver-video, because it makes no sense for Recommends. + * control: Drop xserver-xorg-video-freedreno from video-all (arm). + (LP: #1679323) -- Timo Aaltonen <[email protected]> Wed, 01 Feb 2017 10:44:07 +0200 diff --git a/debian/control b/debian/control index c2f2049..f23c79a 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,6 @@ Depends: xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x], xserver-xorg-video-ati [!hurd-any !s390x], xserver-xorg-video-fbdev [!s390x], - xserver-xorg-video-freedreno [arm64 armel armhf], xserver-xorg-video-dummy [s390x], xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32], xserver-xorg-video-vesa [!s390x], commit 0dc2ca8b5d161437e49af9eb9adc5eecb7a9d950 Author: Julien Cristau <[email protected]> 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 <[email protected]> Wed, 23 Nov 2016 08:34:41 +0100 + -- Julien Cristau <[email protected]> Wed, 23 Nov 2016 08:50:50 +0100 xorg (1:7.7+17) unstable; urgency=medium commit 2c7fd3d94825f4fd9a770a824a712dfcda109835 Author: Julien Cristau <[email protected]> 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 <[email protected]> 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# commit e122d268b5033a475692182f9ae46e729f956628 Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Nov 23 00:02:33 2016 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 0dab095..8c53b1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.7+17) UNRELEASED; urgency=medium +xorg (1:7.7+17) unstable; urgency=medium [ Andreas Boll ] * control: Drop -freedreno from -video-all, the default 2D-driver will @@ -9,7 +9,7 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium * Bump Standards-Version to 3.9.8. No changes. * Bump debhelper compat to 10. Drop --parallel flag, enabled by default. - -- Andreas Boll <[email protected]> Thu, 17 Nov 2016 14:01:37 +0100 + -- Emilio Pozuelo Monfort <[email protected]> Wed, 23 Nov 2016 00:02:26 +0100 xorg (1:7.7+16) unstable; urgency=medium commit 20a1465b05f5c00472baeaf9f3b3f2e13c508d69 Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Nov 23 00:01:01 2016 +0100 Bump debhelper compat to 10 diff --git a/debian/changelog b/debian/changelog index 5590e7f..0dab095 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium [ Emilio Pozuelo Monfort ] * debian/x11-common.postinst: call `set -e'. * Bump Standards-Version to 3.9.8. No changes. + * Bump debhelper compat to 10. Drop --parallel flag, enabled by default. -- Andreas Boll <[email protected]> Thu, 17 Nov 2016 14:01:37 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 0115d9d..9ea3b2f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <[email protected]> Standards-Version: 3.9.8 Build-Depends: dpkg (>= 1.16.1), - debhelper (>= 9), + debhelper (>= 10), po-debconf, # xsf-docs: asciidoc, diff --git a/debian/rules b/debian/rules index 9d9d9b4..c662a6d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --parallel + dh $@ override_dh_auto_clean: $(MAKE) -C xsf-docs clean commit c14fc5e45c3818a62d369b3257efc402b63b9907 Author: Emilio Pozuelo Monfort <[email protected]> Date: Wed Nov 23 00:00:11 2016 +0100 Bump Standards-Version diff --git a/debian/changelog b/debian/changelog index edcc4c8..5590e7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium [ Emilio Pozuelo Monfort ] * debian/x11-common.postinst: call `set -e'. + * Bump Standards-Version to 3.9.8. No changes. -- Andreas Boll <[email protected]> Thu, 17 Nov 2016 14:01:37 +0100 diff --git a/debian/control b/debian/control index f0d7186..0115d9d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xorg Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Build-Depends: dpkg (>= 1.16.1), debhelper (>= 9), commit 11d044eb922bac4ef60e3e9bbdc90913d972f583 Author: Emilio Pozuelo Monfort <[email protected]> Date: Tue Nov 22 23:58:37 2016 +0100 debian/x11-common.postinst: call set -e diff --git a/debian/changelog b/debian/changelog index ffbd811..edcc4c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ xorg (1:7.7+17) UNRELEASED; urgency=medium + [ Andreas Boll ] * control: Drop -freedreno from -video-all, the default 2D-driver will be -modesetting. + [ Emilio Pozuelo Monfort ] + * debian/x11-common.postinst: call `set -e'. + -- Andreas Boll <[email protected]> Thu, 17 Nov 2016 14:01:37 +0100 xorg (1:7.7+16) unstable; urgency=medium diff --git a/debian/x11-common.postinst b/debian/x11-common.postinst index aa36a8e..2230165 100644 --- a/debian/x11-common.postinst +++ b/debian/x11-common.postinst @@ -1,4 +1,5 @@ #!/bin/bash +set -e if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule commit 81723d157ee16bbe96bf5fd2db6fc59a5d4bf499 Author: Andreas Boll <[email protected]> Date: Thu Nov 17 14:02:04 2016 +0100 control: Drop -freedreno from -video-all, the default 2D-driver will be -modesetting. diff --git a/debian/changelog b/debian/changelog index b21f7cb..ffbd811 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg (1:7.7+17) UNRELEASED; urgency=medium + + * control: Drop -freedreno from -video-all, the default 2D-driver will + be -modesetting. + + -- Andreas Boll <[email protected]> Thu, 17 Nov 2016 14:01:37 +0100 + xorg (1:7.7+16) unstable; urgency=medium [ Timo Aaltonen ] diff --git a/debian/control b/debian/control index 080af84..f0d7186 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,6 @@ Depends: xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x], xserver-xorg-video-ati [!hurd-any !s390x], xserver-xorg-video-fbdev [!s390x], - xserver-xorg-video-freedreno [arm64 armel armhf], xserver-xorg-video-dummy [s390x], xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32], xserver-xorg-video-vesa [!s390x],
