diff -u klear-0.6.1/debian/changelog klear-0.6.1/debian/changelog --- klear-0.6.1/debian/changelog +++ klear-0.6.1/debian/changelog @@ -1,3 +1,12 @@ +klear (0.6.1-0ubuntu2) karmic; urgency=low + + * Fix FTBFS (LP: #459734): + - 02_add-header.patch: add missing #includes for declaration of u_int + - 03_std-exit.patch: exit() is not in std, call it as ::exit() + - 04_bksys.patch: fix build system problems, patch from #456855 + + -- Ilya Barygin Sat, 24 Oct 2009 16:27:12 +0400 + klear (0.6.1-0ubuntu1) hardy; urgency=low * New upstream release diff -u klear-0.6.1/debian/control klear-0.6.1/debian/control --- klear-0.6.1/debian/control +++ klear-0.6.1/debian/control @@ -1,7 +1,7 @@ Source: klear Section: kde Priority: optional -Maintainer: Ubuntu MOTU Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Marcus Czeslinski Build-Depends: debhelper (>= 5), cdbs, scons, kdelibs4-dev, libxine-dev (>= 1.0.2), libxtst-dev only in patch2: unchanged: --- klear-0.6.1.orig/debian/patches/03_std-exit.patch +++ klear-0.6.1/debian/patches/03_std-exit.patch @@ -0,0 +1,36 @@ +diff -Nur -x '*.orig' -x '*~' klear-0.6.1/src/App/Tuner/CKlearAppTunerC.cpp klear-0.6.1.new/src/App/Tuner/CKlearAppTunerC.cpp +--- klear-0.6.1/src/App/Tuner/CKlearAppTunerC.cpp 2006-10-15 00:04:15.000000000 +0400 ++++ klear-0.6.1.new/src/App/Tuner/CKlearAppTunerC.cpp 2009-10-24 15:46:36.000000000 +0400 +@@ -34,12 +34,12 @@ + }catch( CKlearAppException &e ){ // behandle alle anderen KlearExceptions als Fatal + e.showExceptions(); + //emit this->signalCloseMain(); +- std::exit(-1); // hard exit ++ ::exit(-1); // hard exit + }catch( std::exception &x ){ // all system exceptions + CKlearAppException e( __LOC__, x.what() ); + e.showExceptions(); // show catched expection + //emit this->signalCloseMain(); +- std::exit(-1); ++ ::exit(-1); + } + + return; +diff -Nur -x '*.orig' -x '*~' klear-0.6.1/src/App/Tuner/CKlearAppTunerT.cpp klear-0.6.1.new/src/App/Tuner/CKlearAppTunerT.cpp +--- klear-0.6.1/src/App/Tuner/CKlearAppTunerT.cpp 2006-10-15 00:04:15.000000000 +0400 ++++ klear-0.6.1.new/src/App/Tuner/CKlearAppTunerT.cpp 2009-10-24 15:46:49.000000000 +0400 +@@ -31,12 +31,12 @@ + }catch( CKlearAppException &e ){ // behandle alle anderen KlearExceptions als Fatal + e.showExceptions(); + //emit this->signalCloseMain(); +- std::exit(-1); // hard exit ++ ::exit(-1); // hard exit + }catch( std::exception &x ){ // all system exceptions + CKlearAppException e( __LOC__, x.what() ); + e.showExceptions(); // show catched expection + //emit this->signalCloseMain(); +- std::exit(-1); ++ ::exit(-1); + } + + return; only in patch2: unchanged: --- klear-0.6.1.orig/debian/patches/04_bksys.patch +++ klear-0.6.1/debian/patches/04_bksys.patch @@ -0,0 +1,23 @@ +diff -Nur -x '*.orig' -x '*~' klear-0.6.1/bksys/generic.py klear-0.6.1.new/bksys/generic.py +--- klear-0.6.1/bksys/generic.py 2009-10-24 16:05:43.000000000 +0400 ++++ klear-0.6.1.new/bksys/generic.py 2009-10-24 16:06:13.000000000 +0400 +@@ -244,7 +244,8 @@ + ret=self.env.Program(self.p_localtarget, self.p_localsource) + if not self.env.has_key('NOAUTOINSTALL'): + ins=self.env.bksys_install(self.instdir, ret) +- if self.perms: self.env.AddPostAction(ins, self.env.Chmod(ins, self.perms)) ++ if ins and self.perms: ++ for i in ins: self.env.AddPostAction(ins, self.env.Chmod(str(i), self.perms)) + elif self.type=='staticlib': + ret=self.env.StaticLibrary(self.p_localtarget, self.p_localsource) + +@@ -462,7 +463,8 @@ + if not destfile: install_list = env.Install(lenv.join(basedir,subdir), lenv.make_list(files)) + elif subdir: install_list = env.InstallAs(lenv.join(basedir,subdir,destfile), lenv.make_list(files)) + else: install_list = env.InstallAs(lenv.join(basedir,destfile), lenv.make_list(files)) +- if perms and install_list: lenv.AddPostAction(install_list, lenv.Chmod(install_list, perms)) ++ if perms and install_list: ++ for i in install_list: lenv.AddPostAction(install_list, lenv.Chmod(str(i), perms)) + env.Alias('install', install_list) + return install_list + only in patch2: unchanged: --- klear-0.6.1.orig/debian/patches/02_add-header.patch +++ klear-0.6.1/debian/patches/02_add-header.patch @@ -0,0 +1,34 @@ +diff -Nur -x '*.orig' -x '*~' klear-0.6.1/src/App/CKlearAppConfig.h klear-0.6.1.new/src/App/CKlearAppConfig.h +--- klear-0.6.1/src/App/CKlearAppConfig.h 2006-11-05 19:21:52.000000000 +0300 ++++ klear-0.6.1.new/src/App/CKlearAppConfig.h 2009-10-24 15:27:31.000000000 +0400 +@@ -28,6 +28,8 @@ + #include // i18n() + #include // kdDebug(), kdFatal(), kdError() + ++#include ++ + /** + \class CKlearAppConfig + \author Klear.org +diff -Nur -x '*.orig' -x '*~' klear-0.6.1/src/App/CKlearAppDecodingHelper.h klear-0.6.1.new/src/App/CKlearAppDecodingHelper.h +--- klear-0.6.1/src/App/CKlearAppDecodingHelper.h 2006-10-15 00:04:16.000000000 +0400 ++++ klear-0.6.1.new/src/App/CKlearAppDecodingHelper.h 2009-10-24 15:27:31.000000000 +0400 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Nur -x '*.orig' -x '*~' klear-0.6.1/src/App/EPG/CKlearAppDescriptorData.h klear-0.6.1.new/src/App/EPG/CKlearAppDescriptorData.h +--- klear-0.6.1/src/App/EPG/CKlearAppDescriptorData.h 2006-10-15 00:04:16.000000000 +0400 ++++ klear-0.6.1.new/src/App/EPG/CKlearAppDescriptorData.h 2009-10-24 15:27:31.000000000 +0400 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + /** + Descriptor data of a section....includes the current programm data