[SCM] tsdecrypt/master: debian/patches/1002-bashisms.patch: Fix bashism to prevent FTBFS.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Apr 15 09:52:41 UTC 2012


The following commit has been merged in the master branch:
commit 1b6070d9a6b40d89ef5b39dd3ee56cec32f63bfb
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 15 11:52:23 2012 +0200

    debian/patches/1002-bashisms.patch: Fix bashism to prevent FTBFS.

diff --git a/debian/patches/1002-bashisms.patch b/debian/patches/1002-bashisms.patch
new file mode 100644
index 0000000..9cdfe5e
--- /dev/null
+++ b/debian/patches/1002-bashisms.patch
@@ -0,0 +1,43 @@
+Description: Fix bashism in Makefiles to avoid build failures.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ FFdecsa_init      |    2 +-
+ Makefile          |    2 +-
+ libfuncs/Makefile |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+--- tsdecrypt.orig/FFdecsa_init
++++ tsdecrypt/FFdecsa_init
+@@ -42,7 +42,7 @@ TMPDIR=`mktemp -d FFdecsa.build.XXXXXXXX
+ 
+ trap "{ rm -rf $TMPDIR ; exit 1; }" INT TERM
+ 
+-cp $FFDECSA_DIR/Makefile $FFDECSA_DIR/*.{c,h} $TMPDIR
++cp $FFDECSA_DIR/Makefile $FFDECSA_DIR/*.c $FFDECSA_DIR/*.h $TMPDIR
+ 
+ log()  { printf "%s %-26s : %s\n" "$LPREFIX" "$1" "$2"; }
+ logn() { printf "%s %-26s : %s"   "$LPREFIX" "$1" "$2"; }
+--- tsdecrypt.orig/Makefile
++++ tsdecrypt/Makefile
+@@ -67,7 +67,7 @@ DEFS += -DUSE_LIBDVBCSA=1
+ tsdecrypt_LIBS += -ldvbcsa
+ endif
+ 
+-CLEAN_OBJS = $(FFDECSA_OBJ) tsdecrypt $(tsdecrypt_SRC:.c=.{o,d})
++CLEAN_OBJS = $(FFDECSA_OBJ) tsdecrypt $(tsdecrypt_SRC:.c=.o) $(tsdecrypt_SRC:.c=.d)
+ 
+ PROGS = tsdecrypt
+ 
+--- tsdecrypt.orig/libfuncs/Makefile
++++ tsdecrypt/libfuncs/Makefile
+@@ -27,7 +27,7 @@ $(PROG): $(OBJS)
+ -include $(OBJS:.o=.d)
+ 
+ clean:
+-	$(Q)echo "  RM	$(PROG) $(OBJS:.o=.{o,d})"
+-	$(Q)$(RM) $(PROG) $(OBJS:.o=.{o,d}) *~
++	$(Q)echo "  RM	$(PROG) $(OBJS:.o=.o) $(OBJS:.o=.d)"
++	$(Q)$(RM) $(PROG) $(OBJS:.o=.o) $(OBJS:.o=.d) *~
+ 
+ distclean: clean
diff --git a/debian/patches/series b/debian/patches/series
index 0c0de68..1a382b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-buildsystem.patch
 0002-manpage.patch
+1001-dont_strip_binaries.patch
+1002-bashisms.patch

-- 
tsdecrypt packaging



More information about the pkg-multimedia-commits mailing list