diff options
| author | Riku Voipio <riku.voipio@iki.fi> | 2007-09-03 17:34:42 +0300 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2007-09-04 21:52:10 +0300 |
| commit | e144b627b090b1aaaf9457d76a59d2d0ba0c58f9 (patch) | |
| tree | e185ef0b60093bc216e27bc793fc447711561ea4 | |
| parent | 6803e2b1a2e246e14b1ed5ad7541455353d28be9 (diff) | |
Packaging update1.99.0.16
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 14 |
3 files changed, 25 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index f1553af..0084c70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +scratchbox2 (1.99.0.16) unstable; urgency=low + + * New upstream version: + - Multilib support to allow using precompiled ia32 crosstoolchains + on amd64 hosts + - Fix hashbang support in execve() and do_exec() + - Fix symlink handling + - Add dbs support + * Change packagin to use multilib + + -- Riku Voipio <riku.voipio@iki.fi> Wed, 29 Aug 2007 15:13:36 +0300 + scratchbox2 (1.99.0.11) unstable; urgency=low * New upstream version, fixes and sb1 cruft killing diff --git a/debian/control b/debian/control index 94a7b2a..d35237e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Riku Voipio <riku.voipio@iki.fi> Section: utils Priority: extra Standards-Version: 3.7.2 -Build-Depends: debhelper (>=5), automake1.9, autoconf +Build-Depends: debhelper (>=5), automake1.9, autoconf, gcc-multilib [amd64], libc6-dev-i386 [amd64], g++-multilib [amd64] XS-Vcs-Git: git://anongit.freedesktop.org/git/sbox2 XS-Vcs-Browser: http://gitweb.freedesktop.org/?p=sbox2.git diff --git a/debian/rules b/debian/rules index 398753c..b9e7ffb 100755 --- a/debian/rules +++ b/debian/rules @@ -11,12 +11,22 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif +DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +ifeq (x86_64-linux-gnu,$(DEB_HOST_GNU_TYPE)) +BUILD_TARGET=multilib +INSTALL_TARGET=install-multilib +else +BUILD_TARGET=all +INSTALL_TARGET=install +endif + build: build-stamp build-stamp: dh_testdir ./autogen.sh ./configure --prefix=/usr - make + make $(BUILD_TARGET) touch build-stamp @@ -43,7 +53,7 @@ install: build dh_testdir dh_testroot dh_installdirs - $(MAKE) prefix="$(CURDIR)/debian/scratchbox2/usr" install + $(MAKE) prefix="$(CURDIR)/debian/scratchbox2/usr" $(INSTALL_TARGET) # make lintian happy rm -f debian/scratchbox2/usr/share/scratchbox2/host_usr ln -sf ../.. debian/scratchbox2/usr/share/scratchbox2/host_usr |