[SCM] tsdecrypt/master: Remove all patches, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Apr 21 07:30:13 UTC 2012


The following commit has been merged in the master branch:
commit b5e74a78bdaa94e659895f2256e3ed47ef316d05
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 21 09:28:45 2012 +0200

    Remove all patches, applied upstream.

diff --git a/debian/patches/1002-bashisms.patch b/debian/patches/1002-bashisms.patch
deleted file mode 100644
index 9cdfe5e..0000000
--- a/debian/patches/1002-bashisms.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index fe76283..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-1002-bashisms.patch

-- 
tsdecrypt packaging



More information about the pkg-multimedia-commits mailing list