Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

9 files changed, 36 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/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/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/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/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
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