[SCM] zita-resampler/master: Rename the resample executable to zita-resampler, an executable called 'resample' is provided by another package.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 20 14:58:30 UTC 2010


The following commit has been merged in the master branch:
commit 07eb1e142f2282040f83e3601bc39dfef5e1bbf9
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 20 16:42:09 2010 +0200

    Rename the resample executable to zita-resampler, an executable called 'resample' is provided by another package.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index e2465e3..a3303ea 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,12 +1,14 @@
 Description: Set PREFIX properly.
  Drop arch suffix from LIBDIR
  Pass DESTDIR to the install target.
+ Rename the resample executable to zita-resampler, an executable
+ called 'resample' is provided by another package.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 ---
- apps/Makefile |    8 ++++----
+ apps/Makefile |   10 +++++-----
  libs/Makefile |   16 ++++++++--------
- 2 files changed, 12 insertions(+), 12 deletions(-)
+ 2 files changed, 13 insertions(+), 13 deletions(-)
 
 --- zita-resampler.orig/apps/Makefile
 +++ zita-resampler/apps/Makefile
@@ -28,6 +30,15 @@ Forwarded: not-needed
  #CPPFLAGS += -march=native
  
  
+@@ -41,7 +41,7 @@ $(RESAMPLE_O):
+ 
+ 
+ install:	resample
+-	install -Dm 755 resample $(DESTDIR)$(PREFIX)/bin/resample
++	install -Dm 755 resample $(DESTDIR)$(PREFIX)/bin/zita-resampler
+ 
+ 
+ clean:
 --- zita-resampler.orig/libs/Makefile
 +++ zita-resampler/libs/Makefile
 @@ -17,9 +17,9 @@

-- 
zita-resampler packaging



More information about the pkg-multimedia-commits mailing list