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

libdrm: Changes to 'debian-unstable'



 debian/control                       |    4 ++--
 debian/patches/02_fix_qxl_drm_h.diff |   33 ---------------------------------
 debian/patches/series                |    1 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 3d9b1e691680272bb49a445bbfc0713f05b67f62
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Wed Jul 30 12:09:10 2014 +0200

    fix too long description for freedreno

diff --git a/debian/control b/debian/control
index 67f2a2e..7110c19 100644
--- a/debian/control
+++ b/debian/control
@@ -213,7 +213,7 @@ Depends:
  ${misc:Depends},
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
-Description: Userspace interface to msm/kgsl-specific kernel DRM services -- runtime
+Description: Userspace interface to msm/kgsl kernel DRM services -- runtime
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion
  of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on
@@ -227,7 +227,7 @@ Depends:
  libdrm-freedreno1 (= ${binary:Version}),
  ${misc:Depends},
 Multi-Arch: same
-Description: Userspace interface to msm/kgsl-specific kernel DRM services -- debugging symbols
+Description: Userspace interface to msm/kgsl kernel DRM services -- debugging symbols
  This library implements the userspace interface to the kernel DRM services.
  DRM stands for "Direct Rendering Manager", which is the kernelspace portion
  of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on

commit 8004a0512617bc74f62b43d2fd599469ee4a4625
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Wed Jul 30 11:44:36 2014 +0200

    drop upstreamed patch

diff --git a/debian/patches/02_fix_qxl_drm_h.diff b/debian/patches/02_fix_qxl_drm_h.diff
deleted file mode 100644
index 4018ca7..0000000
--- a/debian/patches/02_fix_qxl_drm_h.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1d048a8f2caec10eb0c9647f0554a60be619602d Mon Sep 17 00:00:00 2001
-From: Andreas Boll <andreas.boll.dev@gmail.com>
-Date: Mon, 5 May 2014 23:28:23 +0200
-Subject: [PATCH libdrm] libdrm: Fix drm.h include in qxl drm header file
-
-Use "drm.h" instead of "drm/drm.h" as used in the other header files.
-Fixes xserver-xorg-video-qxl build with KMS support on Debian, where this
-file is installed in /usr/include/libdrm.
-
-Fixes Debian bug #746807
-
-Reported-by: Bastian Blank <waldi@debian.org>
-Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
----
- include/drm/qxl_drm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/drm/qxl_drm.h b/include/drm/qxl_drm.h
-index 5d7de70..1e331a8 100644
---- a/include/drm/qxl_drm.h
-+++ b/include/drm/qxl_drm.h
-@@ -25,7 +25,7 @@
- #define QXL_DRM_H
- 
- #include <stddef.h>
--#include "drm/drm.h"
-+#include "drm.h"
- 
- /* Please note that modifications to all structs defined here are
-  * subject to backwards-compatibility constraints.
--- 
-1.9.2
-
diff --git a/debian/patches/series b/debian/patches/series
index eb3793b..c9175c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_default_perms.diff
-02_fix_qxl_drm_h.diff
 03_hide_symbols.diff
\ No newline at end of file


Reply to: