xserver-xorg-video-fbdev: Changes to 'ubuntu'
debian/changelog | 26 ++++++++++++++++++++++++++
debian/control | 2 +-
debian/patches/100_bgnoneroot.patch | 18 ++++++++++++------
3 files changed, 39 insertions(+), 7 deletions(-)
New commits:
commit c1350924666a557a59a87136f44a67cf2ce46648
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue Feb 1 16:25:18 2011 +1100
Rebuild against Xserver 1.10
diff --git a/debian/changelog b/debian/changelog
index d7607f3..15057fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.2-3ubuntu2) natty; urgency=low
+
+ * Rebuild against Xserver 1.10
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 31 Jan 2011 18:38:12 -0800
+
xserver-xorg-video-fbdev (1:0.4.2-3ubuntu1) natty; urgency=low
* Merge from Debian experimental. Remaining Ubuntu changes:
commit a55f04bc00680f2ba9a9a1428bc5c6820a22aa0a
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Jan 28 18:53:48 2011 +1100
Refresh bgnoneroot patch for 1.9/1.10 compatibility
diff --git a/debian/changelog b/debian/changelog
index a33e390..d7607f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-fbdev (1:0.4.2-3ubuntu1) natty; urgency=low
+
+ * Merge from Debian experimental. Remaining Ubuntu changes:
+ - 100_bgnoneroot.patch: Set canDoBGNoneRoot for Plymouth crossfade
+ * Refresh 100_bgnoneroot.patch to build against both 1.9 and 1.10
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 28 Jan 2011 17:52:22 +1100
+
xserver-xorg-video-fbdev (1:0.4.2-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
diff --git a/debian/patches/100_bgnoneroot.patch b/debian/patches/100_bgnoneroot.patch
index 48ba9d3..1c7433e 100644
--- a/debian/patches/100_bgnoneroot.patch
+++ b/debian/patches/100_bgnoneroot.patch
@@ -1,11 +1,17 @@
-diff -up xf86-video-fbdev-0.4.0/src/fbdev.c.foo xf86-video-fbdev-0.4.0/src/fbdev.c
---- xf86-video-fbdev-0.4.0/src/fbdev.c.foo 2008-10-30 11:16:44.000000000 -0400
-+++ xf86-video-fbdev-0.4.0/src/fbdev.c 2008-10-30 11:18:19.000000000 -0400
-@@ -472,6 +472,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag
- return FALSE;
+Index: xserver-xorg-video-fbdev/src/fbdev.c
+===================================================================
+--- xserver-xorg-video-fbdev.orig/src/fbdev.c 2011-01-28 17:52:29.510667250 +1100
++++ xserver-xorg-video-fbdev/src/fbdev.c 2011-01-28 17:53:59.150667250 +1100
+@@ -404,6 +404,12 @@
pScrn->monitor = pScrn->confScreen->monitor;
-+ pScrn->canDoBGNoneRoot = 1;
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 9
++ pScrn->pScreen->canDoBGNoneRoot = TRUE;
++#else
++ pScrn->canDoBGNoneRoot = TRUE;
++#endif
++
FBDevGetRec(pScrn);
fPtr = FBDEVPTR(pScrn);
+
commit 46f4a1a7462a34905e573a2e2ca7b73db2a80ada
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri Jan 28 18:53:27 2011 +1100
Incorporate previous changelog entry not committed to git
diff --git a/debian/changelog b/debian/changelog
index 80209f0..a33e390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ xserver-xorg-video-fbdev (1:0.4.2-3) experimental; urgency=low
-- Cyril Brulebois <kibi@debian.org> Wed, 13 Oct 2010 00:36:31 +0200
+xserver-xorg-video-fbdev (1:0.4.2-2ubuntu2) maverick; urgency=low
+
+ * No-change rebuild against Xserver 1.9 ABI
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 09 Aug 2010 13:38:22 +1000
+
xserver-xorg-video-fbdev (1:0.4.2-2ubuntu1) maverick; urgency=low
* Merge from Debian unstable. Remaining Ubuntu changes:
commit 7f221ec3db55d3f9250755c4b772c9d108fe07f5
Author: Cyril Brulebois <kibi@debian.org>
Date: Wed Oct 13 00:36:46 2010 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 063309a..e7f1ab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-fbdev (1:0.4.2-3) UNRELEASED; urgency=low
+xserver-xorg-video-fbdev (1:0.4.2-3) experimental; urgency=low
* Build against Xserver 1.9.1 rc1.
- -- Cyril Brulebois <kibi@debian.org> Mon, 11 Oct 2010 10:42:15 +0200
+ -- Cyril Brulebois <kibi@debian.org> Wed, 13 Oct 2010 00:36:31 +0200
xserver-xorg-video-fbdev (1:0.4.2-2) unstable; urgency=low
commit f97444774f1da98f4fa9c7e25a139ed588440dfd
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Oct 11 10:45:42 2010 +0200
Build against Xserver 1.9.1 rc1.
diff --git a/debian/changelog b/debian/changelog
index 784797c..063309a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-fbdev (1:0.4.2-3) UNRELEASED; urgency=low
+
+ * Build against Xserver 1.9.1 rc1.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 11 Oct 2010 10:42:15 +0200
+
xserver-xorg-video-fbdev (1:0.4.2-2) unstable; urgency=low
* Update to new xsfbs, replace deprecated ${xserver:Depends} with
diff --git a/debian/control b/debian/control
index 9702548..9660c12 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
debhelper (>= 5.0.0),
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.9.0.901),
x11proto-core-dev,
x11proto-fonts-dev,
x11proto-randr-dev,
Reply to: