[Pkg-fglrx-devel] r1322 - in fglrx-driver/trunk/debian: . patches

[Michael Gilbert]

Author: mgilbert
Date: 2013-12-31 04:34:04 +0000 (Tue, 31 Dec 2013)
New Revision: 1322

Removed:
   fglrx-driver/trunk/debian/patches/07-proc-permissions.diff
Modified:
   fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
   fglrx-driver/trunk/debian/rules
   fglrx-driver/trunk/debian/rules.defs
Log:
merge experimental branch

Modified: fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides	2013-12-02 00:02:26 UTC (rev 1321)
+++ fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides	2013-12-31 04:34:04 UTC (rev 1322)
@@ -5,5 +5,8 @@
 sharedobject-in-library-directory-missing-soname
 [i386]: spelling-error-in-binary usr/lib*/libamdocl32.so ment meant
 [i386]: spelling-error-in-binary usr/lib*/libamdocl32.so nam name
+[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so Unkown Unknown
 [amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so ment meant
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so nam name
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so Unkown Unknown
 [amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so tEH the

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-12-02 00:02:26 UTC (rev 1321)
+++ fglrx-driver/trunk/debian/changelog	2013-12-31 04:34:04 UTC (rev 1322)
@@ -1,3 +1,26 @@
+fglrx-driver (1:13.11~betav9.4-1) experimental; urgency=low
+
+  * New upstream beta release 13.11-beta V9.4 (2013-11-22) (13.25.18).
+  * Enable building the libgl1-fglrx-glx-i386 package.
+
+ -- Andreas Beckmann <anbe at debian.org>  Mon, 02 Dec 2013 00:49:57 +0100
+
+fglrx-driver (1:13.11~betav6-1) experimental; urgency=low
+
+  * New upstream beta release 13.11-beta6 (2013-10-25) (13.25.18).
+  * Merge changes from 1:13.4-4.  (Closes: #699879, #695884, #718220)
+  * Disable building the NEW libgl1-fglrx-glx-i386 package.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 10 Nov 2013 19:18:56 +0100
+
+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-3) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.5. No changes needed.

Deleted: fglrx-driver/trunk/debian/patches/07-proc-permissions.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/07-proc-permissions.diff	2013-12-02 00:02:26 UTC (rev 1321)
+++ fglrx-driver/trunk/debian/patches/07-proc-permissions.diff	2013-12-31 04:34:04 UTC (rev 1322)
@@ -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/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2013-12-02 00:02:26 UTC (rev 1321)
+++ fglrx-driver/trunk/debian/patches/series	2013-12-31 04:34:04 UTC (rev 1322)
@@ -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/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2013-12-02 00:02:26 UTC (rev 1321)
+++ fglrx-driver/trunk/debian/rules	2013-12-31 04:34:04 UTC (rev 1322)
@@ -249,3 +249,9 @@
 	# used to override the version number for the .zip and .run files.
 endif
 .PHONY: get-orig-source repack_upstream_archive
+
+# only invoked manually
+.PHONY: file-list
+file-list: debian/files_$(upstream_version)
+debian/files_$(upstream_version):
+	find . -type f | sed 's/$(upstream_version)/VERSION/g' | grep -v '^./debian/' | sort > $@

Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2013-12-02 00:02:26 UTC (rev 1321)
+++ fglrx-driver/trunk/debian/rules.defs	2013-12-31 04:34:04 UTC (rev 1322)
@@ -1,5 +1,5 @@
 MULTIARCH		 = yes
-SIGNATURE_VERSION	 = 13.8~beta1
+SIGNATURE_VERSION	 = 13.11~betav9.4
 XORG_ABI_LIST		 = 14 13 12 11 10 8 6.0
 
 INSTALLER_PREFIX	 = amd-catalyst