From 36f01f5e09cc287386211bacba80b7d710ac0bbb Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 29 May 2008 10:26:59 +0000 Subject: [PATCH] updated debian packaging --- changelog | 29 +++++++++++++++++++++++++++++ control | 4 ++-- rules | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 3 deletions(-) diff --git a/changelog b/changelog index 64a2fc48..5f189065 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,32 @@ +lasso (2.1.98-4.1) unstable; urgency=high + + * NMU. + * Don't build-depend on gcj and gcj-4.3 on alpha, arm, hppa (same as for + java-gcj-compat). Closes: #477870. + * Adjust list of architectures for liblasso-java. Closes: #479737. + + -- Matthias Klose Sun, 25 May 2008 11:28:09 +0200 + +lasso (2.1.98-4) unstable; urgency=low + + * debian/rules: create control from control.in, so liblasso-java is not + built on architectures lacking gcj. + + -- Frederic Peters Sun, 04 May 2008 12:17:10 +0200 + +lasso (2.1.98-3) unstable; urgency=low + + * debian/liblasso-perl.install: really fix building with Perl 5.10. + + -- Frederic Peters Sat, 03 May 2008 12:30:41 +0200 + +lasso (2.1.98-2) unstable; urgency=low + + * debian/liblasso-perl.install: use wildcard for minor version number; so it + still works with Perl 5.10. (closes: #479065) + + -- Frederic Peters Fri, 02 May 2008 16:30:09 +0200 + lasso (2.1.98-1) unstable; urgency=low * New upstream release (RC). diff --git a/control b/control index ba5918cc..d8ac53ea 100644 --- a/control +++ b/control @@ -2,7 +2,7 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), gcc-4.3, java-gcj-compat [!alpha !arm !hppa !hurd-i386], gcj, gcj-4.3, php5-dev +Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.3.5-11), libexpat1-dev, fastjar, python-central (>= 0.5), gcc-4.3, java-gcj-compat [!alpha !arm !hppa !hurd-i386], gcj [!alpha !arm !hppa !hurd-i386], gcj-4.3 [!alpha !arm !hppa !hurd-i386], php5-dev, python-lxml XS-Python-Version: all Standards-Version: 3.7.2 Homepage: http://lasso.entrouvert.org @@ -56,7 +56,7 @@ Description: Liberty ID-FF library - Python bindings Package: liblasso-java Section: libs -Architecture: amd64 i386 ia64 powerpc ppc64 sparc kfreebsd-i386 kfreebsd-amd64 +Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64 Depends: ${shlibs:Depends}, ${misc:depends} Description: Liberty ID-FF library - Java bindings Lasso is an implementation of the Liberty Identity Federation specifications diff --git a/rules b/rules index f6af92e1..ecaa2891 100755 --- a/rules +++ b/rules @@ -12,6 +12,18 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +with_java := yes +no_java_archs := alpha arm hppa hurd-i386 +ifneq ($(DEB_TARGET_ARCH),i386) + ifneq ($(DEB_TARGET_ARCH),amd64) + ifeq ($(DEB_TARGET_ARCH), $(findstring $(DEB_TARGET_ARCH),$(no_java_archs))) + with_java := disabled for architecture $(DEB_TARGET_ARCH) + endif + endif +endif + PYDEF := $(shell pyversions -vd) PYVERS := $(shell pyversions -vr debian/control) OTHERPYVERS := $(filter-out $(PYDEF), $(PYVERS)) @@ -32,10 +44,29 @@ version=`ls src/.libs/lib*.so.* | \ major=`ls src/.libs/lib*.so.* | \ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +CONFIGURE_ARGS := \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --enable-tests=no \ + --disable-gtk-doc \ + --enable-perl \ + --disable-csharp \ + --disable-php4 \ + --with-php5-config-dir=/etc/php5/conf.d/ + + +ifeq ($(with_java),yes) + CONFIGURE_ARGS += --enable-java +else + CONFIGURE_ARGS += --disable-java +endif + + config.status: configure dh_testdir # Add here commands to configure the package. - CC=gcc-4.3 CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-tests=no --disable-gtk-doc --enable-perl --disable-csharp --disable-php4 --with-php5-config-dir=/etc/php5/conf.d/ + CC=gcc-4.3 CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS) touch perl/lasso_wrap.c perl/lasso.pm @@ -61,6 +92,13 @@ clean: dh_testroot rm -f build-stamp +ifeq ($(with_java),yes) + sed -e 's/^#JAVA#//' < debian/control.in > debian/control +else + sed -e 's/^#JAVA#.*//' < debian/control.in > debian/control +endif + + [ ! -f Makefile ] || $(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub