[SCM] calf/master: Simplify patch 1002 to not include autogenerated file.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:41:21 UTC 2013


The following commit has been merged in the master branch:
commit 655838414c4107b7d1fe43f07c3f11a0abcc646b
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue May 7 15:58:10 2013 +0200

    Simplify patch 1002 to not include autogenerated file.

diff --git a/debian/patches/1002-lv2core_to_lv2.patch b/debian/patches/1002-lv2core_to_lv2.patch
index 01072d7..073cd8d 100644
--- a/debian/patches/1002-lv2core_to_lv2.patch
+++ b/debian/patches/1002-lv2core_to_lv2.patch
@@ -3,52 +3,6 @@
  configure.ac |    2 +-
  2 files changed, 9 insertions(+), 9 deletions(-)
 
---- a/configure
-+++ b/configure
-@@ -15896,12 +15896,12 @@
-     pkg_cv_LV2_DEPS_CFLAGS="$LV2_DEPS_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2core >= 6\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lv2core >= 6") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 >= 1.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lv2 >= 1.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LV2_DEPS_CFLAGS=`$PKG_CONFIG --cflags "lv2core >= 6" 2>/dev/null`
-+  pkg_cv_LV2_DEPS_CFLAGS=`$PKG_CONFIG --cflags "lv2 >= 1.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -15913,12 +15913,12 @@
-     pkg_cv_LV2_DEPS_LIBS="$LV2_DEPS_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2core >= 6\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "lv2core >= 6") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2 >= 1.0\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "lv2 >= 1.0") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LV2_DEPS_LIBS=`$PKG_CONFIG --libs "lv2core >= 6" 2>/dev/null`
-+  pkg_cv_LV2_DEPS_LIBS=`$PKG_CONFIG --libs "lv2 >= 1.0" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -15939,9 +15939,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lv2core >= 6" 2>&1`
-+	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lv2 >= 1.0" 2>&1`
-         else
--	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lv2core >= 6" 2>&1`
-+	        LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lv2 >= 1.0" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LV2_DEPS_PKG_ERRORS" >&5
 --- a/configure.ac
 +++ b/configure.ac
 @@ -72,7 +72,7 @@

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list