libdrm: Changes to 'ubuntu'
debian/changelog | 1 +
tests/Makefile.am | 2 --
xf86drm.h | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 9558055d7feb654b34fe45082e33adfe32ae8423
Author: Sven Joachim <svenjoac@gmx.de>
Date: Fri Feb 8 18:52:48 2013 +0100
Undo accidental changes to upstream files
Made in commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea9026e..a3a59bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,6 @@ check_PROGRAMS = \
dristat \
drmstat
-dristat_LDADD = $(CLOCK_LIB)
-
SUBDIRS = modeprint
if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index ad9653e..5ecb284 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -74,7 +74,7 @@ extern "C" {
/* Default /dev/dri directory permissions 0755 */
#define DRM_DEV_DIRMODE \
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
#define DRM_DIR_NAME "/dev/dri"
#define DRM_DEV_NAME "%s/card%d"
commit b3fd78c9285cdc7d4eee01c1ee97f9ffe94622d9
Author: Sven Joachim <svenjoac@gmx.de>
Date: Fri Feb 8 19:00:41 2013 +0100
Fix up debian/changelog
Manpages were never disabled in versions uploaded to Debian, and
docbook-xsl build dependency was added in commit
2434d92d8d36dac8a94a76ab21f014d562b6deb1.
diff --git a/debian/changelog b/debian/changelog
index 835fac9..49574f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
- * Re-enable building of manpages, and build-depend on xsltproc
+ * Build-depend on xsltproc and docbook-xsl.
[ Timo Aaltonen ]
* control: Bump policy to 3.9.4, no changes.
commit 63bcd055b68839354145c4e09beda855ad05ea36
Author: Sven Joachim <svenjoac@gmx.de>
Date: Fri Feb 8 18:52:48 2013 +0100
Undo accidental changes to upstream files
Made in commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ea9026e..a3a59bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,6 @@ check_PROGRAMS = \
dristat \
drmstat
-dristat_LDADD = $(CLOCK_LIB)
-
SUBDIRS = modeprint
if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index ad9653e..5ecb284 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -74,7 +74,7 @@ extern "C" {
/* Default /dev/dri directory permissions 0755 */
#define DRM_DEV_DIRMODE \
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
+#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
#define DRM_DIR_NAME "/dev/dri"
#define DRM_DEV_NAME "%s/card%d"
commit 1c2190cb05ebbe7a76905de6a4051387ac2c3904
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Feb 8 13:30:56 2013 +0100
add docbook-xsl to build-depends too
diff --git a/debian/control b/debian/control
index acfa4f3..d634ed5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Build-Depends:
dh-autoreconf,
quilt,
xsltproc,
+ docbook-xsl,
libx11-dev,
pkg-config,
libpthread-stubs0-dev,
commit 2434d92d8d36dac8a94a76ab21f014d562b6deb1
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Feb 8 13:22:23 2013 +0100
Re-enable building of manpages, and build-depend on xsltproc
diff --git a/debian/changelog b/debian/changelog
index 1982623..835fac9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libdrm (2.4.42-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
+ * Re-enable building of manpages, and build-depend on xsltproc
[ Timo Aaltonen ]
* control: Bump policy to 3.9.4, no changes.
diff --git a/debian/control b/debian/control
index 8ae824c..acfa4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Build-Depends:
debhelper (>= 9),
dh-autoreconf,
quilt,
+ xsltproc,
libx11-dev,
pkg-config,
libpthread-stubs0-dev,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a3a59bd..ea9026e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,6 +10,8 @@ check_PROGRAMS = \
dristat \
drmstat
+dristat_LDADD = $(CLOCK_LIB)
+
SUBDIRS = modeprint
if HAVE_LIBKMS
diff --git a/xf86drm.h b/xf86drm.h
index 5ecb284..ad9653e 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -74,7 +74,7 @@ extern "C" {
/* Default /dev/dri directory permissions 0755 */
#define DRM_DEV_DIRMODE \
(S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH)
-#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP)
+#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
#define DRM_DIR_NAME "/dev/dri"
#define DRM_DEV_NAME "%s/card%d"
commit 34041b5572dd4ad7057cc6d801a17f2ac8d02679
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Feb 8 13:17:35 2013 +0100
add manpages back to libdrm-dev
diff --git a/debian/libdrm-dev.install b/debian/libdrm-dev.install
index 078a4c3..50b9af9 100644
--- a/debian/libdrm-dev.install
+++ b/debian/libdrm-dev.install
@@ -2,5 +2,5 @@ usr/include/*
usr/lib/*/lib*.a
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*
-#usr/share/man/man3
-#usr/share/man/man7
+usr/share/man/man3/*
+usr/share/man/man7/*
Reply to: