summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Goglin <bgoglin@debian.org>2008-01-24 01:14:31 +0100
committerBrice Goglin <bgoglin@debian.org>2008-01-24 01:14:31 +0100
commitd4fd82a1a54a8c954d5c492892d43f96ced93654 (patch)
treec00dd498adca93fa3c03041338d6bac1232d8d94
parent3239cfafbf1c9f8418a7ff1b3567b2bfb983f30d (diff)
Prepare changelog for uploadxorg-server-2_1.1.1-21etch4
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index fb61c8a00..32a4aa665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xorg-server (2:1.1.1-21etch4) UNRELEASED; urgency=low
+xorg-server (2:1.1.1-21etch4) stable; urgency=low
+ [ Julien Cristau ]
* Add patch by Michael Karcher <karcher@physik.fu-berlin.de> to fix inline
asm in fb/fbpict.c. On processors without the cpuid instruction, the X
server would get a SIGILL (closes: #353494).
- -- Julien Cristau <jcristau@debian.org> Wed, 23 Jan 2008 18:13:52 +0100
+ [ Brice Goglin ]
+ * Add myself to Uploaders.
+
+ -- Brice Goglin <bgoglin@debian.org> Thu, 24 Jan 2008 01:13:41 +0100
xorg-server (2:1.1.1-21etch3) stable-security; urgency=high
diff --git a/debian/control b/debian/control
index 84a89d1f3..4702e00fc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg-server
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.org>, Julien Cristau <julien.cristau@ens-lyon.org>, Brice Goglin <bgoglin@debian.org>
# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
# server, and common dependencies for the DIX.
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.