diff -u ktoon-0.8/debian/control ktoon-0.8/debian/control --- ktoon-0.8/debian/control +++ ktoon-0.8/debian/control @@ -1,7 +1,8 @@ Source: ktoon Section: graphics Priority: optional -Maintainer: Juan Manuel Garcia Molina +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Juan Manuel Garcia Molina Build-Depends: debhelper (>= 5.0.0), dpatch, autotools-dev, libqt4-dev (>= 4.1.1), libaspell-dev, libaudio-dev, libungif4-dev, libavcodec-dev, libavformat-dev, libglu1-xorg-dev, libming-dev, libming-util, libgstreamer0.10-dev, imagemagick, docbook-to-man Standards-Version: 3.7.2 diff -u ktoon-0.8/debian/changelog ktoon-0.8/debian/changelog --- ktoon-0.8/debian/changelog +++ ktoon-0.8/debian/changelog @@ -1,3 +1,17 @@ +ktoon (0.8-1ubuntu1) gutsy; urgency=low + + * Fixed Ubuntu FTBFS bug (LP: #129680) + * New patches: + * 40_configure_bin_bash + - replace #/bin/bash with #!/bin/bash (otherwise it runs /bin/sh) + * 50_dactionmanager_retval + - make DActionManager::insert always return false + (which it already did de facto, and it didn't build with Qt 4.3) + * 60_daction_q_object + - add Q_OBJECT to DAction, derived from QAction (for Qt 4.3) + + -- Matvey Kozhev Thu, 2 Aug 2007 02:44:13 +0700 + ktoon (0.8-1) unstable; urgency=low * New upstream release. diff -u ktoon-0.8/debian/patches/00list ktoon-0.8/debian/patches/00list --- ktoon-0.8/debian/patches/00list +++ ktoon-0.8/debian/patches/00list @@ -3,0 +4,3 @@ +40_configure_bin_bash +50_dactionmanager_retval +60_daction_q_object only in patch2: unchanged: --- ktoon-0.8.orig/debian/patches/60_daction_q_object +++ ktoon-0.8/debian/patches/60_daction_q_object @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_daction_q_object.dpatch by Matvey Kozhev +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Insert Q_OBJECT into daction.h + +@DPATCH@ + +--- ktoon-0.8~/src/dlib/dgui/daction.h 2006-07-29 01:46:57.000000000 +0700 ++++ ktoon-0.8/src/dlib/dgui/daction.h 2007-08-02 19:32:52.000000000 +0700 +@@ -31,6 +31,7 @@ + */ + class DAction : public QAction + { ++ Q_OBJECT + public: + /** + * Construye una accion con un padre y un identificador only in patch2: unchanged: --- ktoon-0.8.orig/debian/patches/40_configure_bin_bash +++ ktoon-0.8/debian/patches/40_configure_bin_bash @@ -0,0 +1,16 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40_configure_bin_bash by Matvey Kozhev +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make configure correctly launched by /bin/bash + +@DPATCH@ + +--- ktoon-0.8~/configure 2006-07-29 01:47:08.000000000 +0700 ++++ ktoon-0.8/configure 2007-08-02 18:10:10.000000000 +0700 +@@ -1,4 +1,4 @@ +-#/bin/bash ++#!/bin/bash + + . scripts/global + only in patch2: unchanged: --- ktoon-0.8.orig/debian/patches/50_dactionmanager_retval +++ ktoon-0.8/debian/patches/50_dactionmanager_retval @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 50_dactionmanager_retval.dpatch by Matvey Kozhev +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Correct return value in dactionmanager.cpp (FTBFS otherwise) + +@DPATCH@ + +--- ktoon-0.8~/src/dlib/dgui/dactionmanager.cpp 2006-07-29 01:46:57.000000000 +0700 ++++ ktoon-0.8/src/dlib/dgui/dactionmanager.cpp 2007-08-02 22:47:13.000000000 +0700 +@@ -40,7 +40,8 @@ + return false; + } + +- return m_actionDict.insert( id, action ); ++ m_actionDict.insert( id, action ); ++ return false; + } + + void DActionManager::remove( DAction* action )