[pkg-fso-commits] [xf86-video-glamo] 01/05: Fix patch format for ftbfs-gcc-4.7.diff
Gilles Filippini
pini at moszumanska.debian.org
Tue Jul 8 22:11:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch debian
in repository xf86-video-glamo.
commit a1b77f1e07a21a63fed5ba90ecb0758c1d2e3b1d
Author: Gilles Filippini <pini at debian.org>
Date: Tue Jul 8 23:31:14 2014 +0200
Fix patch format for ftbfs-gcc-4.7.diff
---
debian/patches/ftbfs-gcc-4.7.diff | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
index aef5336..3e61c45 100644
--- a/debian/patches/ftbfs-gcc-4.7.diff
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -1,6 +1,9 @@
Description: Fix FTBFS with gcc-4.7
-Index: xf86-video-glamo-0.0.0+20110719.gitcb9ed170/src/glamo-driver.c
-@@ -286,7 +284,7 @@
+Index: xf86-video-glamo/src/glamo-driver.c
+===================================================================
+--- xf86-video-glamo.orig/src/glamo-driver.c
++++ xf86-video-glamo/src/glamo-driver.c
+@@ -286,7 +286,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *
for (i = 0; i < numDevSections; i++) {
@@ -9,7 +12,7 @@ Index: xf86-video-glamo-0.0.0+20110719.gitcb9ed170/src/glamo-driver.c
if (fbdevHWProbe(NULL, dev, NULL)) {
int entity;
pScrn = NULL;
-@@ -430,7 +428,7 @@
+@@ -430,7 +430,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flag
pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
@@ -18,4 +21,3 @@ Index: xf86-video-glamo-0.0.0+20110719.gitcb9ed170/src/glamo-driver.c
/* open device */
if (!fbdevHWInit(pScrn, NULL, fb_device))
-
--
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/xf86-video-glamo.git
More information about the pkg-fso-commits
mailing list