[SCM] clthreads/master: Refresh patches

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Feb 1 04:02:37 UTC 2012


The following commit has been merged in the master branch:
commit a4af0c5b2fd86e02f4fb45023033a72791f1a86d
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Feb 1 04:35:20 2012 +0100

    Refresh patches

diff --git a/debian/patches/makefile-01.patch b/debian/patches/makefile-01.patch
index ae3e00a..237d39c 100644
--- a/debian/patches/makefile-01.patch
+++ b/debian/patches/makefile-01.patch
@@ -1,27 +1,26 @@
-Description: Change install prefix from /usr/local/bin to /usr/bin.
-Origin: Debian
+Description: 
+ Patch is applied because autotools are not used by upstream.
+ Patch setting prefix=/usr and fix install commands.
 Forwarded: no
 ---
- Makefile |   18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
 
---- clthreads.orig/Makefile
-+++ clthreads/Makefile
-@@ -16,9 +16,10 @@
- 
+Index: clthreads/Makefile
+===================================================================
+--- clthreads.orig/Makefile	2012-02-01 03:31:15.743019817 +0100
++++ clthreads/Makefile	2012-02-01 04:15:38.070950286 +0100
+@@ -17,9 +17,9 @@
  
  # Modify as required.
--#
+ #
 -PREFIX = /usr/local
--SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+
-+DESTDIR =
-+PREFIX = /usr
-+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
- LIBDIR = lib$(SUFFIX)
++PREFIX ?= /usr/local
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+-LIBDIR = lib$(SUFFIX)
++LIBDIR ?= lib$(SUFFIX)
  
  
-@@ -46,11 +47,12 @@ $(CLTHREADS_MIN): $(CLTHREADS_O)
+ MAJVERS = 2
+@@ -46,11 +46,12 @@
  
  
  install:	$(CLTHREADS_MIN)
diff --git a/debian/patches/makefile-02.patch b/debian/patches/makefile-02.patch
index 21aab97..79a5325 100644
--- a/debian/patches/makefile-02.patch
+++ b/debian/patches/makefile-02.patch
@@ -6,9 +6,11 @@ Forwarded: no
  Makefile |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- clthreads.orig/Makefile
-+++ clthreads/Makefile
-@@ -30,7 +30,7 @@ DISTDIR = clthreads-$(VERSION)
+Index: clthreads/Makefile
+===================================================================
+--- clthreads.orig/Makefile	2012-02-01 04:17:19.026947650 +0100
++++ clthreads/Makefile	2012-02-01 04:17:22.290947564 +0100
+@@ -29,7 +29,7 @@
  
  
  CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 

-- 
ClThreads packaging



More information about the pkg-multimedia-commits mailing list