[SCM] calf/master: Updating changelog.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Sun Nov 25 14:14:57 UTC 2012
The following commit has been merged in the master branch:
commit 256b08267a783f766fd2a27bdf6a116b7a508115
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Mon Nov 19 21:08:15 2012 -0500
Updating changelog.
diff --git a/debian/changelog b/debian/changelog
index fd10e4f..35993fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-calf (0.0.19-1) UNRELEASED; urgency=low
+calf (0.0.19-1) experimental; urgency=low
* New upstream release.
- * Depends on libfftw3-dev.
- * Depends on libfluidsynth-dev.
+ * Depends on libfftw3-dev and libfluidsynth-dev.
+ * Remove patches which doesn't seem to be useful anymore.
+ * Rewrite patch to use lv2-dev rather than lv2core.
-- Tiago Bortoletto Vaz <tiago at debian.org> Mon, 19 Nov 2012 18:50:19 -0500
diff --git a/debian/patches/1002-lv2core_to_lv2.patch b/debian/patches/1002-lv2core_to_lv2.patch
index 36d1da8..01072d7 100644
--- a/debian/patches/1002-lv2core_to_lv2.patch
+++ b/debian/patches/1002-lv2core_to_lv2.patch
@@ -3,60 +3,60 @@
configure.ac | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
---- calf.orig/configure
-+++ calf/configure
-@@ -15198,12 +15198,12 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_LV2_DEPS_CFLAGS="$LV2_DEPS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2core >= 1\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lv2core >= 1") 2>&5
+--- 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 >= 1" 2>/dev/null`
+- 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
- fi
-@@ -15216,12 +15216,12 @@ if test -n "$PKG_CONFIG"; then
- pkg_cv_LV2_DEPS_LIBS="$LV2_DEPS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lv2core >= 1\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lv2core >= 1") 2>&5
+@@ -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 >= 1" 2>/dev/null`
+- 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
- fi
-@@ -15240,9 +15240,9 @@ else
+@@ -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 --errors-to-stdout --print-errors "lv2core >= 1"`
-+ LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lv2 >= 1.0"`
+- 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 --errors-to-stdout --print-errors "lv2core >= 1"`
-+ LV2_DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lv2 >= 1.0"`
+- 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
---- calf.orig/configure.ac
-+++ calf/configure.ac
-@@ -56,7 +56,7 @@ AC_SUBST(GUI_DEPS_LIBS)
- AC_SUBST(JACK_DEPS_CFLAGS)
- AC_SUBST(JACK_DEPS_LIBS)
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,7 +72,7 @@
+ PKG_CHECK_MODULES(JACK_MIDI_DEPS, jack >= 0.105.0, OLD_JACK="no", OLD_JACK="yes")
+ fi
--PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 1, LV2_ENABLED="yes", LV2_ENABLED="no")
-+PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.0, LV2_ENABLED="yes", LV2_ENABLED="no")
- PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.5.2, LASH_ENABLED="yes", LASH_ENABLED="no")
+-PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 6, LV2_FOUND="yes", LV2_FOUND="no")
++PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.0, LV2_FOUND="yes", LV2_FOUND="no")
- if test "$LADSPA_FOUND" = "yes"; then
+ PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0,
+ AC_CHECK_LIB([lash], [lash_client_is_being_restored], LASH_0_6_FOUND="yes", LASH_0_6_FOUND="no"),
diff --git a/debian/patches/series b/debian/patches/series
index 1f7b18d..301ddf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
#0001-libglade_to_gtkbuilder.patch
#1001_fix-ftbfs-with-gcc-4.7.patch
-#1002-lv2core_to_lv2.patch
+1002-lv2core_to_lv2.patch
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list