[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-neomagic: Changes to 'debian-unstable'



 debian/changelog                            |    8 ++++++--
 debian/control                              |    2 +-
 debian/patches/01_implicit_declaration.diff |   17 +++++++++++++++++
 debian/patches/series                       |    1 +
 debian/rules                                |    4 ++--
 5 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit a0cc1eb53525e9c3e1fc073f0f1cefeba6856326
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Feb 28 18:53:55 2007 +0100

    Fix incorrect modes calculation (closes: #412873).
    
    Add patch from http://bugs.freedesktop.org/show_bug.cgi?id=7873
    Also add build-dep on quilt and make necessary changes in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index d59e4be..e693280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-xserver-xorg-video-neomagic (1:1.1.1-5) UNRELEASED; urgency=low
+xserver-xorg-video-neomagic (1:1.1.1-5) unstable; urgency=high
 
   * Add link to xserver-xorg-core bug script, so that bugreports contain
     the user's config and log files.
   * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
     versions don't have the bug script.
+  * Add patch to fix implicit declaration of abs(), which caused out-of-range
+    modes calculation, thanks to Nicolas Khanukaev <nikolaikin@free.fr>
+    (closes: #412873).
+  * Add build-dep on quilt, and adapt debian/rules to handle the patches.
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Tue,  7 Nov 2006 07:30:42 +0100
+ -- Julien Cristau <jcristau@debian.org>  Wed, 28 Feb 2007 18:38:13 +0100
 
 xserver-xorg-video-neomagic (1:1.1.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d1b43c6..1b01ec3 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>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev (>= 2:1.1.1), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, pkg-config, xserver-xorg-dev (>= 2:1.1.1), x11proto-video-dev, x11proto-xf86dga-dev, x11proto-core-dev, x11proto-fonts-dev, x11proto-randr-dev, x11proto-render-dev, x11proto-xext-dev
 Standards-Version: 3.6.1
 
 Package: xserver-xorg-video-neomagic
diff --git a/debian/patches/01_implicit_declaration.diff b/debian/patches/01_implicit_declaration.diff
new file mode 100644
index 0000000..318a616
--- /dev/null
+++ b/debian/patches/01_implicit_declaration.diff
@@ -0,0 +1,17 @@
+Patch stolen from
+http://bugs.freedesktop.org/show_bug.cgi?id=7873
+
+Index: xserver-xorg-video-neomagic/src/neo_driver.c
+===================================================================
+--- xserver-xorg-video-neomagic.orig/src/neo_driver.c	2007-02-28 18:49:22.000000000 +0100
++++ xserver-xorg-video-neomagic/src/neo_driver.c	2007-02-28 18:52:59.000000000 +0100
+@@ -118,6 +118,9 @@
+ #include <X11/extensions/xf86dgastr.h>
+ #endif
+ 
++/* For abs() */
++#include <stdlib.h>
++
+ /* Mandatory functions */
+ static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
+ static void     NEOIdentify(int flags);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4659972
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_implicit_declaration.diff
diff --git a/debian/rules b/debian/rules
index b4f2116..0e61146 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: