debian/changelog | 118 +++++++++++++++++
debian/compat | 2
debian/control | 182 ++++++++++++++++++++++----
debian/local/debian-setup-keyboard | 2
debian/local/debian-x11-keymap.fdi | 16 --
debian/local/xserver-wrapper.c | 37 ++---
debian/rules | 48 +++----
debian/scripts/vars.hurd-i386 | 1
debian/scripts/vars.kfreebsd-amd64 | 1
debian/scripts/vars.kfreebsd-i386 | 1
debian/scripts/vars.lpia | 43 ------
debian/x11-common.NEWS | 7 -
debian/x11-common.lintian-overrides | 4
debian/x11-common.templates | 2
debian/xorg.lintian-overrides | 5
debian/xserver-xorg.NEWS | 10 -
debian/xserver-xorg.install | 2
debian/xserver-xorg.lintian-overrides | 3
debian/xserver-xorg.postinst.in | 8 -
debian/xsfbs/xsfbs.mk | 21 ---
debian/xsfbs/xsfbs.sh | 233 ----------------------------------
21 files changed, 346 insertions(+), 400 deletions(-)
New commits:
commit 97085a7342dd86c4c0075b6ed0b4b89fb659d973
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Dec 3 11:55:57 2009 +0200
Modify the changelog.
diff --git a/debian/changelog b/debian/changelog
index 05c201e..90c7a19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ xorg (1:7.5~3ubuntu1) UNRELEASED; urgency=low
- apport/source_xorg.py, x11-common.install, x11-common.links:
+ apport hook for xorg-server crashes
- control:
- + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
- + Add xinput to xorg Depends so xinput will stay in main
+ + Add xqbiff (<= 0.75-4) to x11-common Conflicts (LP 217724).
+ + Add xinput to xorg Depends so it will stay in main
+ Move xfonts-scalable to Recommends (LP 84938)
- rules, control:
+ Add a dependency to x11-common for each binary built to save
@@ -18,29 +18,23 @@ xorg (1:7.5~3ubuntu1) UNRELEASED; urgency=low
+ If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last
0.5MiB to avoid having it grow indefinitively. (This does not happen
with gdm anyway since gdm cleans the file on login).
- - local/Xsession.d/60x11-common_localhost:
- + Allow X connections from local unix domain sockets instead of
- forcing TCP since hostname validation is not necessary in this case.
- (LP 276357)
+ - local/Xsession.d/60x11-common_localhost: Allow X connections from
+ local unix domain sockets instead of forcing TCP since hostname
+ validation is not necessary in this case. (LP 276357)
- local/dexconf:
+ Add extra bits for ps3fb xorg.conf.
+ dexconf: Bring Device back to the Screen-section, nvidia-settings
and aticonfig need that.
+ Add customizations to detect if running in KVM/VBOX environment
and specify the driver, H/V rates, DefaultDepth, etc.
- - local/xserver-wrapper.c:
- + Stop handling -config specifically in the wrapper, as Xorg now
- handles this itself.
- - scripts/vars.*:
- + Don't include radeonhd in video-all.
- - scripts/vars.i386:
- + Add geode to video-all.
- - scripts/vars.{i386,amd64}:
- + Add vmmouse (LP 407816).
- - x11-common.postinst.in, postrm.in, preinst.in:
- + Remove old configuration files.
- - xserver-xorg.postinst.in:
- + Migrate psb users to vesa.
+ - local/xserver-wrapper.c: Stop handling -config specifically in the
+ wrapper, as Xorg now handles this itself.
+ - scripts/vars.*: Don't include radeonhd in video-all.
+ - scripts/vars.i386: Add geode to video-all.
+ - scripts/vars.{i386,amd64}: Add vmmouse (LP 407816).
+ - x11-common.postinst.in, postrm.in, preinst.in: Remove old configuration
+ files.
+ - xserver-xorg.postinst.in: Migrate psb users to vesa.
* control: Drop Breaks on gdm, since it was only needed during karmic.
Likewise for Conflicts/Replaces hal.
commit 6abbf5716c5c6154309ffc78e7bfa5b0505b9581
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Dec 3 11:46:22 2009 +0200
Delete vars.lpia. The arch is dead.
diff --git a/debian/scripts/vars.lpia b/debian/scripts/vars.lpia
deleted file mode 100755
index dfe14c1..0000000
--- a/debian/scripts/vars.lpia
+++ /dev/null
@@ -1,43 +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-apm, \
- xserver-xorg-video-ark, \
- xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
- xserver-xorg-video-cirrus, \
- xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
- xserver-xorg-video-i740, \
- xserver-xorg-video-intel, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-nv, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
- xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
- xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
- xserver-xorg-video-vmware, \
- xserver-xorg-video-v4l"
-
-# xserver-xorg-video-glide,
-
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
- xserver-xorg-input-kbd, \
- xserver-xorg-input-mouse, \
- xserver-xorg-input-synaptics, \
- xserver-xorg-input-vmmouse, \
- xserver-xorg-input-wacom"
-
-XSERVER_XORG_DETECT_DEPENDS="dmidecode"
-
commit f6c5e5bc935895f648d66d8515275db8124a5eb4
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Dec 3 11:40:44 2009 +0200
Move xfonts-scalable back to Recommends.
diff --git a/debian/control b/debian/control
index 66cab78..1824ede 100644
--- a/debian/control
+++ b/debian/control
@@ -134,7 +134,6 @@ Depends:
xfonts-base (>= 1:1.0.0-1),
xfonts-100dpi (>= 1:1.0.0-1),
xfonts-75dpi (>= 1:1.0.0-1),
- xfonts-scalable (>= 1:1.0.0-1),
x11-apps,
x11-session-utils,
x11-utils,
@@ -150,6 +149,8 @@ Depends:
${misc:Depends},
x11-common,
xinput,
+Recommends:
+ xfonts-scalable (>= 1:1.0.0-1),
Provides: x-window-system, x-window-system-core
Suggests: xorg-docs
Description: X.Org X Window System
commit 3c0c5033d924742bcacedeff322204f053d2ebb0
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Dec 3 11:39:00 2009 +0200
control: Drop Breaks on gdm, since it was only needed during karmic.
Likewise for Conflicts/Replaces hal.
diff --git a/debian/changelog b/debian/changelog
index 7423df4..05c201e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ xorg (1:7.5~3ubuntu1) UNRELEASED; urgency=low
+ Remove old configuration files.
- xserver-xorg.postinst.in:
+ Migrate psb users to vesa.
+ * control: Drop Breaks on gdm, since it was only needed during karmic.
+ Likewise for Conflicts/Replaces hal.
-- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 03 Dec 2009 11:03:17 +0200
diff --git a/debian/control b/debian/control
index cf8fe66..66cab78 100644
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,6 @@ Conflicts: xfree86-common, xorg-common, xserver-common (<<
7), x-common,
ucbmpeg-play (<< 2.3p-13), netscape-base-4, communicator-smotif-477, epan,
navigator-smotif-477, stella (<< 2.2-1), xfractint (<< 20.3.01-1), xgobi,
xpostitplus, xisp, vide (<= 1.21-3), xqbiff (<= 0.75-4)
-Breaks: gdm (<= 2.20.10-0ubuntu3)
Replaces: xfree86-common, xorg-common, xserver-common (<< 7), x-common
Description: X Window System (X.Org) infrastructure
x11-common contains the filesystem infrastructure required for further
@@ -82,8 +81,8 @@ Description: X Window System (X.Org) infrastructure
Package: xserver-xorg
Architecture: any
-Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7),
x11-common (<< 1:7.3+11), hal (<= 0.5.12+git20090626-0ubuntu1)
-Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11), hal (<=
0.5.12+git20090626-0ubuntu1)
+Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7),
x11-common (<< 1:7.3+11)
+Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends:
xserver-xorg-core (>= 2:1.7),
xserver-xorg-video-all | xserver-xorg-video-6,
commit e891e4c9354703fd29caa3faebd6f50c5471e92e
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Thu Dec 3 11:35:28 2009 +0200
Update the changelog.
diff --git a/debian/changelog b/debian/changelog
index 363be04..7423df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+xorg (1:7.5~3ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from Debian experimental. Remaining changes:
+ - apport/source_xorg.py, x11-common.install, x11-common.links:
+ + apport hook for xorg-server crashes
+ - control:
+ + Add xqbiff (<= 0.75-4) to the list of x11-common Conflicts.
+ + Add xinput to xorg Depends so xinput will stay in main
+ + Move xfonts-scalable to Recommends (LP 84938)
+ - rules, control:
+ + Add a dependency to x11-common for each binary built to save
+ disk/livecd space.
+ + Symlink the doc directories to x11-common, explicitly remove the
+ doc directories on upgrade for the now symlinked doc directories
+ - local/Failsafe/*, x11-common.install, x11-common.failsafe-x.upstart,
+ rules: Bulletproof-X.
+ - local/Xsession:
+ + If ~/.xsession-errors is bigger than 0.5MiB, truncate it to the last
+ 0.5MiB to avoid having it grow indefinitively. (This does not happen
+ with gdm anyway since gdm cleans the file on login).
+ - local/Xsession.d/60x11-common_localhost:
+ + Allow X connections from local unix domain sockets instead of
+ forcing TCP since hostname validation is not necessary in this case.
+ (LP 276357)
+ - local/dexconf:
+ + Add extra bits for ps3fb xorg.conf.
+ + dexconf: Bring Device back to the Screen-section, nvidia-settings
+ and aticonfig need that.
+ + Add customizations to detect if running in KVM/VBOX environment
+ and specify the driver, H/V rates, DefaultDepth, etc.
+ - local/xserver-wrapper.c:
+ + Stop handling -config specifically in the wrapper, as Xorg now
+ handles this itself.
+ - scripts/vars.*:
+ + Don't include radeonhd in video-all.
+ - scripts/vars.i386:
+ + Add geode to video-all.
+ - scripts/vars.{i386,amd64}:
+ + Add vmmouse (LP 407816).
+ - x11-common.postinst.in, postrm.in, preinst.in:
+ + Remove old configuration files.
+ - xserver-xorg.postinst.in:
+ + Migrate psb users to vesa.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 03 Dec 2009 11:03:17 +0200
+
xorg (1:7.5~3) experimental; urgency=low
[ Julien Cristau ]
commit 839292d65ab3af0c45c2ee299dfb7d932b6958a0
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Dec 2 16:21:09 2009 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index dabc2e2..d43a8f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xorg (1:7.5~3) UNRELEASED; urgency=low
+xorg (1:7.5~3) experimental; urgency=low
+ [ Julien Cristau ]
* On upgrade, restart hal on kfreebsd and run udevadm trigger on linux to
make sure we can pick up input devices correctly.
* Because of the above, move udev and hal from Recommends back to Depends.
- -- Julien Cristau <jcris...@debian.org> Mon, 30 Nov 2009 21:24:02 +0100
+ [ Brice Goglin ]
+ * Add myself to Uploaders, remove Branden with his permission.
+
+ -- Brice Goglin <bgog...@debian.org> Wed, 02 Dec 2009 16:27:15 +0100
xorg (1:7.5~2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 766c6be..6442167 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusi...@debian.org>, Branden Robinson
<bran...@debian.org>, Drew Parsons <dpars...@debian.org>, Julien Cristau
<jcris...@debian.org>
+Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.org>, Julien Cristau <jcris...@debian.org>, Brice Goglin
<bgog...@debian.org>
Standards-Version: 3.8.3
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7)
commit 74baf0d8e441147d883e123b3bee9ab989af9551
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Nov 30 21:29:33 2009 +0100
Handle upgrades correctly, and trigger udev instead of hal on Linux
* On upgrade, restart hal on kfreebsd and run udevadm trigger on linux to
make sure we can pick up input devices correctly.
* Because of the above, move udev and hal from Recommends back to Depends.
diff --git a/debian/changelog b/debian/changelog
index 0476ee1..dabc2e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5~3) UNRELEASED; urgency=low
+
+ * On upgrade, restart hal on kfreebsd and run udevadm trigger on linux to
+ make sure we can pick up input devices correctly.
+ * Because of the above, move udev and hal from Recommends back to Depends.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 30 Nov 2009 21:24:02 +0100
+
xorg (1:7.5~2) experimental; urgency=low
* Drop xorg-dev dependency on libxkbui-dev, which has no users.
diff --git a/debian/control b/debian/control
index 064c770..766c6be 100644
--- a/debian/control
+++ b/debian/control
@@ -87,14 +87,14 @@ 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},
xkb-data (>= 1.4),
x11-xkb-utils
Recommends:
libgl1-mesa-dri,
- udev [linux-any],
- hal (>= 0.5.12~git20090406) [kfreebsd-any],
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server. It does not provide the actual server itself.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index f7ae600..b3f25ed 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -145,8 +145,12 @@ case "$1" in
if dpkg --compare-versions "$2" lt-nl "1:7.3+13"; then
update-rc.d xserver-xorg remove || true
fi
- if dpkg --compare-versions "$2" lt "1:7.4"; then
- invoke-rc.d hal restart >/dev/null
+ 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
+ invoke-rc.d hal restart >/dev/null
+ fi
fi
;;
esac
commit 2260d71b68b74ed938621c2d200d2ebc2bdffade
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 20:10:59 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7e9d044..0476ee1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.5~2) UNRELEASED; urgency=low
+xorg (1:7.5~2) experimental; urgency=low
* Drop xorg-dev dependency on libxkbui-dev, which has no users.
* Update xorg-dev long description. There are no static-only X libs
@@ -21,7 +21,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* Add lintian overrides for xorg, x11-common and xserver-xorg.
* Bump Standards-Version to 3.8.3.
- -- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
+ -- Julien Cristau <jcris...@debian.org> Sat, 28 Nov 2009 20:10:31 +0100
xorg (1:7.5~1) experimental; urgency=low
commit 1df00484ecfc7019e74a659d3abe65ae1c0bc875
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 20:09:36 2009 +0100
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 17595a3..7e9d044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* x11-common.templates: use "for internal use" instead of "internal use
only" in Description (lintian).
* Add lintian overrides for xorg, x11-common and xserver-xorg.
+ * Bump Standards-Version to 3.8.3.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/control b/debian/control
index 8b52d09..064c770 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusi...@debian.org>, Branden Robinson
<bran...@debian.org>, Drew Parsons <dpars...@debian.org>, Julien Cristau
<jcris...@debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7)
Package: x11-common
commit 7b2f0837374fd8d8cbcdda657240a8f71926d568
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 20:01:40 2009 +0100
Add lintian overrides for xorg, x11-common and xserver-xorg.
diff --git a/debian/changelog b/debian/changelog
index 8c65d38..17595a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* x11-common.NEWS: fix syntax (lintian).
* x11-common.templates: use "for internal use" instead of "internal use
only" in Description (lintian).
+ * Add lintian overrides for xorg, x11-common and xserver-xorg.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/rules b/debian/rules
index a2ee2cd..a3b6616 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ binary-indep: build install
dh_installchangelogs
dh_installinit -px11-common -u'start 70 S .'
dh_installman
+ dh_lintian
dh_link
dh_compress
dh_fixperms
@@ -107,6 +108,7 @@ endif
dh_installexamples
dh_installman
dh_installchangelogs
+ dh_lintian
dh_link
dh_strip
dh_compress
diff --git a/debian/x11-common.lintian-overrides
b/debian/x11-common.lintian-overrides
new file mode 100644
index 0000000..8f1ad26
--- /dev/null
+++ b/debian/x11-common.lintian-overrides
@@ -0,0 +1,4 @@
+# it's a symlink
+x11-common: binary-without-manpage usr/bin/X11
+# yes, we know
+x11-common: symlink-is-self-recursive usr/bin/X11 .
diff --git a/debian/xorg.lintian-overrides b/debian/xorg.lintian-overrides
new file mode 100644
index 0000000..47d7aae
--- /dev/null
+++ b/debian/xorg.lintian-overrides
@@ -0,0 +1,5 @@
+# xorg is thpethial
+xorg: package-depends-on-an-x-font-package depends: xfonts-base (>= 1:1.0.0-1)
+xorg: package-depends-on-an-x-font-package depends: xfonts-100dpi (>=
1:1.0.0-1)
+xorg: package-depends-on-an-x-font-package depends: xfonts-75dpi (>= 1:1.0.0-1)
+xorg: package-depends-on-an-x-font-package depends: xfonts-scalable (>=
1:1.0.0-1)
diff --git a/debian/xserver-xorg.lintian-overrides
b/debian/xserver-xorg.lintian-overrides
new file mode 100644
index 0000000..63b4e63
--- /dev/null
+++ b/debian/xserver-xorg.lintian-overrides
@@ -0,0 +1,3 @@
+# the X manpage is in xorg-docs
+xserver-xorg: binary-without-manpage usr/bin/X
+xserver-xorg: setuid-gid-binary usr/bin/X 6755 root/root
commit 929712d3527763b627795b76ac9a0b7782006520
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 20:00:12 2009 +0100
x11-common.templates: avoid lintian warning
use "for internal use" instead of "internal use only" in Description.
diff --git a/debian/changelog b/debian/changelog
index fc28faf..8c65d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* xserver-xorg.NEWS: /etc/default/console-setup moved to
/etc/default/keyboard. Also note that evdev is Linux-only.
* x11-common.NEWS: fix syntax (lintian).
+ * x11-common.templates: use "for internal use" instead of "internal use
+ only" in Description (lintian).
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/x11-common.templates b/debian/x11-common.templates
index 170d6e1..692139a 100644
--- a/debian/x11-common.templates
+++ b/debian/x11-common.templates
@@ -18,5 +18,5 @@ _Description: Users allowed to start the X server:
Template: x11-common/xwrapper/actual_allowed_users
Type: string
-Description: internal use only
+Description: for internal use
This template is never shown to the user and does not require translation.
commit 81f2348c9e209687acbbb4553cb9d631ab6403dd
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 19:59:08 2009 +0100
x11-common.NEWS: fix syntax (lintian).
diff --git a/debian/changelog b/debian/changelog
index d484078..fc28faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* Depend on xserver-xorg-core 1.7.
* xserver-xorg.NEWS: /etc/default/console-setup moved to
/etc/default/keyboard. Also note that evdev is Linux-only.
+ * x11-common.NEWS: fix syntax (lintian).
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/x11-common.NEWS b/debian/x11-common.NEWS
index 9b178e3..51281e8 100644
--- a/debian/x11-common.NEWS
+++ b/debian/x11-common.NEWS
@@ -1,6 +1,6 @@
x11-common (1:7.3+9) unstable; urgency=low
- * This release provides the ability to set session-wide environment
+ This release provides the ability to set session-wide environment
variables easily. If you have the file ".xsessionrc" in your home
directory it will be read (sourced) by the X session scripts during
login. This allows you to easily set environment variables in this file
@@ -12,14 +12,15 @@ x11-common (1:7.3+9) unstable; urgency=low
x11-common (1:7.0.11) unstable; urgency=low
- * With the change to X11R7, various paths have been changed, including
+ With the change to X11R7, various paths have been changed, including
where binaries are stored. In X11R6, binaries were installed to
/usr/X11R6/bin and /usr/bin/X11 was a symlink pointing to this
directory. Now binaries are installed to /usr/bin and /usr/bin/X11 is a
symlink that points to /usr/bin. As such, any legacy application that
installs its binaries to /usr/X11R6/bin may be outside your PATH, and
you will need to update the configuration on your system accordingly.
- * The Debian metapackages used to install all of the X Window System have
+
+ The Debian metapackages used to install all of the X Window System have
been changed with X11R7. They used to be named x-window-system and
x-window-system-core. Now there is only one metapackage named "xorg". It
is highly recommended that you install this metapackage in order to get
commit 4872bdf079948ac86fa79b21e4d0d0c71e5bc4ac
Author: Julien Cristau <jcris...@debian.org>
Date: Sat Nov 28 17:18:52 2009 +0100
Add bug closers
diff --git a/debian/changelog b/debian/changelog
index 5f0d69c..d484078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,13 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
nowadays.
* xorg-dev: don't depend on libxevie-dev.
* xserver-xorg-video-all: don't depend on -intel on non-linux.
- * Switch hal dependency to a recommends, and make it kfreebsd-only.
+ * Switch hal dependency to a recommends, and make it kfreebsd-only (closes:
+ #515214).
* Only install the hal fdi and callout on kfreebsd.
* Add 'Old Changelog' in debian/changelog to make lintian happy.
* Add ${misc:Depends} to all packages' Depends fields.
* Drop dependency on console-setup, xserver-xorg-core now pulls in
- keyboard-configuration.
+ keyboard-configuration (closes: #558236, #523960).
* Depend on xserver-xorg-core 1.7.
* xserver-xorg.NEWS: /etc/default/console-setup moved to
/etc/default/keyboard. Also note that evdev is Linux-only.
commit 60e4fbaf81744e78e48e20f4e6ff78233f2b86b0
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Nov 26 21:06:56 2009 +0100
xserver-xorg.NEWS: /etc/default/console-setup moved to
/etc/default/keyboard.
Also note that evdev is Linux-only.
diff --git a/debian/changelog b/debian/changelog
index a94fb87..5f0d69c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* Drop dependency on console-setup, xserver-xorg-core now pulls in
keyboard-configuration.
* Depend on xserver-xorg-core 1.7.
+ * xserver-xorg.NEWS: /etc/default/console-setup moved to
+ /etc/default/keyboard. Also note that evdev is Linux-only.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/xserver-xorg.NEWS b/debian/xserver-xorg.NEWS
index f59af5f..3d18418 100644
--- a/debian/xserver-xorg.NEWS
+++ b/debian/xserver-xorg.NEWS
@@ -6,7 +6,7 @@ xserver-xorg (1:7.4+1) unstable; urgency=low
statically in /etc/X11/xorg.conf. Instead, input devices are detected at
runtime (and can be hotplugged) and configured individually. The default
keyboard layout is shared with the console and is configured in
- /etc/default/console-setup. As a result, devices configured in xorg.conf to
+ /etc/default/keyboard. As a result, devices configured in xorg.conf to
use the mouse or kbd driver are ignored by the X server by default.
For more details, see:
@@ -15,10 +15,10 @@ xserver-xorg (1:7.4+1) unstable; urgency=low
* keycodes changes will break custom Xmodmaps
- As a result of using the evdev driver for keyboards, the keycodes for some
- keys are no longer the traditional xfree86 ones. This will break custom
- Xmodmaps relying on the old keycodes. You'll need to re-configure these
- custom maps with the new keycodes.
+ As a result of using the evdev driver for keyboards on Linux, the keycodes
+ for some keys are no longer the traditional xfree86 ones. This will break
+ custom Xmodmaps relying on the old keycodes. You'll need to re-configure
+ these custom maps with the new keycodes.
* Linux kernel configuration requirement
commit 9bd5f2c05b076bac4dfbefede6164d0ce3463a44
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Nov 26 20:09:28 2009 +0100
Depend on xserver-xorg-core 1.7.
diff --git a/debian/changelog b/debian/changelog
index f55b4e5..a94fb87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* Add ${misc:Depends} to all packages' Depends fields.
* Drop dependency on console-setup, xserver-xorg-core now pulls in
keyboard-configuration.
+ * Depend on xserver-xorg-core 1.7.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/control b/debian/control
index 855d022..8b52d09 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Architecture: any
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common (<< 7),
x11-common (<< 1:7.3+11)
Replaces: xserver-common (<< 7), x11-common (<< 1:7.3+11)
Depends:
- xserver-xorg-core (>= 2:1.5.99.901),
+ xserver-xorg-core (>= 2:1.7),
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],
commit e6d794734973f97985fd90417b8bf477dd167948
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Nov 26 20:08:43 2009 +0100
Drop dependency on console-setup, xserver-xorg-core now pulls in
keyboard-configuration.
diff --git a/debian/changelog b/debian/changelog
index 624b8d2..f55b4e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* Only install the hal fdi and callout on kfreebsd.
* Add 'Old Changelog' in debian/changelog to make lintian happy.
* Add ${misc:Depends} to all packages' Depends fields.
+ * Drop dependency on console-setup, xserver-xorg-core now pulls in
+ keyboard-configuration.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/control b/debian/control
index a6fa65a..855d022 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],
- console-setup (>= 1.29) | console-setup-mini (>= 1.29),
${shlibs:Depends},
${misc:Depends},
xkb-data (>= 1.4),
diff --git a/debian/local/debian-setup-keyboard
b/debian/local/debian-setup-keyboard
index 3c0a049..9693e44 100755
--- a/debian/local/debian-setup-keyboard
+++ b/debian/local/debian-setup-keyboard
@@ -5,7 +5,7 @@
[ -x /usr/bin/hal-set-property ] || exit 0
-. /etc/default/console-setup > /dev/null 2>&1 || exit 0
+. /etc/default/keyboard >/dev/null 2>&1 || exit 0
hal_set () {
if [ -n "$2" ]; then
commit 371e829d692c890105a090fea157de5789281ddc
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Nov 26 17:36:22 2009 +0100
Add ${misc:Depends} to all packages' Depends fields.
diff --git a/debian/changelog b/debian/changelog
index 2fdcfcb..624b8d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* Switch hal dependency to a recommends, and make it kfreebsd-only.
* Only install the hal fdi and callout on kfreebsd.
* Add 'Old Changelog' in debian/changelog to make lintian happy.
+ * Add ${misc:Depends} to all packages' Depends fields.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
diff --git a/debian/control b/debian/control
index 92fd164..a6fa65a 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,9 @@ Description: the X.Org X server
Package: xserver-xorg-video-all
Architecture: any
-Depends: ${F:XServer-Xorg-Video-Depends}
+Depends:
+ ${F:XServer-Xorg-Video-Depends},
+ ${misc:Depends},
Replaces: xserver-xorg-driver-all
Conflicts: xserver-xorg-driver-all
Description: the X.Org X server -- output driver metapackage
@@ -112,7 +114,9 @@ Description: the X.Org X server -- output driver metapackage
Package: xserver-xorg-input-all
Architecture: any
-Depends: ${F:XServer-Xorg-Input-Depends}
+Depends:
+ ${F:XServer-Xorg-Input-Depends},
+ ${misc:Depends},
Description: the 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
@@ -120,7 +124,28 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: any
-Depends: xserver-xorg, libgl1-mesa-glx | libgl1, libgl1-mesa-dri,
libglu1-mesa, xfonts-base (>= 1:1.0.0-1), xfonts-100dpi (>= 1:1.0.0-1),
xfonts-75dpi (>= 1:1.0.0-1), xfonts-scalable (>= 1:1.0.0-1), x11-apps,
x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils,
xauth, xinit, xfonts-utils, xkb-data, xorg-docs-core, xterm |
x-terminal-emulator
+Depends:
+ xserver-xorg,
+ libgl1-mesa-glx | libgl1,
+ libgl1-mesa-dri,
+ libglu1-mesa,
+ xfonts-base (>= 1:1.0.0-1),
+ xfonts-100dpi (>= 1:1.0.0-1),
+ xfonts-75dpi (>= 1:1.0.0-1),
+ xfonts-scalable (>= 1:1.0.0-1),
+ x11-apps,
+ x11-session-utils,
+ x11-utils,
+ x11-xfs-utils,
+ x11-xkb-utils,
+ x11-xserver-utils,
+ xauth,
+ xinit,
+ xfonts-utils,
+ xkb-data,
+ xorg-docs-core,
+ xterm | x-terminal-emulator,
+ ${misc:Depends},
Provides: x-window-system, x-window-system-core
Suggests: xorg-docs
Description: X.Org X Window System
@@ -136,7 +161,8 @@ Description: X.Org X Window System
Package: xorg-dev
Architecture: all
-Depends: libdmx-dev,
+Depends:
+ libdmx-dev,
libfontenc-dev,
libfs-dev,
libice-dev,
@@ -198,7 +224,8 @@ Depends: libdmx-dev,
x11proto-xf86vidmode-dev,
x11proto-xinerama-dev,
xserver-xorg-dev,
- xtrans-dev
+ xtrans-dev,
+ ${misc:Depends},
Description: the X.Org X Window System development libraries
This metapackage provides the development libraries for the X.Org X Window
System.
@@ -213,7 +240,9 @@ Description: the X.Org X Window System development libraries
Package: xlibmesa-gl
Section: libs
Architecture: all
-Depends: libgl1-mesa-glx
+Depends:
+ libgl1-mesa-glx,
+ ${misc:Depends},
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
@@ -221,7 +250,9 @@ Description: transitional package for Debian etch
Package: xlibmesa-gl-dev
Section: libdevel
Architecture: all
-Depends: libgl1-mesa-dev
+Depends:
+ libgl1-mesa-dev,
+ ${misc:Depends},
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
@@ -229,7 +260,9 @@ Description: transitional package for Debian etch
Package: xlibmesa-glu
Section: libdevel
Architecture: all
-Depends: libglu1-mesa
+Depends:
+ libglu1-mesa,
+ ${misc:Depends},
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
@@ -237,7 +270,9 @@ Description: transitional package for Debian etch
Package: libglu1-xorg
Section: libs
Architecture: all
-Depends: libglu1-mesa
+Depends:
+ libglu1-mesa,
+ ${misc:Depends},
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
@@ -245,7 +280,9 @@ Description: transitional package for Debian etch
Package: libglu1-xorg-dev
Section: libdevel
Architecture: all
-Depends: libglu1-mesa-dev
+Depends:
+ libglu1-mesa-dev,
+ ${misc:Depends},
Description: transitional package for Debian etch
This package is provided to smooth upgrades from Debian 3.1 ("sarge") to
Debian etch. It may be safely removed from your system.
@@ -253,8 +290,16 @@ Description: transitional package for Debian etch
Package: xbase-clients
Section: x11
Architecture: all
-Depends: x11-apps, x11-session-utils, x11-utils, x11-xfs-utils, x11-xkb-utils,
- x11-xserver-utils, xauth, xinit
+Depends:
+ x11-apps,
+ x11-session-utils,
+ x11-utils,
+ x11-xfs-utils,
+ x11-xkb-utils,
+ x11-xserver-utils,
+ xauth,
+ xinit,
+ ${misc:Depends},
Description: miscellaneous X clients - metapackage
An X client is a program that interfaces with an X server (almost always via
the X libraries), and thus with some input and output hardware like a
@@ -270,7 +315,13 @@ Description: miscellaneous X clients - metapackage
Package: xutils
Section: x11
Architecture: all
-Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils,
xfonts-utils
+Depends:
+ x11-xfs-utils,
+ x11-utils,
+ x11-xserver-utils,
+ x11-session-utils,
+ xfonts-utils,
+ ${misc:Depends},
Description: X Window System utility programs metapackage
xutils provides a set of utility programs shipped with the X Window System.
Many of these programs are useful even on a system that does not have any X
commit c2295a927fe94de7960e4d397118475e17127d13
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Nov 26 17:31:32 2009 +0100
Add 'Old Changelog' in debian/changelog to make lintian happy.
diff --git a/debian/changelog b/debian/changelog
index 1fafa2b..2fdcfcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
* xserver-xorg-video-all: don't depend on -intel on non-linux.
* Switch hal dependency to a recommends, and make it kfreebsd-only.
* Only install the hal fdi and callout on kfreebsd.
+ * Add 'Old Changelog' in debian/changelog to make lintian happy.
-- Julien Cristau <jcris...@debian.org> Wed, 25 Nov 2009 17:05:56 +0100
@@ -1953,6 +1954,8 @@ xorg (7.0.0-0ubuntu1) dapper; urgency=low
-- Daniel Stone <daniel.st...@ubuntu.com> Thu, 13 Oct 2005 10:06:23 +1000
+Old Changelog:
+
Older changelog entries (back to 4.0.1) can be found in changelog.Debian.old.
Releases previous to this fixed the following security issues (details in
changelog.Debian.old): CAN-2004-0419, CAN-2004-0083, CAN-2004-0084,
commit 0476de7610f0d286a82e11b57551caa0633d4210
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Nov 26 17:22:52 2009 +0100
Get rid of unreleased changelog entry
diff --git a/debian/changelog b/debian/changelog
index d9445fa..1fafa2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
xorg (1:7.5~2) UNRELEASED; urgency=low
+ * Drop xorg-dev dependency on libxkbui-dev, which has no users.
+ * Update xorg-dev long description. There are no static-only X libs
+ nowadays.
+ * xorg-dev: don't depend on libxevie-dev.
* xserver-xorg-video-all: don't depend on -intel on non-linux.
* Switch hal dependency to a recommends, and make it kfreebsd-only.
* Only install the hal fdi and callout on kfreebsd.
@@ -8,23 +12,14 @@ xorg (1:7.5~2) UNRELEASED; urgency=low
xorg (1:7.5~1) experimental; urgency=low
+ [ Julien Cristau ]
* Depend on xserver 1.7 RC. Bump video and input driver ABI.
- -- Julien Cristau <jcris...@debian.org> Tue, 29 Sep 2009 22:17:04 +0200
-
-xorg (1:7.4+5) UNRELEASED; urgency=low
-
[ David Nusinow ]
* Update xsfbs to 5693792171d885769e58dcccc053c08b11acd12a
* Revert dh_clean change from last upload but use dh_prep instead
- [ Julien Cristau ]
- * Drop xorg-dev dependency on libxkbui-dev, which has no users.
- * Update xorg-dev long description. There are no static-only X libs
- nowadays.
- * xorg-dev: don't depend on libxevie-dev.
-
- -- David Nusinow <dnusi...@debian.org> Wed, 26 Aug 2009 23:27:18 -0400
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
