debian/changelog | 13 +++++++++++-- debian/control | 21 ++++++++++++++++----- debian/rules | 9 --------- debian/scripts/vars.alpha | 23 ----------------------- debian/scripts/vars.amd64 | 35 ----------------------------------- debian/scripts/vars.arm64 | 9 --------- debian/scripts/vars.armel | 23 ----------------------- debian/scripts/vars.armhf | 17 ----------------- debian/scripts/vars.hppa | 18 ------------------ debian/scripts/vars.hurd-i386 | 19 ------------------- debian/scripts/vars.i386 | 37 ------------------------------------- debian/scripts/vars.kfreebsd-amd64 | 19 ------------------- debian/scripts/vars.kfreebsd-i386 | 19 ------------------- debian/scripts/vars.m68k | 21 --------------------- debian/scripts/vars.mips | 23 ----------------------- debian/scripts/vars.mips64el | 1 - debian/scripts/vars.mipsel | 1 - debian/scripts/vars.powerpc | 24 ------------------------ debian/scripts/vars.powerpcspe | 1 - debian/scripts/vars.ppc64 | 14 -------------- debian/scripts/vars.ppc64el | 8 -------- debian/scripts/vars.s390x | 8 -------- debian/scripts/vars.sh4 | 25 ------------------------- debian/scripts/vars.sparc64 | 23 ----------------------- debian/scripts/vars.x32 | 1 - 25 files changed, 27 insertions(+), 385 deletions(-)
New commits: commit 7d961127d2753a479b5a3ce3f32152e99798355b Author: Andreas Boll <[email protected]> Date: Thu Sep 10 11:47:59 2015 +0200 Cleanup changelog. diff --git a/debian/changelog b/debian/changelog index 9862c48..d3557d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,15 +9,17 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium m32r, s390 and sparc. * Add upstream url. * Use https for Vcs-* fields. - * Add support for mips64el by symlinking to vars.mips (Closes: - #755482). - * Remove all non-KMS drivers from xserver-xorg-video-all. + * Remove all non-KMS (except fbdev and vesa) drivers from + xserver-xorg-video-all. * Inline all vars files into control. * Remove redundant xserver-xorg-input-evdev from xserver-xorg (Already in -input-all). - * Add xserver-xorg-video-intel on kfreebsd-any. - * Add xserver-xorg-video-freedreno on armel and armhf. - * Add xserver-xorg-video-nouveau on arm64. + * Simplify and consolidate xserver-xorg-{input,video}-all: + - Use architecture wildcards. + - Add support for mips64el (Closes: #755482). + - Add xserver-xorg-video-intel on kfreebsd-any. + - Add xserver-xorg-video-freedreno on armel and armhf. + - Add xserver-xorg-video-nouveau on arm64. -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 commit c4779c796c9ad6ecd82843df1a343c9af9025904 Author: Andreas Boll <[email protected]> Date: Thu Sep 10 11:44:25 2015 +0200 Re-add xserver-xorg-video-dummy on s390x. diff --git a/debian/control b/debian/control index 7cb3fe7..e882038 100644 --- a/debian/control +++ b/debian/control @@ -53,6 +53,7 @@ Depends: xserver-xorg-video-ati [!hurd-any !s390x], xserver-xorg-video-fbdev [!s390x], xserver-xorg-video-freedreno [armel armhf], + xserver-xorg-video-dummy [s390x], xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32], xserver-xorg-video-vesa [!s390x], commit 207026d4b7a5072fdfffcb919bf321491b589bd8 Author: Andreas Boll <[email protected]> Date: Thu Sep 10 11:05:56 2015 +0200 Simplify -wacom to !hurd-any !kfreebsd-any !s390x. diff --git a/debian/control b/debian/control index f7bb5fd..7cb3fe7 100644 --- a/debian/control +++ b/debian/control @@ -78,7 +78,7 @@ Depends: xserver-xorg-input-void [s390x], ${misc:Depends}, Recommends: - xserver-xorg-input-wacom [alpha amd64 armel armhf hppa i386 mips mips64el mips powerpc powerpcspe sh4 sparc64 x32], + xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x], Description: X.Org X server -- input driver metapackage This package depends on the full suite of input drivers for the X.Org X server (Xorg). It does not provide any drivers itself, and may be removed if you wish commit 0cd81b4a72f7f8b61450efaec5a80e1814083902 Author: Andreas Boll <[email protected]> Date: Thu Sep 10 11:04:18 2015 +0200 Simplify -ati to !hurd-any !s390x. diff --git a/debian/control b/debian/control index 51f61dc..f7bb5fd 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,7 @@ Description: X.Org X server Package: xserver-xorg-video-all Architecture: any Depends: - xserver-xorg-video-ati [alpha amd64 armel armhf hppa i386 kfreebsd-any m68k mips mips64el mipsel powerpc powerpcspe ppc64 sh4 sparc64 x32], + xserver-xorg-video-ati [!hurd-any !s390x], xserver-xorg-video-fbdev [!s390x], xserver-xorg-video-freedreno [armel armhf], xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], commit e6592308fe4a8e2b011fb44ed64d8791d245ca42 Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:34:32 2015 +0200 Simplify xserver-xorg-input-synaptics to !s390x. diff --git a/debian/control b/debian/control index b95443a..51f61dc 100644 --- a/debian/control +++ b/debian/control @@ -73,7 +73,7 @@ Depends: xserver-xorg-input-evdev [linux-any], xserver-xorg-input-kbd [!linux-any], xserver-xorg-input-mouse [!linux-any], - xserver-xorg-input-synaptics [alpha amd64 arm64 armel armhf hppa i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4 sparc64 x32], + xserver-xorg-input-synaptics [!s390x], xserver-xorg-input-vmmouse [amd64 i386 x32], xserver-xorg-input-void [s390x], ${misc:Depends}, commit 014a04f3680c9483b34621c3e94bb17beed93057 Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:29:56 2015 +0200 Add xserver-xorg-video-nouveau on arm64. diff --git a/debian/changelog b/debian/changelog index 7eea67a..9862c48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium in -input-all). * Add xserver-xorg-video-intel on kfreebsd-any. * Add xserver-xorg-video-freedreno on armel and armhf. + * Add xserver-xorg-video-nouveau on arm64. -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 diff --git a/debian/control b/debian/control index 189bb73..b95443a 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Depends: xserver-xorg-video-fbdev [!s390x], xserver-xorg-video-freedreno [armel armhf], xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], - xserver-xorg-video-nouveau [amd64 armhf i386 powerpc x32], + xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32], xserver-xorg-video-vesa [!s390x], xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32], ${misc:Depends}, commit 8d40957b396d29bcaf2d11569dce9b5262a0385c Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:28:46 2015 +0200 Add xserver-xorg-video-freedreno on armel and armhf. diff --git a/debian/changelog b/debian/changelog index 623ac7f..7eea67a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium * Remove redundant xserver-xorg-input-evdev from xserver-xorg (Already in -input-all). * Add xserver-xorg-video-intel on kfreebsd-any. + * Add xserver-xorg-video-freedreno on armel and armhf. -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 diff --git a/debian/control b/debian/control index 6f49613..189bb73 100644 --- a/debian/control +++ b/debian/control @@ -52,6 +52,7 @@ Architecture: any Depends: xserver-xorg-video-ati [alpha amd64 armel armhf hppa i386 kfreebsd-any m68k mips mips64el mipsel powerpc powerpcspe ppc64 sh4 sparc64 x32], xserver-xorg-video-fbdev [!s390x], + xserver-xorg-video-freedreno [armel armhf], xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], xserver-xorg-video-nouveau [amd64 armhf i386 powerpc x32], xserver-xorg-video-vesa [!s390x], commit 903b4a9490d7952a0aa6419b51bc489c57021d95 Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:26:02 2015 +0200 Add xserver-xorg-video-intel on kfreebsd-any. diff --git a/debian/changelog b/debian/changelog index 50095cb..623ac7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium * Inline all vars files into control. * Remove redundant xserver-xorg-input-evdev from xserver-xorg (Already in -input-all). + * Add xserver-xorg-video-intel on kfreebsd-any. -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 diff --git a/debian/control b/debian/control index 3830372..6f49613 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Architecture: any Depends: xserver-xorg-video-ati [alpha amd64 armel armhf hppa i386 kfreebsd-any m68k mips mips64el mipsel powerpc powerpcspe ppc64 sh4 sparc64 x32], xserver-xorg-video-fbdev [!s390x], - xserver-xorg-video-intel [amd64 i386 x32], + xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32], xserver-xorg-video-nouveau [amd64 armhf i386 powerpc x32], xserver-xorg-video-vesa [!s390x], xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32], commit 62b79d18eb67c945b7cb61b894c4e77688900a69 Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:11:55 2015 +0200 Drop redundant xserver-xorg-input-evdev from xserver-xorg. Already in -input-all diff --git a/debian/changelog b/debian/changelog index 29445c4..50095cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium #755482). * Remove all non-KMS drivers from xserver-xorg-video-all. * Inline all vars files into control. + * Remove redundant xserver-xorg-input-evdev from xserver-xorg (Already + in -input-all). -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 diff --git a/debian/control b/debian/control index b99a9f3..3830372 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,6 @@ Depends: xserver-xorg-legacy [!linux-any], xserver-xorg-video-all | xorg-driver-video, xserver-xorg-input-all | xorg-driver-input, - xserver-xorg-input-evdev [linux-any], ${shlibs:Depends}, ${misc:Depends}, xkb-data (>= 1.4), commit e60eb29a8778239588d6f9b44798a59b99a2da0d Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:11:04 2015 +0200 changelog: Document inlining. diff --git a/debian/changelog b/debian/changelog index 339ce88..29445c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ xorg (1:7.7+12) UNRELEASED; urgency=medium * Add support for mips64el by symlinking to vars.mips (Closes: #755482). * Remove all non-KMS drivers from xserver-xorg-video-all. + * Inline all vars files into control. -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 commit 77979396b7aaea897efe64213f8fb0f3a105708f Author: Andreas Boll <[email protected]> Date: Wed Sep 9 17:05:09 2015 +0200 Inline XSERVER_XORG_VIDEO_DEPENDS into control. diff --git a/debian/control b/debian/control index 6cf5d6d..b99a9f3 100644 --- a/debian/control +++ b/debian/control @@ -51,7 +51,12 @@ Description: X.Org X server Package: xserver-xorg-video-all Architecture: any Depends: - ${F:XServer-Xorg-Video-Depends}, + xserver-xorg-video-ati [alpha amd64 armel armhf hppa i386 kfreebsd-any m68k mips mips64el mipsel powerpc powerpcspe ppc64 sh4 sparc64 x32], + xserver-xorg-video-fbdev [!s390x], + xserver-xorg-video-intel [amd64 i386 x32], + xserver-xorg-video-nouveau [amd64 armhf i386 powerpc x32], + xserver-xorg-video-vesa [!s390x], + xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32], ${misc:Depends}, Recommends: xserver-xorg-video-qxl [amd64 i386 x32], diff --git a/debian/rules b/debian/rules index 2b52318..1e7c76e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,6 @@ ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -# Read in architecture-specific variables of importance. -include debian/scripts/vars.$(ARCH) - %: dh $@ --parallel @@ -28,7 +25,4 @@ override_dh_fixperms-indep: chown root:root debian/x11-common/etc/X11/Xsession chmod 755 debian/x11-common/etc/X11/Xsession -override_dh_gencontrol: - dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) - # vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha deleted file mode 100644 index 37d652b..0000000 --- a/debian/scripts/vars.alpha +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 deleted file mode 100644 index b8a1944..0000000 --- a/debian/scripts/vars.amd64 +++ /dev/null @@ -1,13 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS=" \ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-intel, \ - xserver-xorg-video-nouveau, \ - xserver-xorg-video-vesa, \ - xserver-xorg-video-vmware, \ -" diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64 deleted file mode 100644 index d6e436e..0000000 --- a/debian/scripts/vars.arm64 +++ /dev/null @@ -1,3 +0,0 @@ -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-fbdev, \ -" diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel deleted file mode 100644 index 37d652b..0000000 --- a/debian/scripts/vars.armel +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf deleted file mode 100644 index 7fad9c9..0000000 --- a/debian/scripts/vars.armhf +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-nouveau, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa deleted file mode 100644 index fedeb81..0000000 --- a/debian/scripts/vars.hppa +++ /dev/null @@ -1,8 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ -" diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386 deleted file mode 100644 index 667710b..0000000 --- a/debian/scripts/vars.hurd-i386 +++ /dev/null @@ -1,10 +0,0 @@ -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). - -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ - xserver-xorg-video-vmware, \ -" diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 deleted file mode 100644 index b8a1944..0000000 --- a/debian/scripts/vars.i386 +++ /dev/null @@ -1,13 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS=" \ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-intel, \ - xserver-xorg-video-nouveau, \ - xserver-xorg-video-vesa, \ - xserver-xorg-video-vmware, \ -" diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64 deleted file mode 100644 index a17a0e8..0000000 --- a/debian/scripts/vars.kfreebsd-amd64 +++ /dev/null @@ -1,9 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386 deleted file mode 100644 index a17a0e8..0000000 --- a/debian/scripts/vars.kfreebsd-i386 +++ /dev/null @@ -1,9 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k deleted file mode 100644 index 37d652b..0000000 --- a/debian/scripts/vars.m68k +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips deleted file mode 100644 index 37d652b..0000000 --- a/debian/scripts/vars.mips +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.mips64el b/debian/scripts/vars.mips64el deleted file mode 120000 index a22a1dd..0000000 --- a/debian/scripts/vars.mips64el +++ /dev/null @@ -1 +0,0 @@ -vars.mips \ No newline at end of file diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel deleted file mode 120000 index a22a1dd..0000000 --- a/debian/scripts/vars.mipsel +++ /dev/null @@ -1 +0,0 @@ -vars.mips \ No newline at end of file diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc deleted file mode 100644 index 1e29f3c..0000000 --- a/debian/scripts/vars.powerpc +++ /dev/null @@ -1,9 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-nouveau, \ -" diff --git a/debian/scripts/vars.powerpcspe b/debian/scripts/vars.powerpcspe deleted file mode 120000 index 436aac0..0000000 --- a/debian/scripts/vars.powerpcspe +++ /dev/null @@ -1 +0,0 @@ -vars.powerpc \ No newline at end of file diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64 deleted file mode 100644 index f1e0925..0000000 --- a/debian/scripts/vars.ppc64 +++ /dev/null @@ -1,7 +0,0 @@ -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ -" diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el deleted file mode 100644 index 6f125d5..0000000 --- a/debian/scripts/vars.ppc64el +++ /dev/null @@ -1,3 +0,0 @@ -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-fbdev, \ -" diff --git a/debian/scripts/vars.s390x b/debian/scripts/vars.s390x deleted file mode 100644 index 66b5a22..0000000 --- a/debian/scripts/vars.s390x +++ /dev/null @@ -1,6 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="" diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4 deleted file mode 100644 index 37d652b..0000000 --- a/debian/scripts/vars.sh4 +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64 deleted file mode 100644 index 37d652b..0000000 --- a/debian/scripts/vars.sparc64 +++ /dev/null @@ -1,10 +0,0 @@ - -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (Bourne shell). -XSERVER_XORG_VIDEO_DEPENDS="\ - xserver-xorg-video-ati, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-vesa, \ -" diff --git a/debian/scripts/vars.x32 b/debian/scripts/vars.x32 deleted file mode 120000 index 5cad171..0000000 --- a/debian/scripts/vars.x32 +++ /dev/null @@ -1 +0,0 @@ -vars.amd64 \ No newline at end of file commit 7641ce83060f356ce771380786b640355500c38d Author: Andreas Boll <[email protected]> Date: Wed Sep 9 16:55:53 2015 +0200 Inline XSERVER_XORG_INPUT_DEPENDS into control. diff --git a/debian/control b/debian/control index 42dfb99..6cf5d6d 100644 --- a/debian/control +++ b/debian/control @@ -65,7 +65,12 @@ Description: X.Org X server -- output driver metapackage Package: xserver-xorg-input-all Architecture: any Depends: - ${F:XServer-Xorg-Input-Depends}, + xserver-xorg-input-evdev [linux-any], + xserver-xorg-input-kbd [!linux-any], + xserver-xorg-input-mouse [!linux-any], + xserver-xorg-input-synaptics [alpha amd64 arm64 armel armhf hppa i386 m68k mips mips64el mipsel powerpc powerpcspe ppc64 ppc64el sh4 sparc64 x32], + xserver-xorg-input-vmmouse [amd64 i386 x32], + xserver-xorg-input-void [s390x], ${misc:Depends}, Recommends: xserver-xorg-input-wacom [alpha amd64 armel armhf hppa i386 mips mips64el mips powerpc powerpcspe sh4 sparc64 x32], diff --git a/debian/rules b/debian/rules index def089d..2b52318 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,6 @@ override_dh_fixperms-indep: chmod 755 debian/x11-common/etc/X11/Xsession override_dh_gencontrol: - dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \ - -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) + dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) # vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index 9bedfab..37d652b 100644 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -8,6 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index 8d0e467..b8a1944 100644 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -11,9 +11,3 @@ XSERVER_XORG_VIDEO_DEPENDS=" \ xserver-xorg-video-vesa, \ xserver-xorg-video-vmware, \ " - - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-vmmouse, \ - xserver-xorg-input-synaptics, \ -" diff --git a/debian/scripts/vars.arm64 b/debian/scripts/vars.arm64 index 8ce095a..d6e436e 100644 --- a/debian/scripts/vars.arm64 +++ b/debian/scripts/vars.arm64 @@ -1,8 +1,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ " - -XSERVER_XORG_INPUT_DEPENDS="\ - xserver-xorg-input-evdev, \ -" - diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel index 9bedfab..37d652b 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -8,6 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf index 4519bc7..7fad9c9 100644 --- a/debian/scripts/vars.armhf +++ b/debian/scripts/vars.armhf @@ -8,7 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-nouveau, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics, \ -" diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa index 062d4cf..fedeb81 100644 --- a/debian/scripts/vars.hppa +++ b/debian/scripts/vars.hppa @@ -6,6 +6,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386 index 27d2100..667710b 100644 --- a/debian/scripts/vars.hurd-i386 +++ b/debian/scripts/vars.hurd-i386 @@ -8,6 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ xserver-xorg-video-vmware, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \ - xserver-xorg-input-mouse" diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index 8d0e467..b8a1944 100644 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -11,9 +11,3 @@ XSERVER_XORG_VIDEO_DEPENDS=" \ xserver-xorg-video-vesa, \ xserver-xorg-video-vmware, \ " - - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-vmmouse, \ - xserver-xorg-input-synaptics, \ -" diff --git a/debian/scripts/vars.kfreebsd-amd64 b/debian/scripts/vars.kfreebsd-amd64 index 2b6e68a..a17a0e8 100644 --- a/debian/scripts/vars.kfreebsd-amd64 +++ b/debian/scripts/vars.kfreebsd-amd64 @@ -7,6 +7,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-ati, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \ - xserver-xorg-input-mouse" diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386 index 2b6e68a..a17a0e8 100644 --- a/debian/scripts/vars.kfreebsd-i386 +++ b/debian/scripts/vars.kfreebsd-i386 @@ -7,6 +7,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-ati, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, \ - xserver-xorg-input-mouse" diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k index 9f6a1d2..37d652b 100644 --- a/debian/scripts/vars.m68k +++ b/debian/scripts/vars.m68k @@ -8,7 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" -# xserver-xorg-input-wacom diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips index 9bedfab..37d652b 100644 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -8,6 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc index ee78f12..1e29f3c 100644 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc @@ -7,7 +7,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ xserver-xorg-video-nouveau, \ " - - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64 index 0204ee0..f1e0925 100644 --- a/debian/scripts/vars.ppc64 +++ b/debian/scripts/vars.ppc64 @@ -5,6 +5,3 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ xserver-xorg-video-fbdev, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.ppc64el b/debian/scripts/vars.ppc64el index e963f06..6f125d5 100644 --- a/debian/scripts/vars.ppc64el +++ b/debian/scripts/vars.ppc64el @@ -1,7 +1,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ " - -XSERVER_XORG_INPUT_DEPENDS="\ - xserver-xorg-input-evdev, \ -" diff --git a/debian/scripts/vars.s390x b/debian/scripts/vars.s390x index 1bfe0d3..66b5a22 100644 --- a/debian/scripts/vars.s390x +++ b/debian/scripts/vars.s390x @@ -4,5 +4,3 @@ # This file gets included by both debian/rules (make) AND the scripts in # debian/scripts (Bourne shell). XSERVER_XORG_VIDEO_DEPENDS="" - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-void" diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4 index 9bedfab..37d652b 100644 --- a/debian/scripts/vars.sh4 +++ b/debian/scripts/vars.sh4 @@ -8,6 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.sparc64 b/debian/scripts/vars.sparc64 index 9bedfab..37d652b 100644 --- a/debian/scripts/vars.sparc64 +++ b/debian/scripts/vars.sparc64 @@ -8,6 +8,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-fbdev, \ xserver-xorg-video-vesa, \ " - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" commit 51fa8b62039434d6622b93678262df075b31334d Author: Andreas Boll <[email protected]> Date: Wed Sep 9 16:31:27 2015 +0200 Inline XSERVER_XORG_VIDEO_RECOMMENDS into control. diff --git a/debian/control b/debian/control index 475f084..42dfb99 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Depends: ${F:XServer-Xorg-Video-Depends}, ${misc:Depends}, Recommends: - ${F:XServer-Xorg-Video-Recommends}, + xserver-xorg-video-qxl [amd64 i386 x32], Replaces: xserver-xorg-driver-all Conflicts: xserver-xorg-driver-all Description: X.Org X server -- output driver metapackage diff --git a/debian/rules b/debian/rules index 20971c6..def089d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,7 +30,6 @@ override_dh_fixperms-indep: override_dh_gencontrol: dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \ - -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \ - -VF:XServer-Xorg-Video-Recommends=$(XSERVER_XORG_VIDEO_RECOMMENDS) + -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) # vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64 index c8b6841..8d0e467 100644 --- a/debian/scripts/vars.amd64 +++ b/debian/scripts/vars.amd64 @@ -13,10 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS=" \ " -XSERVER_XORG_VIDEO_RECOMMENDS="\ - xserver-xorg-video-qxl, \ -" - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-vmmouse, \ xserver-xorg-input-synaptics, \ diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386 index c16274e..8d0e467 100644 --- a/debian/scripts/vars.i386 +++ b/debian/scripts/vars.i386 @@ -13,11 +13,6 @@ XSERVER_XORG_VIDEO_DEPENDS=" \ " -XSERVER_XORG_VIDEO_RECOMMENDS=" \ - xserver-xorg-video-qxl, \ -" - - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-vmmouse, \ xserver-xorg-input-synaptics, \ diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc index 2be4c17..ee78f12 100644 --- a/debian/scripts/vars.powerpc +++ b/debian/scripts/vars.powerpc @@ -9,8 +9,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \ " -XSERVER_XORG_VIDEO_RECOMMENDS="" - - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics" commit 7ef67202cd1ccf69ff737005520f086153a10f42 Author: Andreas Boll <[email protected]> Date: Wed Sep 9 16:25:07 2015 +0200 Inline XSERVER_XORG_INPUT_RECOMMENDS into control. diff --git a/debian/control b/debian/control index e549561..475f084 100644 --- a/debian/control +++ b/debian/control @@ -68,7 +68,7 @@ Depends: ${F:XServer-Xorg-Input-Depends}, ${misc:Depends}, Recommends: - ${F:XServer-Xorg-Input-Recommends}, + xserver-xorg-input-wacom [alpha amd64 armel armhf hppa i386 mips mips64el mips powerpc powerpcspe sh4 sparc64 x32], Description: X.Org X server -- input driver metapackage This package depends on the full suite of input drivers for the X.Org X server (Xorg). It does not provide any drivers itself, and may be removed if you wish diff --git a/debian/rules b/debian/rules index 51a275e..20971c6 100755 --- a/debian/rules +++ b/debian/rules @@ -31,7 +31,6 @@ override_dh_fixperms-indep: override_dh_gencontrol: dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \ -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \ - -VF:XServer-Xorg-Video-Recommends=$(XSERVER_XORG_VIDEO_RECOMMENDS) \ - -VF:XServer-Xorg-Input-Recommends=$(XSERVER_XORG_INPUT_RECOMMENDS) + -VF:XServer-Xorg-Video-Recommends=$(XSERVER_XORG_VIDEO_RECOMMENDS) # vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index 9ef4ba8..9bedfab 100644 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -11,6 +11,3 @@ XSERVER_XORG_VIDEO_DEPENDS="\ XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
