[Pkg-fglrx-devel] r332 - in fglrx-driver/trunk/debian: . patches source
Patrick Matthäi
pmatthaei at alioth.debian.org
Fri Nov 13 12:26:44 UTC 2009
Author: pmatthaei
Date: 2009-11-13 12:26:44 +0000 (Fri, 13 Nov 2009)
New Revision: 332
Added:
fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff
fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff
fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.diff
fglrx-driver/trunk/debian/patches/series
fglrx-driver/trunk/debian/source/
fglrx-driver/trunk/debian/source/format
Removed:
fglrx-driver/trunk/debian/patches/00list
fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.dpatch
fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.dpatch
fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.dpatch
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/rules
Log:
* Convert package to quilt and the 3.0 (quilt) format.
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/changelog 2009-11-13 12:26:44 UTC (rev 332)
@@ -2,8 +2,9 @@
* Add new XvBA libraries.
Closes: #554470
+ * Convert package to quilt and the 3.0 (quilt) format.
- -- Patrick Matthäi <pmatthaei at debian.org> Thu, 05 Nov 2009 11:46:29 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 13 Nov 2009 13:26:14 +0100
fglrx-driver (1:9-10-2) unstable; urgency=low
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/control 2009-11-13 12:26:44 UTC (rev 332)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
Uploaders: Bertrand Marc <beberking at gmail.com>, Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: debhelper (>= 7), dpatch, bzip2, ia32-libs [amd64], libx11-6, libxext6,
+Build-Depends: debhelper (>= 7), quilt, bzip2, ia32-libs [amd64], libx11-6, libxext6,
libgl1-mesa-glx, libxrandr2, libice6, libsm6, libfontconfig1, libxi6, libxcursor1,
xsltproc, rpl, docbook-xml (>= 4.4), docbook-xsl (>= 1.70.1), libxinerama-dev
Standards-Version: 3.8.3
Deleted: fglrx-driver/trunk/debian/patches/00list
===================================================================
--- fglrx-driver/trunk/debian/patches/00list 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/patches/00list 2009-11-13 12:26:44 UTC (rev 332)
@@ -1,3 +0,0 @@
-01-CONFIG_X86_XEN.dpatch
-03-authatieventsd.sh.dpatch
-05-fix_missing_signal_include.dpatch
Copied: fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff (from rev 331, fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.dpatch)
===================================================================
--- fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff (rev 0)
+++ fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.diff 2009-11-13 12:26:44 UTC (rev 332)
@@ -0,0 +1,21 @@
+# Adds support for XEN.
+
+diff -Naur fglrx-driver-8-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-8-12/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-8-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-10 19:27:58.000000000 +0100
++++ fglrx-driver-8-12/common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-14 13:44:52.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <linux/autoconf.h>
+
+ #if !defined(CONFIG_X86_PC)
++#if !defined(CONFIG_X86_XEN)
+ #if !defined(CONFIG_X86_64)
+ #if !defined(CONFIG_X86_VOYAGER)
+ #if !defined(CONFIG_X86_NUMAQ)
+@@ -47,6 +48,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+
+ /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
+ * a static inline function that uses a GPL-only symbol in a header
Deleted: fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.dpatch
===================================================================
--- fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.dpatch 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/patches/01-CONFIG_X86_XEN.dpatch 2009-11-13 12:26:44 UTC (rev 332)
@@ -1,26 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-CONFIG_X86_XEN.dpatch by Patrick Matthäi <pmatthaei at debian.org>
-##
-## DP: Adds support for XEN.
-
- at DPATCH@
-
-diff -Naur fglrx-driver-8-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-8-12/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-8-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-10 19:27:58.000000000 +0100
-+++ fglrx-driver-8-12/common/lib/modules/fglrx/build_mod/firegl_public.c 2008-12-14 13:44:52.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <linux/autoconf.h>
-
- #if !defined(CONFIG_X86_PC)
-+#if !defined(CONFIG_X86_XEN)
- #if !defined(CONFIG_X86_64)
- #if !defined(CONFIG_X86_VOYAGER)
- #if !defined(CONFIG_X86_NUMAQ)
-@@ -47,6 +48,7 @@
- #endif
- #endif
- #endif
-+#endif
-
- /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
- * a static inline function that uses a GPL-only symbol in a header
Copied: fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff (from rev 331, fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.dpatch)
===================================================================
--- fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff (rev 0)
+++ fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.diff 2009-11-13 12:26:44 UTC (rev 332)
@@ -0,0 +1,72 @@
+# Make the authatieventsd.sh working on Debian.
+
+diff -Naur fglrx-driver-8-12.orig/common/etc/ati/authatieventsd.sh fglrx-driver-8-12/common/etc/ati/authatieventsd.sh
+--- fglrx-driver-8-12.orig/common/etc/ati/authatieventsd.sh 2008-12-10 19:27:58.000000000 +0100
++++ fglrx-driver-8-12/common/etc/ati/authatieventsd.sh 2008-12-14 13:49:43.000000000 +0100
+@@ -42,6 +42,16 @@
+ return 0
+ fi
+
++ # Check for xauth
++ XAUTH_AUTH_MASK=/var/run/xauth/A$1*
++ XAUTH_AUTH_FILE=`ls -t $XAUTH_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file
++ if [ -n "$XAUTH_AUTH_FILE" ]; then
++ SERVER_AUTH_FILE=$XAUTH_AUTH_FILE
++ DISP_SEARCH_STRING="#ffff#"
++ return 0
++ fi
++
++
+ # Check gdm
+
+ GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth
+@@ -55,12 +65,14 @@
+
+ for XPID in `pidof X`; do
+ TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2`
++ if [ -n "$TRIAL_XAUTH_FILE" ]; then
+ TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"`
+ if [ -n "$TRIAL_XAUTH_KEY" ]; then
+ SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE
+ DISP_SEARCH_STRING="unix$1"
+ return 0
+ fi
++ fi
+ done
+
+ # Couldn't find the key
+@@ -84,15 +96,29 @@
+ grant)
+ GetServerAuthFile $2 || exit -1
+ DISP_AUTH_KEY=`xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{ print $3 }'`
+- if [ -n "$DISP_AUTH_KEY" ]; then
+- xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
+- else
+- exit -1
++ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
++ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
++ if [ -n "$DISP_AUTH_KEY" ]; then
++ su $user -c "xauth -f $3 add $2 . $DISP_AUTH_KEY" || exit -1
++ else
++ exit -1
++ fi
++ else
++ if [ -n "$DISP_AUTH_KEY" ]; then
++ xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
++ else
++ exit -1
++ fi
+ fi
+ ;;
+
+ revoke)
+- xauth -f $3 remove $2 || exit -1
++ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
++ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
++ su $user -c "xauth -f $3 remove $2" || exit -1
++ else
++ xauth -f $3 remove $2 || exit -1
++ fi
+ ;;
+
+ *)
Deleted: fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.dpatch
===================================================================
--- fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.dpatch 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.dpatch 2009-11-13 12:26:44 UTC (rev 332)
@@ -1,77 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-authatieventsd.sh.dpatch by Patrick Matthäi <pmatthaei at debian.org>
-##
-## DP: Make the authatieventsd.sh working on Debian.
-
- at DPATCH@
-
-diff -Naur fglrx-driver-8-12.orig/common/etc/ati/authatieventsd.sh fglrx-driver-8-12/common/etc/ati/authatieventsd.sh
---- fglrx-driver-8-12.orig/common/etc/ati/authatieventsd.sh 2008-12-10 19:27:58.000000000 +0100
-+++ fglrx-driver-8-12/common/etc/ati/authatieventsd.sh 2008-12-14 13:49:43.000000000 +0100
-@@ -42,6 +42,16 @@
- return 0
- fi
-
-+ # Check for xauth
-+ XAUTH_AUTH_MASK=/var/run/xauth/A$1*
-+ XAUTH_AUTH_FILE=`ls -t $XAUTH_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file
-+ if [ -n "$XAUTH_AUTH_FILE" ]; then
-+ SERVER_AUTH_FILE=$XAUTH_AUTH_FILE
-+ DISP_SEARCH_STRING="#ffff#"
-+ return 0
-+ fi
-+
-+
- # Check gdm
-
- GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth
-@@ -55,12 +65,14 @@
-
- for XPID in `pidof X`; do
- TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2`
-+ if [ -n "$TRIAL_XAUTH_FILE" ]; then
- TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"`
- if [ -n "$TRIAL_XAUTH_KEY" ]; then
- SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE
- DISP_SEARCH_STRING="unix$1"
- return 0
- fi
-+ fi
- done
-
- # Couldn't find the key
-@@ -84,15 +96,29 @@
- grant)
- GetServerAuthFile $2 || exit -1
- DISP_AUTH_KEY=`xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{ print $3 }'`
-- if [ -n "$DISP_AUTH_KEY" ]; then
-- xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
-- else
-- exit -1
-+ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
-+ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
-+ if [ -n "$DISP_AUTH_KEY" ]; then
-+ su $user -c "xauth -f $3 add $2 . $DISP_AUTH_KEY" || exit -1
-+ else
-+ exit -1
-+ fi
-+ else
-+ if [ -n "$DISP_AUTH_KEY" ]; then
-+ xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
-+ else
-+ exit -1
-+ fi
- fi
- ;;
-
- revoke)
-- xauth -f $3 remove $2 || exit -1
-+ if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
-+ user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
-+ su $user -c "xauth -f $3 remove $2" || exit -1
-+ else
-+ xauth -f $3 remove $2 || exit -1
-+ fi
- ;;
-
- *)
Copied: fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.diff (from rev 331, fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.dpatch)
===================================================================
--- fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.diff (rev 0)
+++ fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.diff 2009-11-13 12:26:44 UTC (rev 332)
@@ -0,0 +1,14 @@
+# Make fglrx compile with linux-2.6.32-rc5.
+
+diff --git a/common/lib/modules/fglrx/build_mod/kcl_io.c b/common/lib/modules/fglrx/build_mod/kcl_io.c
+index a592569..a4b4478 100755
+--- a/common/lib/modules/fglrx/build_mod/kcl_io.c
++++ b/common/lib/modules/fglrx/build_mod/kcl_io.c
+@@ -39,6 +39,7 @@
+ #include <linux/version.h>
+ #include <linux/autoconf.h>
+ #include <linux/poll.h>
++#include <linux/signal.h>
+ #include <asm/io.h>
+
+ #include "kcl_config.h"
Deleted: fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.dpatch
===================================================================
--- fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.dpatch 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/patches/05-fix_missing_signal_include.dpatch 2009-11-13 12:26:44 UTC (rev 332)
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 05-fix_missing_signal_include.patch
-##
-## DP: Make fglrx compile with linux-2.6.32-rc5
-
- at DPATCH@
-
-diff --git a/common/lib/modules/fglrx/build_mod/kcl_io.c b/common/lib/modules/fglrx/build_mod/kcl_io.c
-index a592569..a4b4478 100755
---- a/common/lib/modules/fglrx/build_mod/kcl_io.c
-+++ b/common/lib/modules/fglrx/build_mod/kcl_io.c
-@@ -39,6 +39,7 @@
- #include <linux/version.h>
- #include <linux/autoconf.h>
- #include <linux/poll.h>
-+#include <linux/signal.h>
- #include <asm/io.h>
-
- #include "kcl_config.h"
Copied: fglrx-driver/trunk/debian/patches/series (from rev 331, fglrx-driver/trunk/debian/patches/00list)
===================================================================
--- fglrx-driver/trunk/debian/patches/series (rev 0)
+++ fglrx-driver/trunk/debian/patches/series 2009-11-13 12:26:44 UTC (rev 332)
@@ -0,0 +1,3 @@
+01-CONFIG_X86_XEN.diff
+03-authatieventsd.sh.diff
+05-fix_missing_signal_include.diff
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2009-11-05 10:54:39 UTC (rev 331)
+++ fglrx-driver/trunk/debian/rules 2009-11-13 12:26:44 UTC (rev 332)
@@ -5,8 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -55,7 +53,7 @@
CACHEDIR := /tmp
endif
-build: patch debian/man/Makefile
+build: debian/man/Makefile
dh_testdir
# Build man pages.
$(MAKE) -C debian/man
@@ -71,7 +69,7 @@
chmod +x autogen.sh && \
./autogen.sh --copy)
-clean: unpatch
+clean:
dh_testdir
dh_clean
rm -rf usr lib etc opt
Added: fglrx-driver/trunk/debian/source/format
===================================================================
--- fglrx-driver/trunk/debian/source/format (rev 0)
+++ fglrx-driver/trunk/debian/source/format 2009-11-13 12:26:44 UTC (rev 332)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-fglrx-devel
mailing list