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

Bug#724330: xserver-xorg-video-qxl: diff for NMU version 0.1.0-2.1



tags 724330 + patch
tags 724330 + pending
thanks

Dear maintainer,

I've prepared an NMU for xserver-xorg-video-qxl (versioned as 0.1.0-2.1) and
am about to upload it.  See the attached diff.

Cheers,
Julien
diff -Nru xserver-xorg-video-qxl-0.1.0/debian/changelog xserver-xorg-video-qxl-0.1.0/debian/changelog
--- xserver-xorg-video-qxl-0.1.0/debian/changelog	2013-05-19 04:24:26.000000000 +0200
+++ xserver-xorg-video-qxl-0.1.0/debian/changelog	2013-09-29 14:28:21.000000000 +0200
@@ -1,3 +1,10 @@
+xserver-xorg-video-qxl (0.1.0-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix build against xserver 1.14 (closes: #724330).
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 29 Sep 2013 14:28:20 +0200
+
 xserver-xorg-video-qxl (0.1.0-2) unstable; urgency=low
 
   * Upload to unstable
diff -Nru xserver-xorg-video-qxl-0.1.0/debian/patches/mibstore.patch xserver-xorg-video-qxl-0.1.0/debian/patches/mibstore.patch
--- xserver-xorg-video-qxl-0.1.0/debian/patches/mibstore.patch	1970-01-01 01:00:00.000000000 +0100
+++ xserver-xorg-video-qxl-0.1.0/debian/patches/mibstore.patch	2013-09-29 14:29:31.000000000 +0200
@@ -0,0 +1,21 @@
+commit 95a08ad7ab92613f810921becf7aa91fa510a8dd
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Wed Jan 9 22:55:47 2013 -0500
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax@redhat.com>
+    (cherry picked from commit 819b1f62efbecf33db7bb0b4402a798262ae4574)
+
+diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h
+index ad83963..e3c581c 100644
+--- a/src/uxa/uxa-priv.h
++++ b/src/uxa/uxa-priv.h
+@@ -45,7 +45,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
diff -Nru xserver-xorg-video-qxl-0.1.0/debian/patches/series xserver-xorg-video-qxl-0.1.0/debian/patches/series
--- xserver-xorg-video-qxl-0.1.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ xserver-xorg-video-qxl-0.1.0/debian/patches/series	2013-09-29 14:29:40.000000000 +0200
@@ -0,0 +1 @@
+mibstore.patch

Attachment: signature.asc
Description: Digital signature


Reply to: