xorg: Changes to 'ubuntu'
debian/changelog | 26 +++++++++++++++++++++++---
debian/control | 5 -----
debian/scripts/vars.amd64 | 3 ++-
debian/scripts/vars.armel | 3 ++-
debian/scripts/vars.i386 | 3 ++-
debian/scripts/vars.powerpc | 3 ++-
debian/xserver-xorg.postinst.in | 4 +---
7 files changed, 32 insertions(+), 15 deletions(-)
New commits:
commit 00d476fcc78e9d090c3e1e3902e5865428a64113
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Jan 25 14:14:49 2010 +0200
Add wacom back to -input-all.
diff --git a/debian/changelog b/debian/changelog
index 0facad0..871aa69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,19 @@
xorg (1:7.5+1ubuntu2) UNRELEASED; urgency=low
- [Didier Roche]
+ [ Didier Roche ]
* debian/local/Xsession.d/20x11-common_process-args: Add support for
session command containing args (LP: #512235)
- [Bryce Harrington]
+ [ Bryce Harrington ]
* debian/local/Failsafe/failsafeXinit: Remove all use of dexconf, as it
no longer does anything interesting. Instead, to restore a system to
default configuration, just remove the xorg.conf after backing it up.
* debian/local/Failsafe/failsafeDexconf: Drop script since it is no
longer needed by failsafe.
+ [ Timo Aaltonen ]
+ * Add wacom back to -input-all.
+
-- Bryce Harrington <bryce@ubuntu.com> Mon, 25 Jan 2010 01:53:45 -0800
xorg (1:7.5+1ubuntu1) lucid; urgency=low
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index acca002..ad6717b 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -33,4 +33,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse"
+ xserver-xorg-input-vmmouse, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index e99265e..52277a8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -31,4 +31,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 7aafa12..6355c64 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -36,4 +36,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse"
+ xserver-xorg-input-vmmouse, \
+ xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index 1246422..a3513d7 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -18,4 +18,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-v4l"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-synaptics"
+ xserver-xorg-input-synaptics, \
+ xserver-xorg-input-wacom"
commit 861ebf4a9bff151ca5cee0d84b39b250e7faf36f
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Jan 9 00:39:35 2010 +0200
Release 1:7.5+1ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 0478025..e47734d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg (1:7.5+1ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.5+1ubuntu1) lucid; urgency=low
* Merge from Debian unstable.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 09 Jan 2010 00:38:00 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 09 Jan 2010 00:38:46 +0200
xorg (1:7.5+1) unstable; urgency=low
commit 90be005c1f996a14c67ad7d48d43f0a9b3c48d85
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 6 16:45:32 2010 +0000
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 141f14f..812f08f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-xorg (1:7.5+1) UNRELEASED; urgency=low
+xorg (1:7.5+1) unstable; urgency=low
* Drop xorg-dev dependency on x11proto-xf86misc-dev and libxxf86misc-dev,
which are obsolete.
* Same with x11proto-trap-dev and libxtrap-dev.
* The call to udevadm trigger has moved to xserver-xorg-core and the
drivers, remove it from xserver-xorg.postinst.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Sun, 06 Dec 2009 14:06:59 +0100
+ -- Julien Cristau <jcristau@debian.org> Wed, 06 Jan 2010 16:45:28 +0000
xorg (1:7.5~3) experimental; urgency=low
commit 8bf4fde7ee5569dfbeb801e830aefa8cf446b75e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 6 16:44:24 2010 +0000
Remove the call to udevadm trigger from xserver-xorg.postinst
It has moved to xserver-xorg-core and the drivers.
diff --git a/debian/changelog b/debian/changelog
index 73e2c0b..141f14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xorg (1:7.5~4) UNRELEASED; urgency=low
+xorg (1:7.5+1) UNRELEASED; urgency=low
* Drop xorg-dev dependency on x11proto-xf86misc-dev and libxxf86misc-dev,
which are obsolete.
* Same with x11proto-trap-dev and libxtrap-dev.
+ * The call to udevadm trigger has moved to xserver-xorg-core and the
+ drivers, remove it from xserver-xorg.postinst.
-- Julien Cristau <jcristau@debian.org> Sun, 06 Dec 2009 14:06:59 +0100
diff --git a/debian/control b/debian/control
index 19beb4e..94a9f0f 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,6 @@ Depends:
xserver-xorg-video-all | xserver-xorg-video-6,
xserver-xorg-input-all | xserver-xorg-input-7,
xserver-xorg-input-evdev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc sparc],
- udev [linux-any],
hal (>= 0.5.12~git20090406) [kfreebsd-any],
${shlibs:Depends},
${misc:Depends},
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index b3f25ed..5b38145 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -146,9 +146,7 @@ case "$1" in
update-rc.d xserver-xorg remove || true
fi
if dpkg --compare-versions "$2" lt "1:7.5~3"; then
- if [ `uname -s` = "Linux" ]; then
- udevadm trigger --subsystem-match=input --action=change
- elif [ `uname -s` = "GNU/kFreeBSD" ]; then
+ if [ `uname -s` = "GNU/kFreeBSD" ]; then
invoke-rc.d hal restart >/dev/null
fi
fi
commit 16cce1e3a3717ad66b7fa7f29ec91239fe8a33bf
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 6 14:09:49 2009 +0100
RIP XTrap
diff --git a/debian/changelog b/debian/changelog
index 61fe9bb..73e2c0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg (1:7.5~4) UNRELEASED; urgency=low
* Drop xorg-dev dependency on x11proto-xf86misc-dev and libxxf86misc-dev,
which are obsolete.
+ * Same with x11proto-trap-dev and libxtrap-dev.
-- Julien Cristau <jcristau@debian.org> Sun, 06 Dec 2009 14:06:59 +0100
diff --git a/debian/control b/debian/control
index 4fa60a0..19beb4e 100644
--- a/debian/control
+++ b/debian/control
@@ -188,7 +188,6 @@ Depends:
libxres-dev,
libxss-dev,
libxt-dev,
- libxtrap-dev,
libxtst-dev,
libxv-dev,
libxvmc-dev,
@@ -211,7 +210,6 @@ Depends:
x11proto-render-dev,
x11proto-resource-dev,
x11proto-scrnsaver-dev,
- x11proto-trap-dev,
x11proto-video-dev,
x11proto-xcmisc-dev,
x11proto-xext-dev,
commit 61ef793e34a6fbac953345a97bd099c21ed3244f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 6 14:07:16 2009 +0100
RIP XFree86-Misc
Drop xorg-dev dependency on xf86misc proto and lib, which are obsolete.
diff --git a/debian/changelog b/debian/changelog
index d43a8f1..61fe9bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.5~4) UNRELEASED; urgency=low
+
+ * Drop xorg-dev dependency on x11proto-xf86misc-dev and libxxf86misc-dev,
+ which are obsolete.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 06 Dec 2009 14:06:59 +0100
+
xorg (1:7.5~3) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 6442167..4fa60a0 100644
--- a/debian/control
+++ b/debian/control
@@ -193,7 +193,6 @@ Depends:
libxv-dev,
libxvmc-dev,
libxxf86dga-dev,
- libxxf86misc-dev,
libxxf86vm-dev,
x11proto-bigreqs-dev,
x11proto-composite-dev,
@@ -219,7 +218,6 @@ Depends:
x11proto-xf86bigfont-dev,
x11proto-xf86dga-dev,
x11proto-xf86dri-dev,
- x11proto-xf86misc-dev,
x11proto-xf86vidmode-dev,
x11proto-xinerama-dev,
xserver-xorg-dev,
Reply to: