diff --git a/changelog b/changelog index a75f9d01..61aa1f00 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,47 @@ +lasso (2.3.6-2) unstable; urgency=low + + * Fix building against glib 2.32 (closes: #665565, #666636) + + -- Frederic Peters Mon, 02 Apr 2012 17:31:31 +0200 + +lasso (2.3.6-1) unstable; urgency=low + + * New upstream version. + * bindings/php5/wrapper_source.py: use zend_function_entry, making it build + against PHP 5.4 (upstream, closes: #662622) + + -- Frederic Peters Mon, 05 Mar 2012 14:07:05 +0100 + +lasso (2.3.5-4) unstable; urgency=low + + * Don't force gcc 4.4 anymore; /facepalm. (closes: #635640) + + -- Frederic Peters Thu, 28 Jul 2011 08:16:14 +0200 + +lasso (2.3.5-3) unstable; urgency=low + + * debian/control.in, debian/rules: disable liblasso-java on all + architectures, at the moment it is too complicated to have reliable builds + with java activated. (closes: #624777) + * build against a newer perl version. (closes: #635446) + + -- Frederic Peters Tue, 26 Jul 2011 22:36:27 +0200 + +lasso (2.3.5-2) unstable; urgency=low + + * debian/liblasso-perl.install: fixed module name (uppercase L). + (closes: #622114) + * debian/liblasso3-dev.install: do not install libtool archive file. + (closes: #620909, #621560) + * debian/control.in: add build-dependency on gcc-4.4, to match the gcj + version that is used. + * debian/rules: + + force gcc 4.4, because of gcj 4.4. + + remove rpath from Lasso.so Perl module. + + remove obsolete call to dh_python. + + -- Frederic Peters Mon, 11 Apr 2011 09:35:48 +0200 + lasso (2.3.5-1) unstable; urgency=low * New upstream release. diff --git a/compat b/compat index b8626c4c..7ed6ff82 100644 --- a/compat +++ b/compat @@ -1 +1 @@ -4 +5 diff --git a/control b/control index 819d41ef..55958196 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), gcj, gcj-jre, gcj-jdk, php5-dev, python-lxml +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), php5-dev, python-lxml, chrpath XS-Python-Version: all Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org @@ -48,17 +48,17 @@ Description: Library for Liberty Alliance and SAML protocols - Python bindings This package contains Python bindings for liblasso, needed to use lasso in Python applications. -Package: liblasso-java -Section: libs -Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64 -Depends: ${shlibs:Depends}, ${misc:depends} -Description: Library for Liberty Alliance and SAML protocols - Java bindings - Lasso is an implementation of Liberty Alliance and related protocols, for - network identity federations, single sign-on and other web services protocols. - The main specifications implemented by the library are ID-FF, ID-WSF and SAML. - . - This package provides the Java interface to liblasso, needed to use lasso in - Java applications. + + + + + + + + + + + Package: liblasso-perl Section: perl diff --git a/control.in b/control.in index ca21fb1d..6e9556b3 100644 --- a/control.in +++ b/control.in @@ -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), gcj, gcj-jre, gcj-jdk, php5-dev, python-lxml +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), php5-dev, python-lxml, chrpath XS-Python-Version: all Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org @@ -49,7 +49,7 @@ Description: Library for Liberty Alliance and SAML protocols - Python bindings in Python applications. #JAVA#Package: liblasso-java -#JAVA#Section: java +#JAVA#Section: libs #JAVA#Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64 #JAVA#Depends: ${shlibs:Depends}, ${misc:depends} #JAVA#Description: Library for Liberty Alliance and SAML protocols - Java bindings @@ -73,7 +73,7 @@ Description: Library for Liberty Alliance and SAML protocols - Perl bindings in Perl applications. Package: php5-lasso -Section: php +Section: web Architecture: any Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} Description: Library for Liberty Alliance and SAML protocols - PHP 5 bindings diff --git a/liblasso-perl.install b/liblasso-perl.install index a5714aff..b1f08337 100644 --- a/liblasso-perl.install +++ b/liblasso-perl.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/perl/5.*.*/lasso.pm usr/lib/perl5/ -debian/tmp/usr/lib/perl/5.*.*/auto/lasso/lasso.bs usr/lib/perl5/auto/lasso/ -debian/tmp/usr/lib/perl/5.*.*/auto/lasso/lasso.so usr/lib/perl5/auto/lasso/ +debian/tmp/usr/lib/perl/5.*.*/Lasso.pm usr/lib/perl5/ +debian/tmp/usr/lib/perl/5.*.*/auto/Lasso/Lasso.bs usr/lib/perl5/auto/Lasso/ +debian/tmp/usr/lib/perl/5.*.*/auto/Lasso/Lasso.so usr/lib/perl5/auto/Lasso/ diff --git a/liblasso3-dev.install b/liblasso3-dev.install index ad209437..de3d1dfa 100644 --- a/liblasso3-dev.install +++ b/liblasso3-dev.install @@ -1,5 +1,4 @@ debian/tmp/usr/include/lasso debian/tmp/usr/lib/liblasso.a debian/tmp/usr/lib/liblasso.so -debian/tmp/usr/lib/liblasso.la debian/tmp/usr/lib/pkgconfig/lasso.pc diff --git a/rules b/rules old mode 100755 new mode 100644 index ede7a6c5..b7a053f2 --- a/rules +++ b/rules @@ -14,7 +14,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) -with_java := yes +with_java := no no_java_archs := alpha arm hppa hurd-i386 ifneq ($(DEB_TARGET_ARCH),i386) ifneq ($(DEB_TARGET_ARCH),amd64) @@ -150,11 +150,11 @@ binary-arch: build install dh_installexamples -XCVS dh_installman dh_install + chrpath -d $(CURDIR)/debian/liblasso-perl/usr/lib/perl5/auto/Lasso/Lasso.so dh_link dh_strip dh_perl dh_pycentral -ppython-lasso - dh_python dh_compress dh_fixperms dh_makeshlibs -a -V