diff options
| author | Fathi Boudra <fabo@debian.org> | 2011-12-26 19:35:17 +0200 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2011-12-26 19:35:17 +0200 |
| commit | 345df937a5d649390b415a7f876ab02d4557c2b8 (patch) | |
| tree | ca3c6cba99bf4221df8741f7bf0c5a1ffdffea6f /debian | |
| parent | b444ffb53ee5d56371f3b77313b92a36c09b8a8e (diff) | |
| parent | f16b28c1f5e1389446b42453b8b598c67195ebc1 (diff) | |
| download | qt4-x11-345df937a5d649390b415a7f876ab02d4557c2b8.tar.gz | |
Merge commit 'f16b28c1f5e1389446b42453b8b598c67195ebc1'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 1f1e1e3..376dc89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,10 @@ qt4-x11 (4:4.7.4-1) UNRELEASED; urgency=low * Add libqt4-declarative-shaders package. * Update symbol files. - -- Fathi Boudra <fabo@debian.org> Mon, 12 Sep 2011 08:52:33 +0300 + [ Pino Toscano ] + * Force a non-parallel build on ia64, maybe it fixes the build on this arch. + + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 14 Dec 2011 14:15:47 +0100 qt4-x11 (4:4.7.3-8) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 405bbf4..cdb3bf3 100755 --- a/debian/rules +++ b/debian/rules @@ -66,8 +66,12 @@ else platform_arg = glibc-g++ endif +ifneq ($(DEB_HOST_ARCH),ia64) + extra_dh_opts += --parallel +endif + %: - dh $@ --parallel --with pkgkde_symbolshelper + dh $@ $(extra_dh_opts) --with pkgkde_symbolshelper override_dh_auto_configure: # Test broken hppa kernel with glibc >= 2.5 |