[SCM] liblscp packaging branch, master, updated. upstream/0.5.6-18-gca9c586

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Aug 17 13:17:30 UTC 2010


The following commit has been merged in the master branch:
commit ca9c58685d60ee8007f9115467e0c5edf98094f7
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 17 15:17:23 2010 +0200

    Skip debian/Makefile.* files.

diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
new file mode 100644
index 0000000..508ce43
--- /dev/null
+++ b/debian/patches/01-makefiles.patch
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 0000000..ec078aa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-makefiles.patch

-- 
liblscp packaging



More information about the pkg-multimedia-commits mailing list