diff -Nru pencil2d-0.5.4~git20141224.2630deb+dfsg/core_lib/interface/timecontrols.cpp pencil2d-0.5.4~git20150223.f75630e+dfsg/core_lib/interface/timecontrols.cpp --- pencil2d-0.5.4~git20141224.2630deb+dfsg/core_lib/interface/timecontrols.cpp 2014-12-31 13:49:31.000000000 +0100 +++ pencil2d-0.5.4~git20150223.f75630e+dfsg/core_lib/interface/timecontrols.cpp 2015-02-28 11:17:37.000000000 +0100 @@ -150,8 +150,8 @@ void TimeControls::makeConnections() { connect( mPlayButton, &QPushButton::clicked, this, &TimeControls::playButtonClicked ); - connect( mJumpToEndButton, &QPushButton::clicked, this, &TimeControls::jumpToStartButtonClicked ); - connect( mJumpToStartButton, &QPushButton::clicked, this, &TimeControls::jumpToEndButtonClicked ); + connect( mJumpToEndButton, &QPushButton::clicked, this, &TimeControls::jumpToEndButtonClicked ); + connect( mJumpToStartButton, &QPushButton::clicked, this, &TimeControls::jumpToStartButtonClicked ); connect( mLoopButton, &QPushButton::clicked, this, &TimeControls::loopButtonClicked ); connect( mPlaybackRangeCheckBox, &QCheckBox::clicked, this, &TimeControls::playbackRangeClicked ); } diff -Nru pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/changelog pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/changelog --- pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/changelog 2014-12-31 17:04:48.000000000 +0100 +++ pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/changelog 2015-03-01 10:05:47.000000000 +0100 @@ -1,3 +1,12 @@ +pencil2d (0.5.4~git20150223.f75630e+dfsg-1) unstable; urgency=low + + * [239a8de] Imported Upstream version 0.5.4~git20150223.f75630e+dfsg. + * [5adf702,fe23767] debian/patches/ftbfs-on-not-linux: add fix ftbfs on + kfreebds-* and hurd-*. + * [061ffcb] debian/control: add depends on ffmpeg. + + -- Mattia Rizzolo Sun, 01 Mar 2015 09:34:02 +0100 + pencil2d (0.5.4~git20141224.2630deb+dfsg-1) unstable; urgency=low * [1d6f3c9] Imported Upstream commit 0.5.4~git20141224.2630deb+dfsg. diff -Nru pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/control pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/control --- pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/control 2014-11-10 19:23:21.000000000 +0100 +++ pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/control 2015-03-01 09:31:55.000000000 +0100 @@ -20,7 +20,8 @@ Package: pencil2d Architecture: any -Depends: ${misc:Depends}, +Depends: ffmpeg, + ${misc:Depends}, ${shlibs:Depends} Description: Create hand-drawn animation using both bitmap and vector graphics Pencil2D is an animation/drawing software for Mac OS X, Windows, and diff -Nru pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/patches/ftbfs-on-not-linux pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/patches/ftbfs-on-not-linux --- pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/patches/ftbfs-on-not-linux 1970-01-01 01:00:00.000000000 +0100 +++ pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/patches/ftbfs-on-not-linux 2015-02-01 15:07:20.000000000 +0100 @@ -0,0 +1,27 @@ +Description: Fix FTBFS on not-linux arches (like kfreebsd-* and hurd-*) +Author: Mattia Rizzolo +Forwarded: no +Last-Update: 2015-02-01 + +--- a/common.pri ++++ b/common.pri +@@ -14,7 +14,7 @@ + LIBS += -lobjc -framework AppKit -framework Carbon + } + +-linux-* { ++unix:!macx { + QMAKE_CXXFLAGS += -std=c++11 + QMAKE_LINK = $$QMAKE_CXX + QMAKE_LINK_SHLIB = $$QMAKE_CXX +--- a/core_lib/core_lib.pro ++++ b/core_lib/core_lib.pro +@@ -200,7 +200,7 @@ + SOURCES += external/macosx/macosx.cpp + } + +-linux-* { ++unix:!macx { + INCLUDEPATH += external/linux + SOURCES += external/linux/linux.cpp + } diff -Nru pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/patches/series pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/patches/series --- pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/patches/series 2014-12-31 15:21:47.000000000 +0100 +++ pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/patches/series 2015-02-01 14:43:26.000000000 +0100 @@ -2,3 +2,4 @@ quazip.patch remove-zlib.patch deterministic-build +ftbfs-on-not-linux diff -Nru pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/pencil2d.install pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/pencil2d.install --- pencil2d-0.5.4~git20141224.2630deb+dfsg/debian/pencil2d.install 2014-11-08 22:43:06.000000000 +0100 +++ pencil2d-0.5.4~git20150223.f75630e+dfsg/debian/pencil2d.install 2015-03-01 09:31:55.000000000 +0100 @@ -1,3 +1,3 @@ debian/pencil2d.desktop usr/share/applications -pencil2d_it.qm usr/share/pencil2d/translations pencil2d_cs.qm usr/share/pencil2d/translations +pencil2d_it.qm usr/share/pencil2d/translations