[Pkg-fglrx-devel] r1298 - in fglrx-driver/branches/13.11-experimental/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2013-11-10 16:55:45 +0000 (Sun, 10 Nov 2013)
New Revision: 1298

Removed:
   fglrx-driver/branches/13.11-experimental/debian/patches/07-proc-permissions.diff
Modified:
   fglrx-driver/branches/13.11-experimental/debian/changelog
   fglrx-driver/branches/13.11-experimental/debian/patches/series
   fglrx-driver/branches/13.11-experimental/debian/rules
Log:
merge the changes from 1:13.11~betav1-1

Modified: fglrx-driver/branches/13.11-experimental/debian/changelog
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/changelog	2013-11-10 16:51:45 UTC (rev 1297)
+++ fglrx-driver/branches/13.11-experimental/debian/changelog	2013-11-10 16:55:45 UTC (rev 1298)
@@ -1,3 +1,11 @@
+fglrx-driver (1:13.11~betav1-1) experimental; urgency=low
+
+  * New upstream beta release 13.11-betav1 (2013-10-01).
+  * Drop /proc permissions patch, which is now applied upstream.
+  * Automate signature for beta releases.
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 13 Oct 2013 06:44:44 +0000
+
 fglrx-driver (1:13.8~beta1-2) experimental; urgency=low
 
   * Support xorg 1.14 (closes: #718724)
@@ -17,7 +25,7 @@
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 04 Aug 2013 00:28:24 +0200
 
-fglrx-driver (1:13.4-4) UNRELEASED; urgency=low
+fglrx-driver (1:13.4-4) unstable; urgency=low
 
   * 13.4-2013.05.29.diff: New patch containing the changes from upstream
     re-release 13.4 (2013-05-29) (12.104)

Deleted: fglrx-driver/branches/13.11-experimental/debian/patches/07-proc-permissions.diff
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/patches/07-proc-permissions.diff	2013-11-10 16:51:45 UTC (rev 1297)
+++ fglrx-driver/branches/13.11-experimental/debian/patches/07-proc-permissions.diff	2013-11-10 16:55:45 UTC (rev 1298)
@@ -1,17 +0,0 @@
-description: fix /proc/ati permissions
-author: Rico Tzschichholz <ricotz at ubuntu.com>
-debian-bug: 718723
-origin: https://launchpadlibrarian.net/146602556/fglrx-installer_2%3A13.200~beta-0ubuntu1~xedgers~precise1_2%3A13.200~beta-0ubuntu1~xedgers~precise2.diff.gz
-Index: 13.8-experimental/common/lib/modules/fglrx/build_mod/firegl_public.c
-===================================================================
---- 13.8-experimental.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-07-29 11:54:07.000000000 -0400
-+++ 13.8-experimental/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-08-04 15:51:44.935168959 -0400
-@@ -821,7 +821,7 @@
-     KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list);
-     if (!minor)
-     {
--        root = KCL_create_proc_dir(NULL, "ati", S_IFDIR);
-+        root = KCL_create_proc_dir(NULL, "ati", S_IFDIR|S_IRUGO|S_IXUGO);
-     }
- 
-     if (!root)

Modified: fglrx-driver/branches/13.11-experimental/debian/patches/series
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/patches/series	2013-11-10 16:51:45 UTC (rev 1297)
+++ fglrx-driver/branches/13.11-experimental/debian/patches/series	2013-11-10 16:55:45 UTC (rev 1298)
@@ -1,4 +1,3 @@
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
 06-stub-for-agpless-kernel.diff
-07-proc-permissions.diff

Modified: fglrx-driver/branches/13.11-experimental/debian/rules
===================================================================
--- fglrx-driver/branches/13.11-experimental/debian/rules	2013-11-10 16:51:45 UTC (rev 1297)
+++ fglrx-driver/branches/13.11-experimental/debian/rules	2013-11-10 16:55:45 UTC (rev 1298)
@@ -126,7 +126,8 @@
 
 override_dh_install:
 	dh_install
-	! grep UNSIGNED debian/$(fglrx)-driver/etc/ati/signature
+	! grep UNSIGNED debian/$(fglrx)-driver/etc/ati/signature || \
+		cp debian/import/signature debian/$(fglrx)-driver/etc/ati/signature
 	chrpath -d -k debian/$(fglrx)-control/usr/bin/amdcccle
 	test ! -f debian/libgl1-$(fglrx)-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2 || \
 		rpl -e	'/usr/X11R6/lib/modules/dri\0' \