From e268c4a41d745ed6daa79db2f9df304ab754b5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 1 May 2015 11:33:42 +0200 Subject: [PATCH 1/2] Use a generic name for libmysqlclient dependency on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/applications/amarok/debian/control | 2 +- debian/lenny/applications/amarok/debian/control.in | 2 +- debian/squeeze/applications/amarok/debian/control | 2 +- debian/squeeze/applications/amarok/debian/control.in | 2 +- ubuntu/maverick/applications/amarok/debian/control | 2 +- ubuntu/maverick/applications/amarok/debian/control.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/applications/amarok/debian/control b/debian/lenny/applications/amarok/debian/control index 91b1b2d95..f5d748fdc 100644 --- a/debian/lenny/applications/amarok/debian/control +++ b/debian/lenny/applications/amarok/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, tdelibs14-trinity-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, - libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, + libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev, diff --git a/debian/lenny/applications/amarok/debian/control.in b/debian/lenny/applications/amarok/debian/control.in index e4dbd7131..92c2710ea 100644 --- a/debian/lenny/applications/amarok/debian/control.in +++ b/debian/lenny/applications/amarok/debian/control.in @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, lib tdelibs14-trinity-dev, libxine-dev, libdbus-qt-1-dev, libtag1-dev, libsqlite3-dev, libtunepimp-dev, - libmysqlclient15-dev, libpq-dev, + libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev diff --git a/debian/squeeze/applications/amarok/debian/control b/debian/squeeze/applications/amarok/debian/control index 1912237f6..979b38dc2 100644 --- a/debian/squeeze/applications/amarok/debian/control +++ b/debian/squeeze/applications/amarok/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, tdelibs14-trinity-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, - libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, + libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, libmp4v2-dev, ruby, ruby-dev, diff --git a/debian/squeeze/applications/amarok/debian/control.in b/debian/squeeze/applications/amarok/debian/control.in index e4dbd7131..92c2710ea 100644 --- a/debian/squeeze/applications/amarok/debian/control.in +++ b/debian/squeeze/applications/amarok/debian/control.in @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, lib tdelibs14-trinity-dev, libxine-dev, libdbus-qt-1-dev, libtag1-dev, libsqlite3-dev, libtunepimp-dev, - libmysqlclient15-dev, libpq-dev, + libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control index ec278fc18..43a85b183 100644 --- a/ubuntu/maverick/applications/amarok/debian/control +++ b/ubuntu/maverick/applications/amarok/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, tdelibs14-trinity-dev, libxine2-dev | libxine-dev, libdbus-tqt-1-dev, libtag1-dev, libsqlite3-dev, - libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev, + libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, libmp4v2-dev, ruby, ruby-dev, diff --git a/ubuntu/maverick/applications/amarok/debian/control.in b/ubuntu/maverick/applications/amarok/debian/control.in index e4dbd7131..92c2710ea 100644 --- a/ubuntu/maverick/applications/amarok/debian/control.in +++ b/ubuntu/maverick/applications/amarok/debian/control.in @@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2, automake, autoconf, lib tdelibs14-trinity-dev, libxine-dev, libdbus-qt-1-dev, libtag1-dev, libsqlite3-dev, libtunepimp-dev, - libmysqlclient15-dev, libpq-dev, + libmysqlclient-dev, libpq-dev, libvisual-0.4-dev, libsdl1.2-dev, libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev, ruby, ruby1.8-dev From 0c4195129ac05ce5ccaadbfba8b77cda643a3a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 1 May 2015 13:53:53 +0200 Subject: [PATCH 2/2] Fix bibletime FTBFS on some 64bit architectures on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/applications/bibletime/debian/rules | 10 ++++++++++ debian/squeeze/applications/bibletime/debian/rules | 10 ++++++++++ ubuntu/maverick/applications/bibletime/debian/rules | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/debian/lenny/applications/bibletime/debian/rules b/debian/lenny/applications/bibletime/debian/rules index 9e134b1f7..429e7e4fc 100755 --- a/debian/lenny/applications/bibletime/debian/rules +++ b/debian/lenny/applications/bibletime/debian/rules @@ -22,6 +22,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifneq (,$(filter powerpc64 ppc64el mips64,$(DEB_HOST_ARCH_CPU))) + # Fix "include/linux/types.h:148:1: error: unknown type name 'u32'". + # See linux commits: + # "asm/types.h: Remove include/asm-generic/int-l64.h" + # "powerpc: Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64" + CXXFLAGS += -D__SANE_USERSPACE_TYPES__ +endif + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/debian/squeeze/applications/bibletime/debian/rules b/debian/squeeze/applications/bibletime/debian/rules index eb2eab7e0..b385b43c7 100755 --- a/debian/squeeze/applications/bibletime/debian/rules +++ b/debian/squeeze/applications/bibletime/debian/rules @@ -22,6 +22,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifneq (,$(filter powerpc64 ppc64el mips64,$(DEB_HOST_ARCH_CPU))) + # Fix "include/linux/types.h:148:1: error: unknown type name 'u32'". + # See linux commits: + # "asm/types.h: Remove include/asm-generic/int-l64.h" + # "powerpc: Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64" + CXXFLAGS += -D__SANE_USERSPACE_TYPES__ +endif + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules index eb2eab7e0..b385b43c7 100755 --- a/ubuntu/maverick/applications/bibletime/debian/rules +++ b/ubuntu/maverick/applications/bibletime/debian/rules @@ -22,6 +22,16 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) +DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifneq (,$(filter powerpc64 ppc64el mips64,$(DEB_HOST_ARCH_CPU))) + # Fix "include/linux/types.h:148:1: error: unknown type name 'u32'". + # See linux commits: + # "asm/types.h: Remove include/asm-generic/int-l64.h" + # "powerpc: Add __SANE_USERSPACE_TYPES__ to asm/types.h for LL64" + CXXFLAGS += -D__SANE_USERSPACE_TYPES__ +endif + binary-install/bibletime-trinity:: chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/pics/* chmod 644 debian/bibletime-trinity/opt/trinity/share/apps/bibletime/bibletimeui.rc