[SCM] liblscp/master: Patch dropped.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Nov 23 22:48:53 UTC 2016


The following commit has been merged in the master branch:
commit 0a75ddd935346c020417d29989741afadeb474bb
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Nov 23 23:25:13 2016 +0100

    Patch dropped.

diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
deleted file mode 100644
index 508ce43..0000000
--- a/debian/patches/01-makefiles.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Author: Alessio Treglia <alessio at debian.org>
-Description: Skip debian/Makefile processing.
-Forwarded: not-needed
----
- Makefile.am  |    2 +-
- Makefile.in  |    2 +-
- configure    |    3 +--
- configure.ac |    2 +-
- 4 files changed, 4 insertions(+), 5 deletions(-)
-
---- liblscp.orig/Makefile.am
-+++ liblscp/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = src lscp examples debian @ac_doxygen@
-+SUBDIRS = src lscp examples @ac_doxygen@
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = lscp.pc
---- liblscp.orig/Makefile.in
-+++ liblscp/Makefile.in
-@@ -193,7 +193,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src lscp examples debian @ac_doxygen@
-+SUBDIRS = src lscp examples @ac_doxygen@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = lscp.pc
- all: all-recursive
---- liblscp.orig/configure.ac
-+++ liblscp/configure.ac
-@@ -50,5 +50,5 @@ AC_ENABLE_SHARED(yes)
- AC_CHECK_PROG(ac_doxygen, doxygen, [doc], [])
- AC_SUBST(ac_doxygen)
- 
--AC_OUTPUT(Makefile src/Makefile lscp/Makefile examples/Makefile debian/Makefile doc/Makefile doc/liblscp.doxygen lscp.pc liblscp.spec lscp/version.h)
-+AC_OUTPUT(Makefile src/Makefile lscp/Makefile examples/Makefile doc/Makefile doc/liblscp.doxygen lscp.pc liblscp.spec lscp/version.h)
- 
---- liblscp.orig/configure
-+++ liblscp/configure
-@@ -11847,7 +11847,7 @@ fi
- 
- 
- 
--ac_config_files="$ac_config_files Makefile src/Makefile lscp/Makefile examples/Makefile debian/Makefile doc/Makefile doc/liblscp.doxygen lscp.pc liblscp.spec lscp/version.h"
-+ac_config_files="$ac_config_files Makefile src/Makefile lscp/Makefile examples/Makefile doc/Makefile doc/liblscp.doxygen lscp.pc liblscp.spec lscp/version.h"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -12730,7 +12730,6 @@ do
-     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-     "lscp/Makefile") CONFIG_FILES="$CONFIG_FILES lscp/Makefile" ;;
-     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
--    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-     "doc/liblscp.doxygen") CONFIG_FILES="$CONFIG_FILES doc/liblscp.doxygen" ;;
-     "lscp.pc") CONFIG_FILES="$CONFIG_FILES lscp.pc" ;;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f916c86..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-#01-makefiles.patch

-- 
liblscp packaging



More information about the pkg-multimedia-commits mailing list