[pkg-fso-commits] [xf86-video-glamo] 06/11: Import MNU from Matthias Klose for #672056

[Gilles Filippini]

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 d81017966e3e570f76deeff51aeefe542ddacc53
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Sep 23 14:49:21 2013 +0200

    Import MNU from Matthias Klose for #672056
---
 debian/changelog                  |   20 +++++++++++++++++---
 debian/patches/ftbfs-gcc-4.7.diff |   21 +++++++++++++++++++++
 debian/patches/series             |    1 +
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88c3c71..a1558f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
-xf86-video-glamo (0.0.0+20110719.gitcb9ed170-1) unstable; urgency=low
+xf86-video-glamo (0.0.0+20100630.git16af3c00-3.1) unstable; urgency=low
 
-  * New upstream snapshot release.
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #672056.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 10 May 2012 00:18:15 +0000
 
- -- Timo Jyrinki <timo at debian.org>  Sat, 27 Aug 2011 16:19:37 +0000
+xf86-video-glamo (0.0.0+20100630.git16af3c00-3) unstable; urgency=low
+
+  * Source format: 3.0 (quilt)
+  * debian/control:
+    + Drop Build-Depends on quilt
+    + Homepage
+    + Bump Standards-Version to 3.9.2 (no change needed)
+  * Drop patch 01-fix-unused-warning.patch which created useless 'unused'
+    variables, leading to FTBFS with gcc > 4.6 (closes: #625436) 
+  * Add short description to patch 03-force-kms-off-v2.patch
+
+ -- Gilles Filippini <pini at debian.org>  Sat, 04 Jun 2011 23:14:59 +0200
 
 xf86-video-glamo (0.0.0+20100630.git16af3c00-2) unstable; urgency=low
 
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..aef5336
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,21 @@
+Description: Fix FTBFS with gcc-4.7
+Index: xf86-video-glamo-0.0.0+20110719.gitcb9ed170/src/glamo-driver.c
+@@ -286,7 +284,7 @@
+ 
+ 	for (i = 0; i < numDevSections; i++) {
+ 
+-		dev = xf86FindOptionValue(devSections[i]->options, "Device");
++		dev = (char *) xf86FindOptionValue(devSections[i]->options, "Device");
+ 		if (fbdevHWProbe(NULL, dev, NULL)) {
+ 			int entity;
+ 			pScrn = NULL;
+@@ -430,7 +428,7 @@
+ 
+     pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+ 
+-    fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
++    fb_device = (char *) xf86FindOptionValue(pGlamo->pEnt->device->options, "Device");
+ 
+     /* open device */
+     if (!fbdevHWInit(pScrn, NULL, fb_device))
+
diff --git a/debian/patches/series b/debian/patches/series
index 1e1f189..503570f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 03-force-kms-off-v2.patch
+ftbfs-gcc-4.7.diff

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/xf86-video-glamo.git