debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit 8ce15a0ba33622119281968de5d87fd0fe86155d Author: Robert Hooker <[email protected]> Date: Tue Jan 25 11:26:33 2011 -0500 Bump changelog for release. diff --git a/debian/changelog b/debian/changelog index 5418b2e..b8290c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdrm (2.4.23-1ubuntu2) natty; urgency=low + + * Temporarily lower libdrm-nouveau1 Conflicts: to Replaces: libdrm-nouveau1 + to allow bootstrapping a new plymouth build. + + -- Robert Hooker <[email protected]> Tue, 25 Jan 2011 11:03:37 -0500 + libdrm (2.4.23-1ubuntu1) natty; urgency=low * Merge from Debian experimental. Remaining Ubuntu changes: commit 0b8ad86d78b219ae839fee68d24ef9063618d35c Author: Robert Hooker <[email protected]> Date: Tue Jan 25 11:26:08 2011 -0500 Temporarily change Conflicts: to Replaces: libdrm-nouveau1a to allow a plymouth rebuild. diff --git a/debian/control b/debian/control index 6be949a..824c6b8 100644 --- a/debian/control +++ b/debian/control @@ -97,7 +97,7 @@ Section: libs Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, -Conflicts: libdrm-nouveau1 +Replaces: libdrm-nouveau1 Description: Userspace interface to nouveau-specific kernel DRM services -- runtime This library implements the userspace interface to the nouveau-specific kernel DRM services. DRM stands for "Direct Rendering Manager", which is the -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
