[SCM] brutefir/master: Rename 10_Makefile.dpatch -> 10-makefile.patch, refresh.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Sep 20 12:28:09 UTC 2010
The following commit has been merged in the master branch:
commit 2ad4620ac4c1e5f818d079c9aa0ecdc772fddc04
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Sep 20 14:24:55 2010 +0200
Rename 10_Makefile.dpatch -> 10-makefile.patch, refresh.
diff --git a/debian/patches/10_Makefile.dpatch b/debian/patches/10-makefile.patch
old mode 100755
new mode 100644
similarity index 59%
rename from debian/patches/10_Makefile.dpatch
rename to debian/patches/10-makefile.patch
index b61cacc..56a87f8
--- a/debian/patches/10_Makefile.dpatch
+++ b/debian/patches/10-makefile.patch
@@ -1,14 +1,13 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_Makefile.dpatch by Free Ekanayaka <free at agnula.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set INSTALL_PREFIX,INCLUDE,LIBPATHS properly.
-## DP: ALSA support is not available on non-Linux archs (see bug#414298).
+Author: Free Ekanayaka <free at agnula.org>
+Description:
+ Set INSTALL_PREFIX,INCLUDE,LIBPATHS properly.
+ ALSA support is not available on non-Linux archs (see bug#414298).
+---
+ Makefile | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' brutefir~/Makefile brutefir/Makefile
---- brutefir~/Makefile 2010-09-20 12:34:35.000000000 +0200
-+++ brutefir/Makefile 2010-09-20 12:55:37.752428213 +0200
+--- brutefir.orig/Makefile
++++ brutefir/Makefile
@@ -1,11 +1,11 @@
###################################
# Where to install
@@ -24,7 +23,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
ifdef FFTW_PATH
LIBPATHS += -L$(FFTW_PATH)/lib
INCLUDE += -I$(FFTW_PATH)/include
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ UNAME_P = $(shell uname -p)
UNAME_M = $(shell uname -m)
# Linux
@@ -33,7 +32,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
ifeq ($(UNAME_M),i386)
BRUTEFIR_OBJS += $(BRUTEFIR_IA32_OBJS)
endif
-@@ -75,8 +75,10 @@
+@@ -75,8 +75,10 @@ BRUTEFIR_OBJS += $(BRUTEFIR_IA32_OBJS)
endif
BRUTEFIR_LIBS += -ldl
LDMULTIPLEDEFS = -Xlinker --allow-multiple-definition
--
brutefir packaging
More information about the pkg-multimedia-commits
mailing list