xorg-server: Changes to 'debian-unstable'
ChangeLog | 8 ++++++++
configure.ac | 4 ++--
debian/changelog | 24 +++++++++++++++++++-----
debian/control | 2 +-
4 files changed, 30 insertions(+), 8 deletions(-)
New commits:
commit 19a52ec6285d64222dc7b39ed5128e1cf2b2ed94
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 7 19:35:12 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index b4508f3..271a544 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.10.3-1) UNRELEASED; urgency=medium
+xorg-server (2:1.10.3-1) unstable; urgency=medium
[ Cyril Brulebois ]
* New upstream release (with just a version bump).
@@ -17,7 +17,7 @@ xorg-server (2:1.10.3-1) UNRELEASED; urgency=medium
configure.ac and an Xorg issue where it reverts to the default on reset.
Thanks to Bastian Blank for the report.
- -- Cyril Brulebois <kibi@debian.org> Sat, 09 Jul 2011 12:16:29 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sun, 07 Aug 2011 19:35:07 +0200
xorg-server (2:1.10.2.902-1) unstable; urgency=low
commit 3192e3d28e4432955835e46fb77521da87fc238d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Aug 7 18:25:33 2011 +0200
Bump urgency.
diff --git a/debian/changelog b/debian/changelog
index 4d744bb..1d1cbf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-xorg-server (2:1.10.3-1) UNRELEASED; urgency=low
+xorg-server (2:1.10.3-1) UNRELEASED; urgency=medium
* New upstream release (with just a version bump).
* Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
* Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from
squeeze-backports (without multiarch) to wheezy (with multiarch).
+ * Set urgency to “medium” to speed things up. Migration to testing is
+ a prerequisite for squeeze backports.
-- Cyril Brulebois <kibi@debian.org> Sat, 09 Jul 2011 12:16:29 +0200
commit 1aa2c1564a80f2e13ba03ab2d5b0c173209c9c1d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 9 12:32:43 2011 +0200
Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from squeeze-backports (without multiarch) to wheezy (with multiarch).
diff --git a/debian/changelog b/debian/changelog
index d4d9fdb..4d744bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xorg-server (2:1.10.3-1) UNRELEASED; urgency=low
* New upstream release (with just a version bump).
* Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
+ * Add a Breaks: libgl1-mesa-dri-no-multiarch, to handle upgrades from
+ squeeze-backports (without multiarch) to wheezy (with multiarch).
-- Cyril Brulebois <kibi@debian.org> Sat, 09 Jul 2011 12:16:29 +0200
diff --git a/debian/control b/debian/control
index 8d520be..1ea6956 100644
--- a/debian/control
+++ b/debian/control
@@ -113,6 +113,7 @@ Breaks:
xserver-xorg-input-wacom (<= 0.10.5+20100415-1),
libgl1-mesa-dri (<< 7.10.2-4),
libgl1-mesa-dri-experimental (<< 7.10.2-4),
+ libgl1-mesa-dri-no-multiarch,
Provides:
${videoabi},
${inputabi},
commit 1af7dd506e6a785d865a65fce682ae5025643175
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 9 12:19:59 2011 +0200
Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
diff --git a/debian/changelog b/debian/changelog
index 7df124a..d4d9fdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.10.3-1) UNRELEASED; urgency=low
* New upstream release (with just a version bump).
+ * Remove the Replaces: xdmx from xdmx-tools, that was before lenny.
-- Cyril Brulebois <kibi@debian.org> Sat, 09 Jul 2011 12:16:29 +0200
diff --git a/debian/control b/debian/control
index 1e162a6..8d520be 100644
--- a/debian/control
+++ b/debian/control
@@ -206,7 +206,6 @@ Depends:
xdmx,
${shlibs:Depends},
${misc:Depends},
-Replaces: xdmx (<= 2:1.1.1-10)
Description: Distributed Multihead X tools
This package provides a collection of tools used for administration of
the Xdmx server; see the xdmx package for more information.
commit 443efaee3f3ea1b848d9d7c1d8ba8d1aba691f18
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jul 9 12:17:01 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 0f8c5eb..b71e8da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+commit c9be51523af53742dd7475b73ab151867056d91e
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri Jul 8 12:12:16 2011 -0700
+
+ configure.ac: Bump version to 1.10.3
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
commit bc3c539e8a2b0b95a19e40258bcb18824d7700cd
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jul 1 11:34:08 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index b1ff9c2..7df124a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.10.3-1) UNRELEASED; urgency=low
+
+ * New upstream release (with just a version bump).
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 09 Jul 2011 12:16:29 +0200
+
xorg-server (2:1.10.2.902-1) unstable; urgency=low
* New upstream release (1.10.3 rc2):
commit c9be51523af53742dd7475b73ab151867056d91e
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Jul 8 12:12:16 2011 -0700
configure.ac: Bump version to 1.10.3
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index b6c651d..94923db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.10.2.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2011-07-01"
+AC_INIT([xorg-server], 1.10.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2011-07-08"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
Reply to: