debian/changelog | 10 ++++++++++
debian/control | 2 +-
debian/patches/01-cherry-pick-r854.diff | 18 ++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 0583f96c1dd942598dc6f84c29ea4733b2206dfb
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Sep 30 18:12:04 2010 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 0bcd837..850127a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-openchrome (1:0.2.904+svn842-2) UNRELEASED; urgency=high
+xserver-xorg-video-openchrome (1:0.2.904+svn842-2) unstable; urgency=high
* Cherry-pick r854 to fix initialization issues on amd64 introduced in
r830, leading to system freeze (Closes: #597379). Many thanks to
@@ -6,7 +6,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn842-2) UNRELEASED;
urgency=high
* Set urgency to “high” accordingly.
* Add myself to Uploaders.
- -- Cyril Brulebois <k...@debian.org> Thu, 30 Sep 2010 17:51:49 +0200
+ -- Cyril Brulebois <k...@debian.org> Thu, 30 Sep 2010 18:11:53 +0200
xserver-xorg-video-openchrome (1:0.2.904+svn842-1) unstable; urgency=low
commit 930247584b35b47653909e1ef46bdb6014cf9a49
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Sep 30 18:03:56 2010 +0200
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 7db6441..0bcd837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-video-openchrome (1:0.2.904+svn842-2) UNRELEASED;
urgency=high
r830, leading to system freeze (Closes: #597379). Many thanks to
Nethanel Elzas for the actual testing.
* Set urgency to “high” accordingly.
+ * Add myself to Uploaders.
-- Cyril Brulebois <k...@debian.org> Thu, 30 Sep 2010 17:51:49 +0200
diff --git a/debian/control b/debian/control
index ba1b47d..8a312ef 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-openchrome
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Julien Viard de Galbert <jul...@vdg.blogsite.org>
+Uploaders: Julien Viard de Galbert <jul...@vdg.blogsite.org>, Cyril Brulebois
<k...@debian.org>
Build-Depends:
debhelper (>= 5),
autotools-dev,
commit f4b3389a4857d8c8e557aedbdeab2c67bce84240
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Sep 30 18:03:14 2010 +0200
Set urgency to “high” accordingly.
diff --git a/debian/changelog b/debian/changelog
index 1895afd..7db6441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-xserver-xorg-video-openchrome (1:0.2.904+svn842-2) UNRELEASED; urgency=low
+xserver-xorg-video-openchrome (1:0.2.904+svn842-2) UNRELEASED; urgency=high
* Cherry-pick r854 to fix initialization issues on amd64 introduced in
r830, leading to system freeze (Closes: #597379). Many thanks to
Nethanel Elzas for the actual testing.
+ * Set urgency to “high” accordingly.
-- Cyril Brulebois <k...@debian.org> Thu, 30 Sep 2010 17:51:49 +0200
commit f49241b124ccda99018c809f10de53fd44b13e27
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Sep 30 18:01:56 2010 +0200
Cherry-pick r854 to fix initialization issues on amd64 introduced in r830,
leading to system freeze (Closes: #597379). Many thanks to Nethanel Elzas for
the actual testing.
diff --git a/debian/changelog b/debian/changelog
index 2fdca5c..1895afd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-openchrome (1:0.2.904+svn842-2) UNRELEASED; urgency=low
+
+ * Cherry-pick r854 to fix initialization issues on amd64 introduced in
+ r830, leading to system freeze (Closes: #597379). Many thanks to
+ Nethanel Elzas for the actual testing.
+
+ -- Cyril Brulebois <k...@debian.org> Thu, 30 Sep 2010 17:51:49 +0200
+
xserver-xorg-video-openchrome (1:0.2.904+svn842-1) unstable; urgency=low
* New upstream snapshot
diff --git a/debian/patches/01-cherry-pick-r854.diff
b/debian/patches/01-cherry-pick-r854.diff
new file mode 100644
index 0000000..12c042a
--- /dev/null
+++ b/debian/patches/01-cherry-pick-r854.diff
@@ -0,0 +1,18 @@
+From: Cyril Brulebois <k...@debian.org>
+Partially reverts r830:
+ http://svn.openchrome.org/trac/changeset/830/trunk
+ http://svn.openchrome.org/trac/changeset/854/trunk
+--- a/src/via_dri.c
++++ b/src/via_dri.c
+@@ -267,11 +267,6 @@ VIADRIAgpInit(ScreenPtr pScreen, VIAPtr
+ pVIADRI = pDRIInfo->devPrivate;
+ pVia->agpSize = 0;
+
+-/* For AMD64 */
+-#ifdef __x86_64__
+- return FALSE;
+-#endif
+-
+ if (drmAgpAcquire(pVia->drmFD) < 0) {
+ xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAgpAcquire failed %d\n",
+ errno);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8dff6ec
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-cherry-pick-r854.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1p1lrg-0006ei...@alioth.debian.org
