diff options
| author | Julien Cristau <jcristau@debian.org> | 2007-02-04 14:05:23 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2007-02-04 14:05:23 +0100 |
| commit | 544601e9f4093e4bc95cd9d6bcd42d78e34ad638 (patch) | |
| tree | 5471780ee28ac2facf87c43a4b3c17b8dba3d69a | |
| parent | 2634f06c2095b79d4252bb81c0b0272139dad890 (diff) | |
Fix FTBFS on non-i386 archs.
Build architecture-independant debs in binary-indep, and use the debhelper -s
option for commands in binary-arch, because architectures other than i386
don't have to build libgl1-mesa-swx11-i686.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debian/rules | 45 |
2 files changed, 32 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index d8c34be4cd6..f1b9856533c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ mesa (6.5.2-2) UNRELEASED; urgency=low * Sync Section/Priority for all packages with the override. + * Build the arch:all debs in binary-indep, and use the debhelper -s option + for commands in binary-arch, to fix FTBFS on non-i386 archs. - -- Julien Cristau <julien.cristau@ens-lyon.org> Sun, 28 Jan 2007 18:17:23 +0100 + -- Julien Cristau <julien.cristau@ens-lyon.org> Sun, 4 Feb 2007 14:01:55 +0100 mesa (6.5.2-1) experimental; urgency=low diff --git a/debian/rules b/debian/rules index 7d3196ff7dc..7a7025f1f0c 100755 --- a/debian/rules +++ b/debian/rules @@ -96,30 +96,43 @@ clean: unpatch # Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. + dh_testdir + dh_testroot + dh_installchangelogs -i + dh_installdocs -i + dh_installexamples -i + dh_install --sourcedir=debian/tmp --list-missing -i + dh_installman -i + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp --list-missing - dh_installman - dh_link + dh_installchangelogs -s + dh_installdocs -s + dh_installexamples -s + dh_install --sourcedir=debian/tmp --list-missing -s + dh_installman -s + dh_link -s dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh_strip -s + dh_compress -s + dh_fixperms -s + dh_makeshlibs -s + dh_installdeb -s + dh_shlibdeps -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s binary: binary-indep binary-arch .PHONY: configs build clean binary-indep binary-arch binary install configure |