xorg-server: Changes to 'debian-experimental'
debian/changelog | 20 ++++++++++++++++++++
debian/control | 4 ++--
debian/rules | 2 +-
debian/videoabiver | 2 +-
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit da0ce688917611cf8e5a0ffee903f6ee67f2240d
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 16:38:29 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index cf6400d..35b3b52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.2.0-6) UNRELEASED; urgency=low
+xorg-server (2:1.2.0-6) experimental; urgency=low
* Set videoabiver to 1.0, same as in xorg-server 1.1.
- -- Julien Cristau <jcristau@debian.org> Fri, 2 Mar 2007 14:35:02 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 2 Mar 2007 16:38:12 +0100
xorg-server (2:1.2.0-5) experimental; urgency=low
commit 7ba43c25504614629178499fa472b91d3513fcc2
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 2 14:43:24 2007 +0100
Change videoabiver back to 1.0.
The video ABI has not changed between xserver 1.1 and 1.2, so the virtual
package name used for the video drivers needs to stay the same.
diff --git a/debian/changelog b/debian/changelog
index 72c18e2..7981e22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.2.0-6) UNRELEASED; urgency=low
+
+ * Set videoabiver to 1.0, same as in xorg-server 1.1.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 2 Mar 2007 14:35:02 +0100
+
xorg-server (2:1.2.0-5) experimental; urgency=low
* Add input ABI versioning metadata. Rename serverabiver file to
diff --git a/debian/videoabiver b/debian/videoabiver
index d00491f..d3827e7 100644
--- a/debian/videoabiver
+++ b/debian/videoabiver
@@ -1 +1 @@
-1
+1.0
commit d5bda887becbcaf6174c93ced8a45db8a8661317
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 21:48:47 2007 -0500
Also replace xserver-common for the SecurityPolicy conflict
diff --git a/debian/changelog b/debian/changelog
index 6696d1e..7d4681a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,12 +5,12 @@ xorg-server (2:1.1.1-19) unstable; urgen
(/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1")
[ David Nusinow ]
- * Conflict with xserver-common, because that package used to provide the
- SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
- so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane
- for reporting and it. Closes: #402658
+ * Conflict with and replace xserver-common, because that package used to
+ provide the SecurityPolicy file. This is an RC bugfix because it breaks
+ upgrades, so it gets a high urgency. Thanks Christian Tsotras and Lionel
+ Elie Mamane for reporting and it. Closes: #402658
- -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 21:20:45 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 21:48:19 -0500
xorg-server (2:1.1.1-18) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index cd1e8ec..84a89d1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Depends: x11-common (>= 1:7.0.0), ${shli
Recommends: xkb-data, xfonts-base
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
-Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
+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
commit 3b1d2f9f0db0b3e74f14ad440ecac2090f14dc4a
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 21:22:04 2007 -0500
Document the change in 2ef5be024f4fb02444b4dc45d7be97cf3932f535 in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index d585ba6..6696d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
xorg-server (2:1.1.1-19) unstable; urgency=high
+ [ Drew Parsons ]
+ * Removed spurious space in default font line
+ (/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1")
+
+ [ David Nusinow ]
* Conflict with xserver-common, because that package used to provide the
- SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
+ SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane
for reporting and it. Closes: #402658
- -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 17:22:08 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 21:20:45 -0500
xorg-server (2:1.1.1-18) unstable; urgency=medium
commit 60b5dd68e121b7cc925dbca0d915e647b5dd8e84
Author: David Nusinow <dnusinow@debian.org>
Date: Wed Feb 28 17:24:53 2007 -0500
* Conflict with xserver-common, because that package used to provide the
SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane
for reporting and it. Closes: #402658
diff --git a/debian/changelog b/debian/changelog
index 200e40e..d585ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.1.1-19) unstable; urgency=high
+
+ * Conflict with xserver-common, because that package used to provide the
+ SecurityPolicy file. This is an RC bugfix because it breaks upgrades,
+ so it gets a high urgency. Thanks Christian Tsotras and Lionel Elie Mamane
+ for reporting and it. Closes: #402658
+
+ -- David Nusinow <dnusinow@debian.org> Wed, 28 Feb 2007 17:22:08 -0500
+
xorg-server (2:1.1.1-18) unstable; urgency=medium
* Add patch from Fedora to make xephyr work on 64bit architectures
diff --git a/debian/control b/debian/control
index bb0888f..cd1e8ec 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: any
Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
Recommends: xkb-data, xfonts-base
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
-Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video
+Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0), xserver-xorg-video, xserver-common
Replaces: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0)
Provides: xserver
Description: X.Org X server -- core server
commit 2ef5be024f4fb02444b4dc45d7be97cf3932f535
Author: Drew Parsons <drew@pug.localdomain>
Date: Wed Feb 28 22:44:33 2007 +1100
Removed spurious space in default font line
(/usr/X11R6/lib/X11/fonts/Type1 not "/usr/X11R6/lib/ X11/fonts/Type1")
Should these X11R6 entries be removed altogether now?
diff --git a/debian/rules b/debian/rules
index 5f091b2..98d6bd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ # kill the .las.
confflags += --disable-static \
--enable-xorg \
--with-mesa-source=/usr/share/mesa-source \
- --with-default-font-path="/usr/share/fonts/X11/misc,/usr/X11R6/lib/X11/fonts/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/X11R6/lib/ X11/fonts/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
+ --with-default-font-path="/usr/share/fonts/X11/misc,/usr/X11R6/lib/X11/fonts/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
--with-serverconfig-path=/etc/X11/xserver \
--with-rgb-path=/etc/X11/rgb \
--enable-xtrap \
Reply to: