debian/changelog | 2 ++ debian/scripts/vars.alpha | 2 -- debian/scripts/vars.armel | 2 -- debian/scripts/vars.kfreebsd-i386 | 2 -- debian/scripts/vars.m68k | 2 -- debian/scripts/vars.mips | 2 -- debian/scripts/vars.mips64el | 1 + debian/scripts/vars.mipsel | 26 +------------------------- debian/scripts/vars.powerpcspe | 25 +------------------------ debian/scripts/vars.sh4 | 2 -- 10 files changed, 5 insertions(+), 61 deletions(-)
New commits: commit ffa533b4c9b94288dd326772be5fb0da382b2afd Author: Andreas Boll <[email protected]> Date: Wed Sep 9 14:42:37 2015 +0200 Add support for mips64el by symlinking to vars.mips (Closes: #755482). diff --git a/debian/changelog b/debian/changelog index ab74679..d00da3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ 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). -- Andreas Boll <[email protected]> Mon, 31 Aug 2015 18:37:12 +0200 diff --git a/debian/scripts/vars.mips64el b/debian/scripts/vars.mips64el new file mode 120000 index 0000000..a22a1dd --- /dev/null +++ b/debian/scripts/vars.mips64el @@ -0,0 +1 @@ +vars.mips \ No newline at end of file commit bd9bbd46fc03516c9daff11acff453293772160d Author: Andreas Boll <[email protected]> Date: Wed Sep 9 14:41:17 2015 +0200 Use some more symlinks for vars files. diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel deleted file mode 100644 index 09e4728..0000000 --- a/debian/scripts/vars.mipsel +++ /dev/null @@ -1,23 +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-cirrus, \ - xserver-xorg-video-fbdev, \ - xserver-xorg-video-mga, \ - xserver-xorg-video-neomagic, \ - xserver-xorg-video-savage, \ - xserver-xorg-video-sisusb, \ - xserver-xorg-video-tdfx, \ - xserver-xorg-video-trident, \ - xserver-xorg-video-vesa, \ -" - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" - - -XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel new file mode 120000 index 0000000..a22a1dd --- /dev/null +++ b/debian/scripts/vars.mipsel @@ -0,0 +1 @@ +vars.mips \ No newline at end of file diff --git a/debian/scripts/vars.powerpcspe b/debian/scripts/vars.powerpcspe deleted file mode 100644 index fb34f2b..0000000 --- a/debian/scripts/vars.powerpcspe +++ /dev/null @@ -1,24 +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-mga, \ - xserver-xorg-video-nouveau, \ - xserver-xorg-video-savage, \ - xserver-xorg-video-sisusb, \ - xserver-xorg-video-tdfx, \ - xserver-xorg-video-trident, \ -" - - -XSERVER_XORG_VIDEO_RECOMMENDS="" - - -XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ - xserver-xorg-input-synaptics" - - -XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom" diff --git a/debian/scripts/vars.powerpcspe b/debian/scripts/vars.powerpcspe new file mode 120000 index 0000000..436aac0 --- /dev/null +++ b/debian/scripts/vars.powerpcspe @@ -0,0 +1 @@ +vars.powerpc \ No newline at end of file commit 338967bb991cab25a1eebbc14837757a26d7789b Author: Andreas Boll <[email protected]> Date: Wed Sep 9 14:26:36 2015 +0200 Drop commented out xserver-xorg-video-glide from vars files. diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha index 4ebf9fb..09e4728 100644 --- a/debian/scripts/vars.alpha +++ b/debian/scripts/vars.alpha @@ -16,8 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ " -# , xserver-xorg-video-glide, - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel index b8796b8..09e4728 100644 --- a/debian/scripts/vars.armel +++ b/debian/scripts/vars.armel @@ -16,8 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ " -# xserver-xorg-video-glide, - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386 index 8240301..92566f8 100644 --- a/debian/scripts/vars.kfreebsd-i386 +++ b/debian/scripts/vars.kfreebsd-i386 @@ -15,7 +15,5 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ " -# xserver-xorg-video-glide, - 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 25b9700..af679d6 100644 --- a/debian/scripts/vars.m68k +++ b/debian/scripts/vars.m68k @@ -16,8 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ " -# xserver-xorg-video-glide, - 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 b550e42..09e4728 100644 --- a/debian/scripts/vars.mips +++ b/debian/scripts/vars.mips @@ -16,8 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ " -# xserver-xorg-video-glide - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel index b8796b8..09e4728 100644 --- a/debian/scripts/vars.mipsel +++ b/debian/scripts/vars.mipsel @@ -16,8 +16,6 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vesa, \ " -# xserver-xorg-video-glide, - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics" diff --git a/debian/scripts/vars.sh4 b/debian/scripts/vars.sh4 index ca4209d..a0ec9df 100644 --- a/debian/scripts/vars.sh4 +++ b/debian/scripts/vars.sh4 @@ -18,8 +18,6 @@ XSERVER_XORG_VIDEO_DEPENDS="\ xserver-xorg-video-vga, \ " -# xserver-xorg-video-glide, - XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \ xserver-xorg-input-synaptics"
