Rename patches, removing digit prefixes and using the extension 'patch'.

diff --git a/debian/patches/02_amd64.diff b/debian/patches/02_amd64.diff
deleted file mode 100644 (file)
index 3d7da6c..0000000
--- a/debian/patches/02_amd64.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Christian Marillat <marillat@debian.org>
-Subject: Don't install library in /usr/lib64
-
---- a/configure
-+++ b/configure
-@@ -309,7 +309,6 @@
-     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
-       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-         cpu="x86_64"
--        libdir="lib64"
-         want_pic="yes"
-       fi
-     fi

diff --git a/debian/patches/04_glx-func-def.diff b/debian/patches/04_glx-func-def.diff
deleted file mode 100644 (file)
index 006a462..0000000
--- a/debian/patches/04_glx-func-def.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Michael Terry <michael.terry@canonical.com> 
-Subject: Define a glXGetProcAddress prototype so that gcc doesn't assume it returns an int.
-Bug-Ubuntu: #402177
-
---- a/src/compositor/visual_manager_3d_gl.c
-+++ b/src/compositor/visual_manager_3d_gl.c
-@@ -76,6 +76,7 @@
- #elif defined(CONFIG_DARWIN_GL)
- #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glutGetProcAddress(__name)  
- #else
-+extern void (*glXGetProcAddress(const GLubyte *procname))( void );
- #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glXGetProcAddress(__name) 
- #endif
- 

diff --git a/debian/patches/amd64.patch b/debian/patches/amd64.patch
new file mode 100644 (file)
index 0000000..3d7da6c
--- /dev/null
+++ b/debian/patches/amd64.patch
@@ -0,0 +1,13 @@
+From: Christian Marillat <marillat@debian.org>
+Subject: Don't install library in /usr/lib64
+
+--- a/configure
++++ b/configure
+@@ -309,7 +309,6 @@
+     if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
+       if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
+         cpu="x86_64"
+-        libdir="lib64"
+         want_pic="yes"
+       fi
+     fi

diff --git a/debian/patches/glx-func-def.patch b/debian/patches/glx-func-def.patch
new file mode 100644 (file)
index 0000000..006a462
--- /dev/null
+++ b/debian/patches/glx-func-def.patch
@@ -0,0 +1,14 @@
+From: Michael Terry <michael.terry@canonical.com> 
+Subject: Define a glXGetProcAddress prototype so that gcc doesn't assume it returns an int.
+Bug-Ubuntu: #402177
+
+--- a/src/compositor/visual_manager_3d_gl.c
++++ b/src/compositor/visual_manager_3d_gl.c
+@@ -76,6 +76,7 @@
+ #elif defined(CONFIG_DARWIN_GL)
+ #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glutGetProcAddress(__name)  
+ #else
++extern void (*glXGetProcAddress(const GLubyte *procname))( void );
+ #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glXGetProcAddress(__name) 
+ #endif
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 3ecbfc659c45dda19af5b72dd3867deb35982d0f..bc3d5002711eae7f4e857c39767a3962950e9621 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-02_amd64.diff
-04_glx-func-def.diff
+amd64.patch
+glx-func-def.patch