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

libdrm: Changes to 'debian-unstable'



 debian/changelog                     |   21 +++++++++++++++++++++
 debian/control                       |    4 ++--
 debian/libdrm2.NEWS                  |    8 ++++++++
 debian/patches/01_default_perms.diff |   13 +++++++++++++
 debian/patches/series                |    1 +
 debian/rules                         |    5 +++--
 6 files changed, 48 insertions(+), 4 deletions(-)

New commits:
commit 36b03f05e1b7e6ecf687208afafab7d68f6ce076
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Apr 20 05:07:28 2007 +0200

    Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 47966a2..0b2df6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-libdrm (2.3.0-4) experimental; urgency=low
+libdrm (2.3.0-4) unstable; urgency=low
 
+  [ David Nusinow ]
   * Add NEWS.Debian explaining the change in the last upload to interested
-    administrators. 
+    administrators.
 
- -- David Nusinow <dnusinow@debian.org>  Wed, 18 Apr 2007 22:44:21 -0400
+  [ Julien Cristau ]
+  * Upload to unstable.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 20 Apr 2007 05:06:34 +0200
 
 libdrm (2.3.0-3) experimental; urgency=low
 

commit 851a9fd0e56d4bba68aba0073ef7017f79156e76
Author: David Nusinow <dnusinow@debian.org>
Date:   Wed Apr 18 22:50:39 2007 -0400

    * Add NEWS.Debian explaining the change in the last upload to interested
      administrators.

diff --git a/debian/changelog b/debian/changelog
index 5c77673..47966a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdrm (2.3.0-4) experimental; urgency=low
+
+  * Add NEWS.Debian explaining the change in the last upload to interested
+    administrators. 
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 18 Apr 2007 22:44:21 -0400
+
 libdrm (2.3.0-3) experimental; urgency=low
 
   * Add myself to uploaders
diff --git a/debian/libdrm2.NEWS b/debian/libdrm2.NEWS
new file mode 100644
index 0000000..f99652b
--- /dev/null
+++ b/debian/libdrm2.NEWS
@@ -0,0 +1,8 @@
+libdrm (2.3.0-4) experimental; urgency=low
+
+  * We are now shipping libdrm with the default permissions set to 666,
+    rather than the upstream default of 660. If you have untrusted users,
+    you should configure the X server to explicitly use a mode of 660 in
+    the xorg.conf.
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 18 Apr 2007 22:44:21 -0400

commit 7901afcce99a8af97e560d34e3685fd55eaa9c1a
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Apr 15 13:11:06 2007 -0400

    * Add myself to uploaders
    * Patch libdrm to default to device permission 666 so we don't have to do it
      in xorg.conf. The only way libdrm can do anything is through the server
      anyway. This can still be overridden by a user's xorg.conf. This change
      also requires adding quilt to the build-depends

diff --git a/debian/changelog b/debian/changelog
index e1fcbca..fbbf428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libdrm (2.3.0-2) experimental; urgency=low
+
+  * Add myself to uploaders
+  * Patch libdrm to default to device permission 666 so we don't have to do it
+    in xorg.conf. The only way libdrm can do anything is through the server
+    anyway. This can still be overridden by a user's xorg.conf. This change
+    also requires adding quilt to the build-depends
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 15 Apr 2007 13:08:50 -0400
+
 libdrm (2.3.0-1) experimental; urgency=low
 
   [ Thierry Reding ]
diff --git a/debian/control b/debian/control
index bc273d1..7e67d85 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libdrm
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <julien.cristau@ens-lyon.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (>= 1.13.19)
+Uploaders: Thierry Reding <thierry@gilfi.de>, Julien Cristau <julien.cristau@ens-lyon.org>, David Nusinow <dnusinow@debian.org>
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libx11-dev, dpkg-dev (>= 1.13.19), quilt (>= 0.40)
 Standards-Version: 3.7.2
 Section: libs
 
diff --git a/debian/patches/01_default_perms.diff b/debian/patches/01_default_perms.diff
new file mode 100644
index 0000000..371fc05
--- /dev/null
+++ b/debian/patches/01_default_perms.diff
@@ -0,0 +1,13 @@
+Index: libdrm/libdrm/xf86drm.h
+===================================================================
+--- libdrm.orig/libdrm/xf86drm.h	2007-04-15 12:37:15.000000000 -0400
++++ libdrm/libdrm/xf86drm.h	2007-04-15 12:39:16.000000000 -0400
+@@ -46,7 +46,7 @@
+ /* 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"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8ca2297
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_default_perms.diff
diff --git a/debian/rules b/debian/rules
index 18ce9ba..7c2b2c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -28,13 +29,13 @@ config.status: configure
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-static=yes
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp



Reply to: