[SCM] dvblast packaging branch, master, updated. debian/1.1-1-17-g7eaab26
ivoire-guest at users.alioth.debian.org
ivoire-guest at users.alioth.debian.org
Mon Mar 1 22:46:07 UTC 2010
The following commit has been merged in the master branch:
commit 4d8e74a3d573b53f87161cecd55cbca9c1f521e7
Author: Rémi Duraffort <ivoire at videolan.org>
Date: Mon Mar 1 23:14:12 2010 +0100
Remove patch merged upstream.
diff --git a/debian/patches/02_add_install_target.diff b/debian/patches/02_add_install_target.diff
deleted file mode 100644
index 849da32..0000000
--- a/debian/patches/02_add_install_target.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Add the install and unistall targets.
-
---- dvblast-1.1.orig/Makefile 2010-01-18 14:46:15.503055827 +0100
-+++ dvblast-1.1/Makefile 2010-01-18 14:45:34.528054670 +0100
-@@ -6,6 +6,8 @@
- OBJ_DVBLAST = dvblast.o util.o dvb.o demux.o output.o en50221.o comm.o
- OBJ_DVBLASTCTL = util.o dvblastctl.o
-
-+BIN = $(DESTDIR)/usr/bin
-+
- all: dvblast dvblastctl
-
- $(OBJ_DVBLAST) $(OBJ_DVBLASTCTL): Makefile dvblast.h en50221.h comm.h
-@@ -16,4 +18,11 @@
- dvblastctl: $(OBJ_DVBLASTCTL)
-
- clean:
-- -rm -f dvblast dvblastctl $(OBJ_DVBLAST) $(OBJ_DVBLASTCTL)
-+ @rm -f dvblast dvblastctl $(OBJ_DVBLAST) $(OBJ_DVBLASTCTL)
-+
-+install: all
-+ @install -d $(BIN)
-+ @install dvblast dvblastctl $(BIN)
-+
-+uninstall:
-+ @rm $(BIN)/dvblast $(BIN)/dvblastctl
diff --git a/debian/patches/series b/debian/patches/series
index 8b1adaf..f7af606 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_remove_bad_cflags.diff
-02_add_install_target.diff
--
dvblast packaging
More information about the pkg-multimedia-commits
mailing list