Package: synfig
Version: 1.4.0+dfsg-2
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for synfig (versioned as 1.4.0+dfsg-2.1) and
uploaded it without delay (as it involved an RC bug).
Regards.
- Jonas
--
* Jonas Smedegaard - idealist & Internet-arkitekt
* Tlf.: +45 40843136 Website: http://dr.jones.dk/
[x] quote me freely [ ] ask before reusing [ ] keep private
diff -Nru synfig-1.4.0+dfsg/debian/changelog synfig-1.4.0+dfsg/debian/changelog
--- synfig-1.4.0+dfsg/debian/changelog 2021-01-12 07:21:12.0 +0100
+++ synfig-1.4.0+dfsg/debian/changelog 2021-09-21 14:09:28.0 +0200
@@ -1,3 +1,17 @@
+synfig (1.4.0+dfsg-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Dmitry Smirnov ]
+ * relax to recommend (not depend on) libdv-bin;
+closes: bug#980418, thanks to Helmut Grohne
+
+ [ Jonas Smedegaard ]
+ * add patch cherry-picked upstream to support MLT++-7 in autotools;
+closes: bug#993832, thanks to Adrian Bunk and peter green
+
+ -- Jonas Smedegaard Tue, 21 Sep 2021 14:09:28 +0200
+
synfig (1.4.0+dfsg-2) unstable; urgency=medium
* dev: added missing dependencies.
diff -Nru synfig-1.4.0+dfsg/debian/control synfig-1.4.0+dfsg/debian/control
--- synfig-1.4.0+dfsg/debian/control 2021-01-12 07:16:34.0 +0100
+++ synfig-1.4.0+dfsg/debian/control 2021-09-21 14:09:28.0 +0200
@@ -56,9 +56,10 @@
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
- libdv-bin,
# libav-tools,
imagemagick
+Recommends: ${misc:Recommends}
+,libdv-bin
Breaks: synfigstudio (<< 0.64.2)
Conflicts: libsynfig0v5, libsynfig0
Replaces: libsynfig0v5, libsynfig0
diff -Nru synfig-1.4.0+dfsg/debian/patches/020211309~54ba18f2.patch synfig-1.4.0+dfsg/debian/patches/020211309~54ba18f2.patch
--- synfig-1.4.0+dfsg/debian/patches/020211309~54ba18f2.patch 1970-01-01 01:00:00.0 +0100
+++ synfig-1.4.0+dfsg/debian/patches/020211309~54ba18f2.patch 2021-09-21 14:00:56.0 +0200
@@ -0,0 +1,29 @@
+Description: support MLT++-7 in autotools
+Author: rodolforg
+Origin: upstream, https://github.com/synfig/synfig/commit/54ba18f2
+Bug: https://github.com/synfig/synfig/pull/2306
+Bug-Debian: https://bugs.debian.org/993832
+Last-Update: 2021-09-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/synfig-core/configure.ac
b/synfig-core/configure.ac
+@@ -396,10 +396,15 @@
+ AC_MSG_ERROR([ ** You need to install pango])
+ ])
+
+-PKG_CHECK_MODULES(MLTPP, mlt++,,[
+- AC_MSG_ERROR([ ** You need to install mlt++.])
++PKG_CHECK_MODULES(MLTPP, mlt++-7,[
++ CONFIG_DEPS="$CONFIG_DEPS mlt++-7"
++],[
++ PKG_CHECK_MODULES(MLTPP, mlt++,[
++ CONFIG_DEPS="$CONFIG_DEPS mlt++"
++ ],[
++ AC_MSG_ERROR([ ** You need to install mlt++.])
++ ])
+ ])
+-CONFIG_DEPS="$CONFIG_DEPS mlt++"
+
+ AX_BOOST_BASE([1.53.0],,AC_MSG_ERROR([ ** You need to install Boost >= 1.53.0]))
+ #AX_BOOST_SYSTEM
diff -Nru synfig-1.4.0+dfsg/debian/patches/series synfig-1.4.0+dfsg/debian/patches/series
--- synfig-1.4.0+dfsg/debian/patches/series 2021-01-11 15:33:44.0 +0100
+++ synfig-1.4.0+dfsg/debian/patches/series 2021-09-21 14:00:45.0 +0200
@@ -1 +1,2 @@
+020211309~54ba18f2.patch
strip-build-date.patch
diff -Nru synfig-1.4.0+dfsg/debian/patches/strip-build-date.patch synfig-1.4.0+dfsg/debian/patches/strip-build-date.patch
--- synfig-1.4.0+dfsg/debian/patches/strip-build-date.patch 2021-01-11 12:59:08.0 +0100
+++ synfig-1.4.0+dfsg/debian/patches/strip-build-date.patch 2021-09-21 14:00:57.0 +0200
@@ -6,8 +6,7 @@
--- a/synfig-core/src/synfig/main.cpp
+++ b/synfig-core/src/synfig/main.cpp
-@@ -128,9 +128,9 @@
-
+@@ -129,7 +129,7 @@
const char *
synfig::get_build_date()
{
@@ -16,11 +15,9 @@
}
bool
- synfig::check_version_(size_t version, size_t vec_size, size_t color_size, size_t canvas_size, size_t layer_size)
--- a/synfig-core/src/tool/optionsprocessor.cpp
+++ b/synfig-core/src/tool/optionsprocessor.cpp
-@@ -379,9 +379,9 @@
- cout << PACKAGE "-" VERSION << endl;
+@@ -380,7 +380,7 @@
#ifdef DEVEL_VERSION
cout << endl << DEVEL_VERSION << endl << endl;
#endif
@@ -29,4 +26,3 @@
#ifdef __GNUC__
cout << " with GCC " << __VERSION__;
#endif
- #ifdef _MSC_VER
signature.asc
Description: PGP signature
