diff -Nru libffado-2.0.99+svn2019/debian/changelog libffado-2.0.99+svn2019/debian/changelog --- libffado-2.0.99+svn2019/debian/changelog 2012-01-20 01:06:46.000000000 +0700 +++ libffado-2.0.99+svn2019/debian/changelog 2012-02-11 15:15:59.000000000 +0700 @@ -1,3 +1,13 @@ +libffado (2.0.99+svn2019-1ubuntu1) precise; urgency=low + + * Merge from Debian unstable, remaining changes: + - Ignore the results of the compiler check. Fails on the powerpc buildd. + - Don't build using ld.gold on powerpc. + - Build for armel and armhf. LP: #332528. + - Build using dh_python2 + + -- Artem Popov Sat, 11 Feb 2012 15:13:05 +0700 + libffado (2.0.99+svn2019-1) unstable; urgency=low * Imported Upstream version 2.0.99+svn2019 @@ -25,6 +35,26 @@ -- Adrian Knoth Sat, 24 Sep 2011 18:47:56 +0200 +libffado (2.0.99+svn1985-2ubuntu3) precise; urgency=low + + * Build using dh_python2 + + -- Matthias Klose Sat, 17 Dec 2011 12:41:26 +0000 + +libffado (2.0.99+svn1985-2ubuntu2) oneiric; urgency=low + + * Fix crash when starting jack2 (LP: #869420) + + -- David Henningsson Mon, 10 Oct 2011 06:42:14 +0200 + +libffado (2.0.99+svn1985-2ubuntu1) oneiric; urgency=low + + * Ignore the results of the compiler check. Fails on the powerpc buildd. + * Don't build using ld.gold on powerpc. + * Build for armel and armhf. LP: #332528. + + -- Matthias Klose Thu, 06 Oct 2011 12:13:47 +0200 + libffado (2.0.99+svn1985-2) unstable; urgency=low * Build-depend on binutils-gold (Closes: #628805) diff -Nru libffado-2.0.99+svn2019/debian/control libffado-2.0.99+svn2019/debian/control --- libffado-2.0.99+svn2019/debian/control 2012-01-20 01:04:42.000000000 +0700 +++ libffado-2.0.99+svn2019/debian/control 2012-02-11 15:12:23.000000000 +0700 @@ -1,6 +1,7 @@ Source: libffado Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Adrian Knoth , Free Ekanayaka , Jonas Smedegaard @@ -18,17 +19,17 @@ python-dbus, python-qt4, pyqt4-dev-tools, - python-support, libexpat1-dev, libxml++2.6-dev, libdbus-1-dev, python-qt4-dbus, libconfig++8-dev, libdbus-c++-dev, + binutils-gold [!powerpc], quilt Standards-Version: 3.9.2 DM-Upload-Allowed: yes -XS-Python-Version: all +X-Python-Version: >= 2.6 Section: libs Homepage: http://www.ffado.org Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffado.git diff -Nru libffado-2.0.99+svn2019/debian/control.in libffado-2.0.99+svn2019/debian/control.in --- libffado-2.0.99+svn2019/debian/control.in 2012-01-20 01:04:42.000000000 +0700 +++ libffado-2.0.99+svn2019/debian/control.in 2012-02-11 15:12:31.000000000 +0700 @@ -1,6 +1,7 @@ Source: libffado Priority: optional -Maintainer: Debian Multimedia Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Multimedia Maintainers Uploaders: Adrian Knoth , Free Ekanayaka , Jonas Smedegaard @@ -11,21 +12,21 @@ libiec61883-dev (>= 1.1.0), pkg-config, dbus (>= 1.0.0), - python, + python (>= 2.6.6-3~), python-dbus, python-qt4, pyqt4-dev-tools, - python-support, libexpat1-dev, libxml++2.6-dev, libdbus-1-dev, python-qt4-dbus, libconfig++8-dev, libdbus-c++-dev, + binutils-gold [!powerpc], quilt Standards-Version: 3.9.2 DM-Upload-Allowed: yes -XS-Python-Version: all +X-Python-Version: >= 2.6 Section: libs Homepage: http://www.ffado.org Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffado.git diff -Nru libffado-2.0.99+svn2019/debian/patches/no-gcc-check.diff libffado-2.0.99+svn2019/debian/patches/no-gcc-check.diff --- libffado-2.0.99+svn2019/debian/patches/no-gcc-check.diff 1970-01-01 06:00:00.000000000 +0600 +++ libffado-2.0.99+svn2019/debian/patches/no-gcc-check.diff 2012-02-11 14:56:45.000000000 +0700 @@ -0,0 +1,13 @@ +Index: libffado-2.0.99+svn1985/SConstruct +=================================================================== +--- libffado-2.0.99+svn1985.orig/SConstruct 2011-10-06 10:15:34.315098178 +0000 ++++ libffado-2.0.99+svn1985/SConstruct 2011-10-06 10:29:22.406312731 +0000 +@@ -188,7 +188,7 @@ + # + if not conf.CompilerCheck(): + print "\nIt seems as if your system isn't even able to compile any C-/C++-programs. Probably you don't have gcc and g++ installed. Compiling a package from source without a working compiler is very hard to do, please install the needed packages.\nHint: on *ubuntu you need both gcc- and g++-packages installed, easiest solution is to install build-essential which depends on gcc and g++." +- Exit( 1 ) ++ print "\n(ignored, fails on the powerpc buildd)" + + # Check for pkg-config before using pkg-config to check for other dependencies. + if not conf.CheckForPKGConfig(): diff -Nru libffado-2.0.99+svn2019/debian/patches/series libffado-2.0.99+svn2019/debian/patches/series --- libffado-2.0.99+svn2019/debian/patches/series 2012-01-20 01:04:42.000000000 +0700 +++ libffado-2.0.99+svn2019/debian/patches/series 2012-02-11 15:03:48.000000000 +0700 @@ -1 +1,2 @@ +no-gcc-check.diff exitcrash.patch diff -Nru libffado-2.0.99+svn2019/debian/rules libffado-2.0.99+svn2019/debian/rules --- libffado-2.0.99+svn2019/debian/rules 2012-01-20 01:04:42.000000000 +0700 +++ libffado-2.0.99+svn2019/debian/rules 2012-02-11 14:56:45.000000000 +0700 @@ -82,7 +82,7 @@ -rm -rf admin/*.pyc binary-install/ffado-mixer-qt4:: - dh_pysupport -pffado-mixer-qt4 + dh_python2 -pffado-mixer-qt4 binary-install/ffado-tools:: - dh_pysupport -pffado-tools + dh_python2 -pffado-tools