xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
debian/control | 50 +++++++++++++++++++++++++-------------------------
debian/rules | 8 ++++----
3 files changed, 33 insertions(+), 31 deletions(-)
New commits:
commit 3700f9a34a8f030a70bafdbf53250942c450f827
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 27 20:47:47 2007 +0200
* Use ${binary:Version} instead of ${Source-Version}.
diff --git a/debian/changelog b/debian/changelog
index 1529427..3256386 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,8 +48,9 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
05_kill_type1.diff replaces 48_disable_type1.diff, and is now enabled in
debian/patches/series.
* Don't build kdrive-based servers we're not shipping.
+ * Use ${binary:Version} instead of ${Source-Version}.
- -- Julien Cristau <jcristau@debian.org> Wed, 26 Sep 2007 17:33:29 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 27 Sep 2007 20:47:19 +0200
xorg-server (2:1.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0117476..3ab5a47 100644
--- a/debian/control
+++ b/debian/control
@@ -244,7 +244,7 @@ Description: nested X server
#
Package: xserver-xorg-core-dbg
Architecture: any
-Depends: xserver-xorg-core (= ${Source-Version})
+Depends: xserver-xorg-core (= ${binary:Version})
Priority: extra
Description: Xorg - the X.Org X server (debugging symbols)
The Xorg X server is an X server for several architectures and operating
commit e439bfc6a037fd6007904861390c413fcc6abdee
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Sep 27 18:12:53 2007 +0200
Fix some Xorg vs. X.Org confusion in package descriptions.
Also change xserver-xephyr's description to talk about Xnest, not xnest.
This is probably not perfect still, but.
diff --git a/debian/control b/debian/control
index f0a5d37..0117476 100644
--- a/debian/control
+++ b/debian/control
@@ -44,14 +44,14 @@ Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input, xserver-xorg-video-1.9
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-common
Provides: xserver
-Description: X.Org X server - core server
- The X.Org X server is an X server for several architectures and operating
+Description: Xorg X server - core server
+ The Xorg X server is an X server for several architectures and operating
systems, which is derived from the XFree86 4.x series of X servers.
.
- The X.Org server supports most modern graphics hardware from most vendors,
+ The Xorg server supports most modern graphics hardware from most vendors,
and supersedes all XFree86 X servers.
.
- The X.Org server either needs fonts installed on the local host, or needs to
+ The Xorg server either needs fonts installed on the local host, or needs to
know of a remote hosts that provides font services (with xfs, for instance).
The former means that fonts packages are mandatory. The latter means that
font packages may be gratuitous. To err on the side of caution, install at
@@ -68,7 +68,7 @@ Description: X.Org X server - core server
Package: xserver-xorg-dev
Architecture: any
Depends: ${misc:Depends}, libpixman-1-dev, x11proto-core-dev, x11proto-input-dev (>= 1.4), x11proto-xext-dev, x11proto-video-dev, x11proto-randr-dev (>= 1.2), x11proto-render-dev (>= 2:0.9.3), x11proto-fonts-dev
-Description: X.Org X server - development files
+Description: Xorg X server - development files
This package provides development files for the X.Org ('Xorg') X server.
This is not quite the same as the DDK (Driver Development Kit) from the
XFree86 4.x and X.Org 6.7, 6.8 and 6.9 series of servers; it provides
@@ -171,7 +171,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients
Description: nested X server
Xephyr is an X server that can be run inside another X server,
- much like xnest. It is based on the kdrive X server, and as a
+ much like Xnest. It is based on the kdrive X server, and as a
result it supports newer extensions than Xnest, including render and
composite.
.
@@ -247,11 +247,11 @@ Architecture: any
Depends: xserver-xorg-core (= ${Source-Version})
Priority: extra
Description: Xorg - the X.Org X server (debugging symbols)
- The X.Org X server is an X server for several architectures and operating
+ The Xorg X server is an X server for several architectures and operating
systems, which is derived from the XFree86 4.x series of X servers.
.
- The X.Org server supports most modern graphics hardware from most vendors,
+ The Xorg server supports most modern graphics hardware from most vendors,
and supersedes all XFree86 X servers.
.
- This package provides debugging symbols for the X.org X server and associated
+ This package provides debugging symbols for the Xorg X server and associated
modules.
commit 3660805f247157219d551247cbbc6337f287309a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Sep 26 17:40:54 2007 +0200
Don't build xserver-xfbdev for now.
We'll enable it after 1.4 has settled a bit, at which point
going to NEW won't be a big problem.
diff --git a/debian/changelog b/debian/changelog
index b4b27f1..1529427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,8 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
anything else.
[ Brice Goglin ]
- * Build the Xfbdev server in new package xserver-xfbdev, closes: #439764.
+ * Allow building the Xfbdev server in new package xserver-xfbdev, but leave
+ it disabled for now (see #439764).
* Add upstream commit 27ad5d74c20f01516a1bff73be283f8982fcf0fe as patch
44_XKB_mapping_changes_for_all_core-sending_devices.diff to fix broken
xmodmap invocation in .xsession, closes: #443044.
@@ -48,7 +49,7 @@ xorg-server (2:1.4-3) UNRELEASED; urgency=low
debian/patches/series.
* Don't build kdrive-based servers we're not shipping.
- -- Brice Goglin <bgoglin@debian.org> Sun, 23 Sep 2007 18:23:39 +0200
+ -- Julien Cristau <jcristau@debian.org> Wed, 26 Sep 2007 17:33:29 +0200
xorg-server (2:1.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 292823b..f0a5d37 100644
--- a/debian/control
+++ b/debian/control
@@ -182,21 +182,21 @@ Description: nested X server
.
This package is built from the X.org xserver module.
-Package: xserver-xfbdev
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients
-Description: Linux framebuffer device tiny X server
- xserver-xfbdev is a Linux framebuffer device tiny X server based on the
- kdrive X server.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This package is built from the X.org xserver module.
-
+#Package: xserver-xfbdev
+#Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh3 sh3eb sh4 sh4eb sparc
+#Depends: ${shlibs:Depends}, ${misc:Depends}
+#Recommends: xbase-clients
+#Description: Linux framebuffer device tiny X server
+# xserver-xfbdev is a Linux framebuffer device tiny X server based on the
+# kdrive X server.
+# .
+# More information about X.Org can be found at:
+# <URL:http://www.X.org>
+# <URL:http://xorg.freedesktop.org>
+# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+# .
+# This package is built from the X.org xserver module.
+#
#Package: xprint
#Architecture: any
#Depends: ${shlibs:Depends}, ${misc:Depends}, xprint-common, libxfont1 (>= 1:1.1)
diff --git a/debian/rules b/debian/rules
index 8395999..a474d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,11 +29,11 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-ifeq ($(DEB_HOST_ARCH_OS), linux)
- build_xfbdev = --enable-xfbdev
-else
+#ifeq ($(DEB_HOST_ARCH_OS), linux)
+# build_xfbdev = --enable-xfbdev
+#else
build_xfbdev = --disable-xfbdev
-endif
+#endif
BUILD_XPRINT = false
ifeq ($(BUILD_XPRINT), true)
Reply to: