diff -u ams-2.0.1/debian/control ams-2.0.1/debian/control --- ams-2.0.1/debian/control +++ ams-2.0.1/debian/control @@ -1,7 +1,8 @@ Source: ams Section: sound Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Free Ekanayaka , Junichi Uekawa , Alessio Treglia diff -u ams-2.0.1/debian/changelog ams-2.0.1/debian/changelog --- ams-2.0.1/debian/changelog +++ ams-2.0.1/debian/changelog @@ -1,3 +1,10 @@ +ams (2.0.1-3ubuntu0.1) maverick-proposed; urgency=low + + * Fix crash when jack_handle is NULL (LP: #553366); + patch backported from natty. + + -- Alessio Treglia Tue, 26 Oct 2010 10:55:56 +0200 + ams (2.0.1-3build1) maverick; urgency=low * No-change rebuild due to jackd -> jackd2 transition. diff -u ams-2.0.1/debian/patches/series ams-2.0.1/debian/patches/series --- ams-2.0.1/debian/patches/series +++ ams-2.0.1/debian/patches/series @@ -2,0 +3 @@ +03-null_jack_handle.patch only in patch2: unchanged: --- ams-2.0.1.orig/debian/patches/03-null_jack_handle.patch +++ ams-2.0.1/debian/patches/03-null_jack_handle.patch @@ -0,0 +1,21 @@ +Subject: Prevent crash if jack handle is NULL. +Origin: backport, commit:1.2 +Bug: http://sourceforge.net/support/tracker.php?aid=2987034 +Bug-Ubuntu: https://launchpad.net/bugs/553366 +Applied-Upstream: commit:1.2 +--- + src/synthdata.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +--- ams.orig/src/synthdata.cpp ++++ ams/src/synthdata.cpp +@@ -532,6 +532,9 @@ int SynthData::initJack (int ncapt, int + + int SynthData::closeJack () + { ++ if (jack_handle == NULL) { ++ return 0; ++ } + qWarning(QObject::tr("Closing JACK...").toUtf8()); + jack_deactivate (jack_handle); + for (int i = 0; i < play_ports; i++)