mesa: Changes to 'ubuntu'
debian/changelog | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
New commits:
commit eedfbe583a52a98890b02efa13cccb82001ecbec
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Feb 19 15:57:30 2010 +0200
Release 7.7-3ubuntu1.
diff --git a/debian/changelog b/debian/changelog
index b0f21ef..1863526 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.7-3ubuntu1) UNRELEASED; urgency=low
+mesa (7.7-3ubuntu1) lucid; urgency=low
[ Timo Aaltonen ]
* Merge from Debian experimental.
@@ -9,7 +9,7 @@ mesa (7.7-3ubuntu1) UNRELEASED; urgency=low
at a higher priority than the one in /usr/lib.
* Install libGL alternatives with libgl1-mesa-swx11 as well. (LP: #522048)
- -- Robert Hooker <sarvatt@ubuntu.com> Mon, 15 Feb 2010 11:45:20 -0500
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 19 Feb 2010 15:52:12 +0200
mesa (7.7-3) experimental; urgency=low
commit 4f1db4208949a0d62ad6dc4816963b952d52ee4e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Feb 19 15:51:42 2010 +0200
Fix the changelog, remove merge tags.
diff --git a/debian/changelog b/debian/changelog
index 126fb5d..b0f21ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,7 +131,17 @@ mesa (7.7~rc2-1) experimental; urgency=low
-- Brice Goglin <bgoglin@debian.org> Sat, 12 Dec 2009 13:02:55 +0100
-<<<<<<< HEAD
+mesa (7.6.1-1) unstable; urgency=low
+
+ * New upstream release
+ + Pull upstream mesa_7_6_branch up to commit da876fa3
+ * Bump linux-libc-dev build-dep to 2.6.31 for the r600 dri driver (fixes
+ ftbfs on mips).
+ * Drop hunk from 05_hurd-ftbfs.diff that was applied upstream. Refresh
+ other patches.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 29 Dec 2009 10:42:24 +0000
+
mesa (7.6.1~rc3-1ubuntu2) lucid; urgency=low
* debian/libgl1-mesa-glx.install:
@@ -145,18 +155,6 @@ mesa (7.6.1~rc3-1ubuntu1) lucid; urgency=low
* Merge from Debian unstable.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 14 Dec 2009 16:49:11 +0200
-=======
-mesa (7.6.1-1) unstable; urgency=low
-
- * New upstream release
- + Pull upstream mesa_7_6_branch up to commit da876fa3
- * Bump linux-libc-dev build-dep to 2.6.31 for the r600 dri driver (fixes
- ftbfs on mips).
- * Drop hunk from 05_hurd-ftbfs.diff that was applied upstream. Refresh
- other patches.
-
- -- Julien Cristau <jcristau@debian.org> Tue, 29 Dec 2009 10:42:24 +0000
->>>>>>> mesa-7.7-3
mesa (7.6.1~rc3-1) unstable; urgency=low
Reply to: