xserver-xorg-video-suncg6: Changes to 'debian-unstable'
debian/changelog | 11 +++++
debian/control | 4 -
debian/patches/0001-Request-8bpp-depth-from-the-server.diff | 25 ++++++++++++
debian/patches/series | 1
debian/rules | 4 -
5 files changed, 41 insertions(+), 4 deletions(-)
New commits:
commit 35dcd0ffe0246987c362959ca6b5fbed49d6c18c
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Nov 25 22:57:39 2007 -0500
* Remove Branden from the uploaders file. He's always welcome back.
diff --git a/debian/changelog b/debian/changelog
index 9ad4191..d58f2e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xserver-xorg-video-suncg6 (1:1.1.0-6) UNRELEASED; urgency=low
* Add 0001-Request-8bpp-depth-from-the-server.diff
The driver only supports 8bpp so request it rather than force the user to
have this in their xorg.conf. Submitted upstream.
+ * Remove Branden from the uploaders file. He's always welcome back.
- -- David Nusinow <dnusinow@debian.org> Sun, 25 Nov 2007 22:56:17 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 25 Nov 2007 22:57:23 -0500
xserver-xorg-video-suncg6 (1:1.1.0-5) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 4b0a907..0c9d188 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-video-suncg6
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Jurij Smakov <jurij@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Jurij Smakov <jurij@debian.org>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-suncg6
commit d15d9fb63a357a26241cac27a614398f5834faf6
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Nov 25 22:56:57 2007 -0500
* Add 0001-Request-8bpp-depth-from-the-server.diff
The driver only supports 8bpp so request it rather than force the user to
have this in their xorg.conf. Submitted upstream.
diff --git a/debian/changelog b/debian/changelog
index 18dacad..9ad4191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ xserver-xorg-video-suncg6 (1:1.1.0-6) UNRELEASED; urgency=low
* Enable our patch system
+ Add quilt to build depends
+ * Add 0001-Request-8bpp-depth-from-the-server.diff
+ The driver only supports 8bpp so request it rather than force the user to
+ have this in their xorg.conf. Submitted upstream.
- -- David Nusinow <dnusinow@debian.org> Sun, 25 Nov 2007 22:55:00 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 25 Nov 2007 22:56:17 -0500
xserver-xorg-video-suncg6 (1:1.1.0-5) UNRELEASED; urgency=low
diff --git a/debian/patches/0001-Request-8bpp-depth-from-the-server.diff b/debian/patches/0001-Request-8bpp-depth-from-the-server.diff
new file mode 100644
index 0000000..314799a
--- /dev/null
+++ b/debian/patches/0001-Request-8bpp-depth-from-the-server.diff
@@ -0,0 +1,25 @@
+From 2d3bfb1beb8d1b00a3872ccb805658651e363601 Mon Sep 17 00:00:00 2001
+From: David Nusinow <dnusinow@debian.org>
+Date: Sun, 25 Nov 2007 22:46:38 -0500
+Subject: [PATCH] Request 8bpp depth from the server
+
+---
+ src/cg6_driver.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/cg6_driver.c b/src/cg6_driver.c
+index 378def7..de13a2a 100644
+--- a/src/cg6_driver.c
++++ b/src/cg6_driver.c
+@@ -334,7 +334,7 @@ CG6PreInit(ScrnInfoPtr pScrn, int flags)
+ deal with depth
+ *********************/
+
+- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, NoDepth24Support)) {
++ if (!xf86SetDepthBpp(pScrn, 8, 0, 0, NoDepth24Support)) {
+ return FALSE;
+ } else {
+ /* Check that the returned depth is one we support */
+--
+1.5.3.6
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..375b6ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Request-8bpp-depth-from-the-server.diff
commit a24726021ea7e4f236b6813ffc50a3f5793a71b1
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Nov 25 22:55:14 2007 -0500
* Enable our patch system
+ Add quilt to build depends
diff --git a/debian/changelog b/debian/changelog
index 8e5577d..18dacad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-suncg6 (1:1.1.0-6) UNRELEASED; urgency=low
+
+ * Enable our patch system
+ + Add quilt to build depends
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 25 Nov 2007 22:55:00 -0500
+
xserver-xorg-video-suncg6 (1:1.1.0-5) UNRELEASED; urgency=low
* Add upstream URL to debian/copyright.
diff --git a/debian/control b/debian/control
index 3b02551..4b0a907 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Jurij Smakov <jurij@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-core-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-fonts-dev, quilt
Standards-Version: 3.7.2.0
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-suncg6
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-suncg6.git
diff --git a/debian/rules b/debian/rules
index 3e3b6a1..c5274f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -44,7 +44,7 @@ build-stamp:
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
Reply to: