xorg: Changes to 'debian-experimental'
debian/changelog | 179 ++
debian/control | 71 -
debian/local/Xsession.5 | 22
debian/local/Xsession.d/20x11-common_process-args | 2
debian/local/Xsession.d/30x11-common_xresources | 2
debian/local/Xsession.options.5 | 8
debian/local/Xwrapper.config.5 | 4
debian/local/dexconf | 11
debian/local/rgb.txt | 1
debian/local/xserver-wrapper.c | 8
debian/po/ar.po | 279 ++--
debian/po/bg.po | 300 ++--
debian/po/bs.po | 270 ++--
debian/po/ca.po | 270 ++--
debian/po/cs.po | 275 ++--
debian/po/da.po | 348 ++---
debian/po/de.po | 279 ++--
debian/po/dz.po | 270 ++--
debian/po/el.po | 270 ++--
debian/po/es.po | 270 ++--
debian/po/eu.po | 324 ++---
debian/po/fi.po | 270 ++--
debian/po/fr.po | 280 ++--
debian/po/gl.po | 275 ++--
debian/po/hr.po | 270 ++--
debian/po/hu.po | 284 ++--
debian/po/it.po | 1126 +++---------------
debian/po/ja.po | 275 ++--
debian/po/km.po | 270 ++--
debian/po/ko.po | 281 ++--
debian/po/lt.po | 288 ++--
debian/po/ml.po | 690 +++++------
debian/po/mr.po | 1325 +++++++++++++++++++++
debian/po/nb.po | 270 ++--
debian/po/ne.po | 317 ++---
debian/po/nl.po | 342 ++---
debian/po/nn.po | 1360 ++++++++++++++++++++++
debian/po/pl.po | 264 ++--
debian/po/pt.po | 294 ++--
debian/po/pt_BR.po | 330 ++---
debian/po/ro.po | 270 ++--
debian/po/ru.po | 340 ++---
debian/po/sk.po | 281 ++--
debian/po/sq.po | 295 ++--
debian/po/sv.po | 278 ++--
debian/po/ta.po | 292 ++--
debian/po/templates.pot | 264 ++--
debian/po/th.po | 275 ++--
debian/po/tr.po | 270 ++--
debian/po/vi.po | 277 ++--
debian/po/wo.po | 270 ++--
debian/po/zh_CN.po | 270 ++--
debian/po/zh_TW.po | 294 ++--
debian/rules | 9
debian/scripts/vars | 2
debian/scripts/vars.alpha | 2
debian/scripts/vars.amd64 | 4
debian/scripts/vars.arm | 2
debian/scripts/vars.armeb | 2
debian/scripts/vars.armel | 10
debian/scripts/vars.hppa | 2
debian/scripts/vars.hurd-i386 | 2
debian/scripts/vars.i386 | 5
debian/scripts/vars.ia64 | 5
debian/scripts/vars.kfreebsd-i386 | 2
debian/scripts/vars.m32r | 2
debian/scripts/vars.m68k | 2
debian/scripts/vars.mips | 2
debian/scripts/vars.mipsel | 2
debian/scripts/vars.sparc | 2
debian/x11-common.dirs | 1
debian/x11-common.init | 4
debian/x11-common.links | 1
debian/x11-common.templates | 6
debian/xserver-xorg.postinst.in | 83 -
debian/xserver-xorg.templates | 8
debian/xsfbs/xsfbs.mk | 55
77 files changed, 9163 insertions(+), 7002 deletions(-)
New commits:
commit 076846438f1fc8a8eb519d07c0b816451b059e8c
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 19:36:17 2007 +0200
Remove unused code from debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 0cb3b2a..05ca41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
+ this completes the xbase-clients split and thus closes: #151613.
* Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
version.
+ * Remove unused code from debian/rules.
-- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 19:14:11 +0200
diff --git a/debian/rules b/debian/rules
index 39db7fa..c81241f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,9 +15,6 @@
# debhelper
export DH_OPTIONS
-# latest ABI is 7.0 final
-SERVERABIBUMP = 7.1.0
-
# Default list of detection packages
XSERVER_XORG_DETECT_DEPENDS = ""
@@ -119,8 +116,7 @@ binary-arch: build install
dh_installdeb
dh_shlibdeps
dh_gencontrol -- -VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
- -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \
- -VServer-ABI-Version=$(SERVERABIBUMP)
+ -VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS)
dh_md5sums
dh_builddeb
touch stamp-$@
commit 8a3479e2371e5472219326bdfac4bcf918699e24
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 19:33:51 2007 +0200
Add xutils and xbase-clients transitional packages.
Bump version number to be higher than the current xbase-clients version.
diff --git a/debian/changelog b/debian/changelog
index 7a941c3..0cb3b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.2.ds3-1) UNRELEASED; urgency=low
+
+ * Add xutils and xbase-clients transitional packages
+ + this completes the xbase-clients split and thus closes: #151613.
+ * Bump version number to 1:7.2.ds3 to be higher than xbase-client's current
+ version.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 19:14:11 +0200
+
xorg (1:7.2-6) UNRELEASED; urgency=low
[ Brice Goglin ]
diff --git a/debian/control b/debian/control
index e590222..14af353 100644
--- a/debian/control
+++ b/debian/control
@@ -200,3 +200,33 @@ Depends: libglu1-mesa-dev
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.
+
+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
+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
+ graphics card, monitor, keyboard, and pointing device (such as a mouse).
+ .
+ This package provides a miscellaneous assortment of several dozen X clients
+ that ship with the X Window System.
+ .
+ This package is provided for transition from earlier Debian releases, the
+ programs formerly in xutils and xbase-clients having been split out in smaller
+ packages.
+
+Package: xutils
+Section: x11
+Architecture: all
+Depends: x11-xfs-utils, x11-utils, x11-xserver-utils, x11-session-utils, xfonts-utils, xutils-dev
+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
+ clients or X servers installed.
+ .
+ This package is provided for transition from earlier Debian releases, the
+ programs formerly in xutils and xbase-clients having been split out in smaller
+ packages.
commit ade85effa21f9c9f353c587823046ec1b1a86c7f
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 19 18:11:26 2007 +0200
Fix xserver-wrapper compile error.
Commit ccb9da383be42f87a29e8694d846f839ac05925a introduced a syntax error.
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 967dd67..08e3140 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -323,7 +323,7 @@ main(int argc, char **argv)
}
for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-config" || !strcmp(argv[i], "-xf86config")) {
+ if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) {
if (setuid(getuid())) {
perror("X unable to drop setuid privileges for alternate config");
exit(1);
commit 1c8e0e225ca182db587ba7a9b870d62fcc8a341d
Author: Julien Cristau <jcristau@debian.org>
Date: Wed May 2 18:12:53 2007 +0200
Remove a few transitional packages.
xserver-xfree86, xlibmesa-dri, x-window-system and x-window-system-core
were only needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 9ebfbb7..7a941c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,18 +14,20 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
armeb, armel, m32r, m68k, mips and mipsel; drop alternative dependency on
the obsolete -modesetting drivers on other architectures, and prefer
-intel to -i810.
+ * Drop the xserver-xfree86, xlibmesa-dri, x-window-system and
+ x-window-system-core transitional packages.
[ David Nusinow ]
* Remove the code to migrate old XFree86 templates over to Xorg. You'll have
to install etch now if you're migrating from sarge for your settings to
transition over.
- * Add libgl1-mesa-dri to the xserver-xorg recommends.
+ * Add libgl1-mesa-dri to the xserver-xorg recommends.
Previously, this recommends was in the xorg package, but many people don't
have the xorg package installed (even though they should). Moving it here
makes it far more likely that people will actually have a working DRI.
Thanks Frans Pop. Closes: #433035
- -- David Nusinow <dnusinow@debian.org> Fri, 13 Jul 2007 19:31:00 -0400
+ -- Julien Cristau <jcristau@debian.org> Thu, 19 Jul 2007 18:08:51 +0200
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 09d094d..e590222 100644
--- a/debian/control
+++ b/debian/control
@@ -92,13 +92,6 @@ Description: the X.Org X server
# versioned dependency on xserver-xorg-core needed because xserver-xorg
# contains a patch to allow in-server module defaults in 2:1.2.99.905-3
-
-Package: xserver-xfree86
-Architecture: all
-Depends: xserver-xorg
-Description: transitional package for moving from XFree86 to X.Org
- This package smooths upgrades from Debian 3.1 by depending on xserver-xorg.
-
Package: xserver-xorg-video-all
Architecture: any
Depends: ${F:XServer-Xorg-Video-Depends}
@@ -168,14 +161,6 @@ Description: transitional metapackage
purposes to prevent disruptions during automated package builds, and my be
safely removed from your system.
-Package: xlibmesa-dri
-Section: libs
-Architecture: all
-Depends: libgl1-mesa-dri
-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.
-
Package: xlibmesa-gl
Section: libs
Architecture: all
@@ -215,23 +200,3 @@ Depends: libglu1-mesa-dev
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.
-
-Package: x-window-system
-Section: x11
-Architecture: all
-Depends: xorg
-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. It depends on the
- xorg package which is the new metapackage for installing the X Window
- System in Debian.
-
-Package: x-window-system-core
-Section: x11
-Architecture: all
-Depends: xorg
-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. It depends on the
- xorg package which is the new metapackage for installing the X Window
- System in Debian.
commit 2be9e19ebf4997072abbb00066fd6b72cac8ec8d
Author: David Nusinow <dnusinow@debian.org>
Date: Fri Jul 13 19:33:16 2007 -0400
* Add libgl1-mesa-dri to the xserver-xorg recommends. Previously, this recommends was in the xorg package, but many people don't have the xorg package installed (even though they should). Moving it here makes it far more likely that people will actually have a working DRI. Thanks Frans Pop. Closes: #433035
diff --git a/debian/changelog b/debian/changelog
index 8406d5a..9ebfbb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,13 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
* Remove the code to migrate old XFree86 templates over to Xorg. You'll have
to install etch now if you're migrating from sarge for your settings to
transition over.
+ * Add libgl1-mesa-dri to the xserver-xorg recommends.
+ Previously, this recommends was in the xorg package, but many people don't
+ have the xorg package installed (even though they should). Moving it here
+ makes it far more likely that people will actually have a working DRI.
+ Thanks Frans Pop. Closes: #433035
- -- David Nusinow <dnusinow@debian.org> Mon, 18 Jun 2007 16:16:06 +0100
+ -- David Nusinow <dnusinow@debian.org> Fri, 13 Jul 2007 19:31:00 -0400
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ed93371..09d094d 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
Depends: xserver-xorg-core (>= 2:1.3.0.0.dfsg-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: xserver-xorg-video-all, xserver-xorg-input-all, laptop-detect, xresprobe, mdetect, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
+Recommends: xserver-xorg-video-all, xserver-xorg-input-all, libgl1-mesa-dri, laptop-detect, xresprobe, mdetect, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
@@ -120,7 +120,6 @@ Description: the X.Org X server -- input driver metapackage
Package: xorg
Architecture: all
Depends: xserver-xorg, libgl1-mesa-glx | libgl1, 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), xbase-clients (>= 1:1.0.1-1), xutils (>= 1:1.0.1-1), xkb-data, xterm | x-terminal-emulator, sparc-utils | not+sparc, xorg-docs
-Recommends: libgl1-mesa-dri
Provides: x-window-system, x-window-system-core
Description: X.Org X Window System
This metapackage provides the components for a standalone
commit 12a633f722a2ff9677728d1e2ae56767f804232a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jul 12 16:06:22 2007 +0200
Fix "display the output of quilt push/pop".
Fix commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d to check the
return value of quilt, not the one of tee.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 5f13302..bfca7bb 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \
if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ cat $(STAMP_DIR)/log/patch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \
fi; \
@@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
else \
+ cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \
fi; \
commit d392d4d46a357cba38a5a2f83cc77d9ff1eb0f4d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 22:04:37 2007 +0200
Add closer thanks to the update of xsfbs.
diff --git a/debian/changelog b/debian/changelog
index 9899ec0..8406d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
Thanks Braun Gabor (closes: #393233).
* xserver-wrapper.c: drop privileges on alternate config file given
with -xf86config as we do for -config, closes: #323107.
+ * Update xsfbs to fix displaying of patches applied by quilt,
+ closes: #428090.
[ Julien Cristau ]
* xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
commit e29b56820909668b062fdba72458ee9483a4ae44
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 21:50:47 2007 +0200
Minor fixes in the patching system.
* Fix debian/rules to not be confused by ~/.quiltrc or QUILT_PATCHES (as in #369920).
* Display which patches are applied and removed instead of just the first one (for #428090).
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 2930c1e..5f13302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,6 +21,11 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
+# force quilt to not use ~/.quiltrc
+QUILT = quilt --quiltrc /dev/null
+# force QUILT_PATCHES to the default in case it is exported in the environment
+QUILT_PATCHES = patches/
+
# Set up parameters for the upstream build environment.
# Determine (source) package name from Debian changelog.
@@ -140,9 +145,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
+ if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +164,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
+ if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
@@ -295,17 +300,17 @@ patch-audit: prepare unpatch
@echo -n "Auditing patches..."; \
>$(STAMP_DIR)/log/patch; \
FUZZY=; \
- while [ -n "$$(quilt next)" ]; do \
- RESULT=$$(quilt push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
+ while [ -n "$$($(QUILT) next)" ]; do \
+ RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
case "$$RESULT" in \
succeeded) \
- echo "fuzzy patch: $$(quilt top)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt top); \
+ echo "fuzzy patch: $$($(QUILT) top)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
FUZZY=yes; \
;; \
FAILED) \
- echo "broken patch: $$(quilt next)" \
- | tee -a $(STAMP_DIR)/log/$$(quilt next); \
+ echo "broken patch: $$($(QUILT) next)" \
+ | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
exit 1; \
;; \
esac; \
commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Mon Jul 9 19:06:05 2007 +0200
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 63dde45..2930c1e 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
exit 1; \
fi; \
- if quilt next; then \
+ if quilt next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
+ if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
@@ -159,7 +159,7 @@ unpatch:
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
- if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
+ if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \
echo "successful."; \
else \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
commit 4b21f9970b745df62a4e1fc56d3cf00b4ed1e414
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 18 16:17:18 2007 +0100
Remove the code to migrate old XFree86 templates over to Xorg.
You'll have to install etch now if you're migrating from sarge for your
settings to transition over.
diff --git a/debian/changelog b/debian/changelog
index e0c741a..9899ec0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,12 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
the obsolete -modesetting drivers on other architectures, and prefer
-intel to -i810.
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 14 Jun 2007 23:34:24 +0200
+ [ David Nusinow ]
+ * Remove the code to migrate old XFree86 templates over to Xorg. You'll have
+ to install etch now if you're migrating from sarge for your settings to
+ transition over.
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 18 Jun 2007 16:16:06 +0100
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 7aca749..a2eb7c1 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -660,84 +660,6 @@ if [ -z "$2" ]; then
FIRSTINST=yes
fi
-# Migrate debconf templates from xserver-xfree86 to xserver-xorg
-XF86TEMPLATELIST=$(debconf-show xserver-xfree86 | sed -e 's/^\*//g' | awk '{print $1}' | sed -e 's/\:$//g')
-
-if [ -n "$FIRSTINST" ] && [ -z "$RECONFIGURE" ] && [ -n "$XF86TEMPLATELIST" ]; then
- MIGRATE_XF86=true
- warn "Migrating xserver-xfree86 debconf values to xserver-xorg."
- # set +e is required otherwise debconf will kick us out if the template is not
- # there.
- set +e
- for XF86TEMPLATE in $XF86TEMPLATELIST; do
- XORGTEMPLATE=$(echo "$XF86TEMPLATE" | sed -e 's/xserver-xfree86/xserver-xorg/g')
- # db_get doesn't need checking. If we are here is because it is in the list.
- db_get "$XF86TEMPLATE"
- db_set "$XORGTEMPLATE" "$RET"
- if [ "$RET" = "10 $XORGTEMPLATE doesn't exist" ]; then
- debug_echo "$XF86TEMPLATE is not mapped to $XORGTEMPLATE"
- else
- db_fset "$XORGTEMPLATE" seen true
- fi
- done
- # migrate special cases
- db_metaget xserver-xfree86/config/display/modes choices
- if [ "$RET" != "10 xserver-xfree86/config/display/modes doesn't exist" ]; then
- db_subst xserver-xorg/config/display/modes choices "$RET"
- else
- db_subst xserver-xorg/config/display/modes choices @DEFAULT_DCRESOLUTIONS@
- fi
- # migrate keyboard/rules
- db_get xserver-xorg/config/inputdevice/keyboard/rules
- if [ "$RET" = "xfree86" ]; then
- db_set xserver-xorg/config/inputdevice/keyboard/rules "xorg"
- fi
- db_set xserver-xorg/config/monitor/use_sync_ranges true
- set -e
- if [ -e "$XF86CONFIG" ] && [ ! -e "$XORGCONFIG" ]; then
- touch "$CONFIG_AUX_DIR/.migrateconfig"
- cp "$XF86CONFIG" "$XORGCONFIG"
- if [ -e "$XF86CONFIG_CHECKSUM" ] && [ ! -e "$XORGCONFIG_CHECKSUM" ]; then
- cat "$XF86CONFIG_CHECKSUM" | sed -e 's/XF86Config-4/xorg\.conf/' > "$XORGCONFIG_CHECKSUM"
- fi
- if [ -e "$XF86CONFIG_ROSTER" ] && [ ! -e "$XORGCONFIG_ROSTER" ]; then
- echo "$THIS_PACKAGE" > "$XORGCONFIG_ROSTER"
- fi
- fi
-fi
-
-# migrate from old select-type templates
-for TEMPLATE in xserver-xorg/config/inputdevice/mouse/emulate3buttons ; do
- db_get "$TEMPLATE" || continue
- if [ "$RET" = "Yes" ]; then
- db_set $TEMPLATE "true"
- elif [ "$RET" = "No" ]; then
- db_set $TEMPLATE "false"
- fi
-done
-
-# Delete obsolete templates
-for TEMPLATE in xserver-xorg/config/inputdevice/mouse/zaxismapping; do
- db_get "$TEMPLATE" || continue
- db_unregister "$TEMPLATE"
-done
-
-# migrate from "expert" to "advanced"
-db_get xserver-xorg/config/monitor/selection-method
-if [ "$RET" = "Expert" ]; then
- db_set xserver-xorg/config/monitor/selection-method "Advanced"
-fi
-
-# migrate from ATI driver sub-modules to ATI driver
-db_get xserver-xorg/config/device/driver
-case "$RET" in
- atimisc|r128|radeon)
- db_set xserver-xorg/config/device/driver "ati"
- ;;
- *)
- ;;
-esac
-
# The only supported protocol (per Zephaniah Hull) for the GPM repeater is
# IntelliMouse; migrate anyone using that mouse device to that protocol. Other
# values used to work as well, but no longer do since the XFree86 mouse driver
commit ccb9da383be42f87a29e8694d846f839ac05925a
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jun 14 23:34:42 2007 +0200
drop privileges on alternate config file given with -xf86config
diff --git a/debian/changelog b/debian/changelog
index 75ca1a6..e0c741a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
* Remove the reference to the unexisting example file
/usr/share/doc/x11-common/examples/xsession in Xsession.5.
Thanks Braun Gabor (closes: #393233).
+ * xserver-wrapper.c: drop privileges on alternate config file given
+ with -xf86config as we do for -config, closes: #323107.
[ Julien Cristau ]
* xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
@@ -11,7 +13,7 @@ xorg (1:7.2-6) UNRELEASED; urgency=low
the obsolete -modesetting drivers on other architectures, and prefer
-intel to -i810.
- -- Julien Cristau <jcristau@debian.org> Thu, 14 Jun 2007 10:22:22 +0200
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 14 Jun 2007 23:34:24 +0200
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index b621189..967dd67 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -323,7 +323,7 @@ main(int argc, char **argv)
}
for (i = 1; i < argc; i++) {
- if (!strcmp(argv[i], "-config")) {
+ if (!strcmp(argv[i], "-config" || !strcmp(argv[i], "-xf86config")) {
if (setuid(getuid())) {
perror("X unable to drop setuid privileges for alternate config");
exit(1);
commit 49ea6f57bf9fcfce1118edbeff18ae571fdc5baa
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jun 14 10:11:13 2007 +0200
xserver-xorg-video-all: update dependencies on the intel video driver
Don't depend on the intel driver on alpha, arm, armeb, armel, m32r, m68k,
mips and mipsel; drop alternative dependency on the obsolete -modesetting
drivers on other architectures, and prefer -intel to -i810.
diff --git a/debian/changelog b/debian/changelog
index ad5123e..75ca1a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
xorg (1:7.2-6) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* Remove the reference to the unexisting example file
/usr/share/doc/x11-common/examples/xsession in Xsession.5.
Thanks Braun Gabor (closes: #393233).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 14 Jun 2007 00:18:07 +0200
+ [ Julien Cristau ]
+ * xserver-xorg-video-all: don't depend on the intel driver on alpha, arm,
+ armeb, armel, m32r, m68k, mips and mipsel; drop alternative dependency on
+ the obsolete -modesetting drivers on other architectures, and prefer
+ -intel to -i810.
+
+ -- Julien Cristau <jcristau@debian.org> Thu, 14 Jun 2007 10:22:22 +0200
xorg (1:7.2-5) unstable; urgency=low
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index afab4c8..549176d 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# , xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index cea2705..06c0106 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-intel | xserver-xorg-video-i810, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vga, xserver-xorg-video-v4l, xserver-xorg-video-vmware"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index 4c26f80..2bdba52 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 4c26f80..2bdba52 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index 4c26f80..2bdba52 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 4df572d..89f271d 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-intel | xserver-xorg-video-i810, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index 4c26f80..2bdba52 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index 3ffe900..35a053f 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index 2afbc9a..0b43bc9 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index 4c26f80..2bdba52 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -3,7 +3,7 @@
#
# 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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
+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-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
commit f3633ec45909cfb49ad8758933ed3b3fd893903b
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Thu Jun 14 00:20:36 2007 +0200
Remove the reference to the unexisting example file in Xsession.5
diff --git a/debian/changelog b/debian/changelog
index e26796e..ad5123e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.2-6) UNRELEASED; urgency=low
+
+ * Remove the reference to the unexisting example file
+ /usr/share/doc/x11-common/examples/xsession in Xsession.5.
+ Thanks Braun Gabor (closes: #393233).
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Thu, 14 Jun 2007 00:18:07 +0200
+
xorg (1:7.2-5) unstable; urgency=low
* Don't use the dexconf function fetch to get the modes. This will fail when
diff --git a/debian/local/Xsession.5 b/debian/local/Xsession.5
index d7b3e27..a3268b7 100644
--- a/debian/local/Xsession.5
+++ b/debian/local/Xsession.5
@@ -373,8 +373,6 @@ is a sequence of commands invoking X clients (or a session manager such as
.BR xsm (1x)).
See the manual page for
.B xinit
-and/or
-.I /usr/share/doc/x11\-common/examples/xsession
for tips on writing an
.I .xsession
file.
commit e8accec78eb33e2cc06b92c6e25d25017271e59f
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Jun 12 21:03:38 2007 -0400
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7adae53..e26796e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg (1:7.2-5) UNRELEASED; urgency=low
+xorg (1:7.2-5) unstable; urgency=low
* Don't use the dexconf function fetch to get the modes. This will fail when
the value is empty by design. Just use db_get instead.
- -- David Nusinow <dnusinow@debian.org> Tue, 12 Jun 2007 18:03:31 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 12 Jun 2007 20:54:56 -0400
xorg (1:7.2-4) unstable; urgency=low
commit 5d32d55ad2edb479ca590361fc17c080da1c06db
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Jun 12 18:08:22 2007 -0400
Allow no modes to be selected
Don't use the dexconf function fetch to get the modes. This will fail when
the value is empty by design. Just use db_get instead.
diff --git a/debian/changelog b/debian/changelog
index 7bbac7f..7adae53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.2-5) UNRELEASED; urgency=low
+
+ * Don't use the dexconf function fetch to get the modes. This will fail when
+ the value is empty by design. Just use db_get instead.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 12 Jun 2007 18:03:31 -0400
+
xorg (1:7.2-4) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 0d5b2d3..c5b2a9e 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -354,7 +354,7 @@ printf "EndSection\n" >&4
fetch xserver-$SERVER/config/display/default_depth
DISPLAY_DEFAULT_DEPTH="$RET"
-fetch xserver-$SERVER/config/display/modes
+db_get xserver-$SERVER/config/display/modes
DISPLAY_MODES="$(list_convert $RET)"
exec 4>"$DEXCONFTMPDIR/Screen"
commit 96e1fa86b04f559fbc2463036553e6a3fd61d012
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 11 23:00:22 2007 -0400
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8857ace..7bbac7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.2-4) UNRELEASED; urgency=low
+xorg (1:7.2-4) unstable; urgency=low
[ Julien Cristau ]
* Add ${shlibs:Depends} to x11-common's Depends field, because the X server
@@ -49,7 +49,7 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
the modes. This is functionally equivalent to what we were doing anyway,
and it cuts down the number of lines in our xorg.conf considerably.
- -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:56:52 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:58:03 -0400
xorg (1:7.2-3) unstable; urgency=low
commit 05ac83fd64ccd4addddf493c787fbfa98306f123
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 11 22:57:42 2007 -0400
Slim down the modes we write out by default
The /config/display/modes now has no default (blank). As a result of this,
under normal conditions, this multi-select field will be empty. The
debconfage and dexconf will not fill in this section at all. The server
will then choose the highest resolution that it can probe with DDC. This
should work for most people, who are probably choosing their best
resolution anyway. If xresprobe is available and used, the resolutions it
finds will be selected. Until there is a good way for the server to store
this information by itself, we should leave this as it is. Most people can
get by without this section, but it'll help some of those with broken
hardware.
If the user does select a mode or modes for this question, dexconf no
longer iterates through a set of depths and puts the mode list in for
each. Instead, if dexconf does find a set of specified modes, it will
write a single "Display" subsection for the screen, and it will contain
the modes. This is functionally equivalent to what we were doing anyway,
and it cuts down the number of lines in our xorg.conf considerably.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 69bf215..8857ace 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,27 @@ xorg (1:7.2-4) UNRELEASED; urgency=low
* Debconf translations:
- Vietnamese. Closes: #426978, #427180
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 15 May 2007 18:41:22 +0200
+ [ David Nusinow ]
Reply to: