From e7f88217e4fa89a0ae7cc3f9eb379afbcfa0d456 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sat, 24 Jul 2004 14:55:48 +0000 Subject: [PATCH 01/63] added debian packaging files (NOT included in .tar.gz produced by make dist; this is normal) --- changelog | 6 +++ compat | 1 + control | 45 +++++++++++++++++ copyright | 10 ++++ dirs | 2 + docs | 1 + liblasso-dev.dirs | 2 + liblasso-dev.files | 5 ++ liblasso0-python2.3.files | 3 ++ liblasso0.dirs | 1 + liblasso0.files | 1 + rules | 103 ++++++++++++++++++++++++++++++++++++++ 12 files changed, 180 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 dirs create mode 100644 docs create mode 100644 liblasso-dev.dirs create mode 100644 liblasso-dev.files create mode 100644 liblasso0-python2.3.files create mode 100644 liblasso0.dirs create mode 100644 liblasso0.files create mode 100755 rules diff --git a/changelog b/changelog new file mode 100644 index 00000000..b339f02b --- /dev/null +++ b/changelog @@ -0,0 +1,6 @@ +lasso (0.2.0-1) unstable; urgency=low + + * Initial Release. + + -- Frederic Peters Fri, 16 Jul 2004 14:50:19 +0200 + diff --git a/compat b/compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/compat @@ -0,0 +1 @@ +4 diff --git a/control b/control new file mode 100644 index 00000000..877ac4cd --- /dev/null +++ b/control @@ -0,0 +1,45 @@ +Source: lasso +Priority: optional +Maintainer: Frederic Peters +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev +Standards-Version: 3.6.0 + +Package: liblasso-dev +Section: devel +Architecture: any +Depends: liblasso0 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev +Description: Liberty Alliance library - development kit + Lasso is an implementation of the Liberty Alliance standard; it defines + processes for federated identities, single signon and related protocols. + . + This package contains the development files for Lasso. + . + Homepage: http://lasso.entrouvert.org + + +Package: liblasso0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Liberty Alliance library - runtime library + Lasso is an implementation of the Liberty Alliance standard; it defines + processes for federated identities, single signon and related protocols. + . + This package contains liblasso library used by applications to gain Library + Alliance support. + . + Homepage: http://lasso.entrouvert.org + +Package: liblasso0-python2.3 +Section: python +Architecture: any +Depends: python2.3, ${shlibs:Depends}, ${misc:depends}, ${python:Depends} +Description: Liberty Alliance library - Python 2.3 bindings + Lasso is an implementation of the Liberty Alliance standard; it defines + processes for federated identities, single signon and related protocols. + . + This package contains Python 2.3 bindings for liblasso, needed to use lasso + in Python programs. + . + Homepage: http://lasso.entrouvert.org + diff --git a/copyright b/copyright new file mode 100644 index 00000000..f4ca0158 --- /dev/null +++ b/copyright @@ -0,0 +1,10 @@ +This package was debianized by Frederic Peters on +Fri, 16 Jul 2004 14:50:19 +0200. + +It was downloaded from + +Upstream Author(s): + +Copyright: + + diff --git a/dirs b/dirs new file mode 100644 index 00000000..ca882bbb --- /dev/null +++ b/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/docs b/docs new file mode 100644 index 00000000..e845566c --- /dev/null +++ b/docs @@ -0,0 +1 @@ +README diff --git a/liblasso-dev.dirs b/liblasso-dev.dirs new file mode 100644 index 00000000..44188162 --- /dev/null +++ b/liblasso-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include diff --git a/liblasso-dev.files b/liblasso-dev.files new file mode 100644 index 00000000..bba219c8 --- /dev/null +++ b/liblasso-dev.files @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* +/usr/lib/*.la diff --git a/liblasso0-python2.3.files b/liblasso0-python2.3.files new file mode 100644 index 00000000..41158e05 --- /dev/null +++ b/liblasso0-python2.3.files @@ -0,0 +1,3 @@ +usr/lib/python2.3/lib-dynload/lassomod.so +usr/lib/python2.3/site-packages/* + diff --git a/liblasso0.dirs b/liblasso0.dirs new file mode 100644 index 00000000..68457717 --- /dev/null +++ b/liblasso0.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/liblasso0.files b/liblasso0.files new file mode 100644 index 00000000..d0dbfd18 --- /dev/null +++ b/liblasso0.files @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff --git a/rules b/rules new file mode 100755 index 00000000..f188d46f --- /dev/null +++ b/rules @@ -0,0 +1,103 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# shared library versions, option 1 +version=2.0.5 +major=2 +# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so +#version=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +#major=`ls src/.libs/lib*.so.* | \ +# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman + dh_movefiles + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs -a -V + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install From 7716529c82c6d617774381ba55e69dceb4a1a056 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sat, 24 Jul 2004 18:15:00 +0000 Subject: [PATCH 02/63] do not build tests in the debian package --- rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules b/rules index f188d46f..a7102153 100755 --- a/rules +++ b/rules @@ -36,7 +36,7 @@ major=2 config.status: configure dh_testdir # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + 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 build: build-stamp From c11cd6bf0fe4d16f62b038b1a09e25700ff57595 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 27 Jul 2004 15:31:37 +0000 Subject: [PATCH 03/63] debian/ updated for official 0.3 release --- changelog | 11 +++++++++-- control | 2 +- copyright | 39 +++++++++++++++++++++++++++++++++++---- docs | 1 + liblasso0-python2.3.files | 4 ++-- rules | 14 +++++--------- 6 files changed, 53 insertions(+), 18 deletions(-) diff --git a/changelog b/changelog index b339f02b..4dbec65b 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,13 @@ -lasso (0.2.0-1) unstable; urgency=low +lasso (0.3.0-2) unstable; urgency=low + + * debian/liblasso0-python2.3.files: don't include static library in Python + package. [brown bag] + + -- Frederic Peters Tue, 27 Jul 2004 17:23:07 +0200 + +lasso (0.3.0-1) unstable; urgency=low * Initial Release. - -- Frederic Peters Fri, 16 Jul 2004 14:50:19 +0200 + -- Frederic Peters Tue, 27 Jul 2004 16:50:43 +0200 diff --git a/control b/control index 877ac4cd..7b46246a 100644 --- a/control +++ b/control @@ -1,7 +1,7 @@ Source: lasso Priority: optional Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python2.3-dev Standards-Version: 3.6.0 Package: liblasso-dev diff --git a/copyright b/copyright index f4ca0158..a58d68bc 100644 --- a/copyright +++ b/copyright @@ -1,10 +1,41 @@ This package was debianized by Frederic Peters on Fri, 16 Jul 2004 14:50:19 +0200. -It was downloaded from +It was downloaded from http://lasso.entrouvert.org -Upstream Author(s): +Upstream Authors: -Copyright: + Nicolas Clapies + Valery Febvre + (complete list in AUTHORS) + + +Copyright (c) 2004 Entr'ouvert +Excepted the Lasso logo, copyright (c) 2004, Entr'ouvert & Florent Monnier + +License is GNU GPL v2 or later plus OpenSSL exception clause. + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2 of the License, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +675 Mass Ave, Cambridge, MA 02139, USA. + +In addition, as a special exception, Entr'ouvert gives permission to link +the code of its release of Lasso with the OpenSSL project's "OpenSSL" +library (or with modified versions of it that use the same license as the +"OpenSSL" library), and distribute the linked executables. You must obey +the GNU General Public License in all respects for all of the code used +other than "OpenSSL". If you modify this file, you may extend this +exception to your version of the file, but you are not obligated to do so. +If you do not wish to do so, delete this exception statement from your +version. - diff --git a/docs b/docs index e845566c..55bc0a63 100644 --- a/docs +++ b/docs @@ -1 +1,2 @@ README +AUTHORS diff --git a/liblasso0-python2.3.files b/liblasso0-python2.3.files index 41158e05..fb065643 100644 --- a/liblasso0-python2.3.files +++ b/liblasso0-python2.3.files @@ -1,3 +1,3 @@ -usr/lib/python2.3/lib-dynload/lassomod.so -usr/lib/python2.3/site-packages/* +usr/lib/python2.3/site-packages/*.py +usr/lib/python2.3/site-packages/*.so diff --git a/rules b/rules index a7102153..2cc805cd 100755 --- a/rules +++ b/rules @@ -24,14 +24,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +version=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` +major=`ls src/.libs/lib*.so.* | \ + awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` config.status: configure dh_testdir @@ -83,7 +79,7 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs ChangeLog + dh_installchangelogs dh_installdocs dh_installexamples dh_installman From 44cf009c4826304b49774cdbfee85c1f8cb0036a Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Mon, 2 Aug 2004 18:23:54 +0000 Subject: [PATCH 04/63] some files to be ignored in debian/ --- .cvsignore | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 00000000..1a0614c4 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +files +liblasso-dev +liblasso0 +liblasso0-python2.3 +liblasso0-python2.3.substvars +liblasso0.postinst.debhelper +liblasso0.postrm.debhelper +liblasso0.substvars +tmp + From 2043c1962daafb9948f7c6599ae5d27b4776a57a Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sun, 8 Aug 2004 09:37:59 +0000 Subject: [PATCH 05/63] debian packaging: - correct sections - correct FSF address - renamed liblasso-dev to liblasso0-dev (and provides: liblasso-dev) - pointer to /usr/share/common-licenses/GPL --- changelog | 17 +++++++++++++++++ control | 9 ++++++--- copyright | 9 ++++++--- liblasso-dev.dirs | 2 -- liblasso-dev.files | 5 ----- rules | 2 +- 6 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 liblasso-dev.dirs delete mode 100644 liblasso-dev.files diff --git a/changelog b/changelog index 4dbec65b..c690b2eb 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,20 @@ +lasso (0.3.0-4) unstable; urgency=low + + * debian/copyright: fixed address of the FSF; add a pointer to + /usr/share/common-licenses/GPL. + * debian/control: lasso source package goes in section libs and liblasso-dev + goes in section libdevel + * debian/control: -dev package renamed to liblasso0-dev; provides + liblasso-dev (per Debian Library Packaging guide) + + -- Frederic Peters Sun, 8 Aug 2004 10:55:39 +0200 + +lasso (0.3.0-3) unstable; urgency=low + + * fixed lasso.pc + + -- Frederic Peters Thu, 29 Jul 2004 23:24:57 +0200 + lasso (0.3.0-2) unstable; urgency=low * debian/liblasso0-python2.3.files: don't include static library in Python diff --git a/control b/control index 7b46246a..9634d45e 100644 --- a/control +++ b/control @@ -1,13 +1,16 @@ Source: lasso Priority: optional +Section: libs Maintainer: Frederic Peters Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python2.3-dev -Standards-Version: 3.6.0 +Standards-Version: 3.6.1 -Package: liblasso-dev -Section: devel +Package: liblasso0-dev +Section: libdevel Architecture: any Depends: liblasso0 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev +Provides: liblasso-dev +Conflicts: liblasso-dev Description: Liberty Alliance library - development kit Lasso is an implementation of the Liberty Alliance standard; it defines processes for federated identities, single signon and related protocols. diff --git a/copyright b/copyright index a58d68bc..9f2b7d52 100644 --- a/copyright +++ b/copyright @@ -25,9 +25,9 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -675 Mass Ave, Cambridge, MA 02139, USA. +You should have received a copy of the GNU General Public License along with +this program; if not, write to the Free Software Foundation, Inc., 59 Temple +Place - Suite 330, Boston, MA 02111-1307, USA. In addition, as a special exception, Entr'ouvert gives permission to link the code of its release of Lasso with the OpenSSL project's "OpenSSL" @@ -39,3 +39,6 @@ exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in `/usr/share/common-licenses/GPL'. + diff --git a/liblasso-dev.dirs b/liblasso-dev.dirs deleted file mode 100644 index 44188162..00000000 --- a/liblasso-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/liblasso-dev.files b/liblasso-dev.files deleted file mode 100644 index bba219c8..00000000 --- a/liblasso-dev.files +++ /dev/null @@ -1,5 +0,0 @@ -usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* -/usr/lib/*.la diff --git a/rules b/rules index 2cc805cd..f774f051 100755 --- a/rules +++ b/rules @@ -32,7 +32,7 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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 + 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-java --disable-php build: build-stamp From a6e72b709c2dbddf85338eee256c73f8b6677419 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sun, 8 Aug 2004 09:38:43 +0000 Subject: [PATCH 06/63] missed new files --- liblasso0-dev.dirs | 2 ++ liblasso0-dev.files | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 liblasso0-dev.dirs create mode 100644 liblasso0-dev.files diff --git a/liblasso0-dev.dirs b/liblasso0-dev.dirs new file mode 100644 index 00000000..44188162 --- /dev/null +++ b/liblasso0-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include diff --git a/liblasso0-dev.files b/liblasso0-dev.files new file mode 100644 index 00000000..bba219c8 --- /dev/null +++ b/liblasso0-dev.files @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* +/usr/lib/*.la From e6b75eeebc2472623b60969e1787af74f6c87bb4 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sat, 21 Aug 2004 18:58:49 +0000 Subject: [PATCH 07/63] updated debian package description; added packaging of the C# assembly. --- changelog | 6 ++++++ control | 38 ++++++++++++++++++++++++++++---------- liblasso0-cil.files | 5 +++++ liblasso0-dev.files | 10 +++++----- rules | 3 ++- 5 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 liblasso0-cil.files diff --git a/changelog b/changelog index c690b2eb..335a9843 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +lasso (0.4.0-0.pre20040821.0) unstable; urgency=low + + * CVS snapshot. + + -- Frederic Peters Sat, 21 Aug 2004 17:29:24 +0200 + lasso (0.3.0-4) unstable; urgency=low * debian/copyright: fixed address of the FSF; add a pointer to diff --git a/control b/control index 9634d45e..664810d5 100644 --- a/control +++ b/control @@ -2,7 +2,8 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python2.3-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, + libxmlsec1-openssl, libglib2.0-dev, python2.3-dev, mono-mcs, mono-gac Standards-Version: 3.6.1 Package: liblasso0-dev @@ -11,9 +12,10 @@ Architecture: any Depends: liblasso0 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev Provides: liblasso-dev Conflicts: liblasso-dev -Description: Liberty Alliance library - development kit - Lasso is an implementation of the Liberty Alliance standard; it defines - processes for federated identities, single signon and related protocols. +Description: Liberty ID-FF library - development kit + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. . This package contains the development files for Lasso. . @@ -24,9 +26,10 @@ Package: liblasso0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Liberty Alliance library - runtime library - Lasso is an implementation of the Liberty Alliance standard; it defines - processes for federated identities, single signon and related protocols. +Description: Liberty ID-FF library - runtime library + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. . This package contains liblasso library used by applications to gain Library Alliance support. @@ -37,12 +40,27 @@ Package: liblasso0-python2.3 Section: python Architecture: any Depends: python2.3, ${shlibs:Depends}, ${misc:depends}, ${python:Depends} -Description: Liberty Alliance library - Python 2.3 bindings - Lasso is an implementation of the Liberty Alliance standard; it defines - processes for federated identities, single signon and related protocols. +Description: Liberty ID-FF library - Python 2.3 bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. . This package contains Python 2.3 bindings for liblasso, needed to use lasso in Python programs. . Homepage: http://lasso.entrouvert.org +Package: liblasso0-cil +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends}, mono-assemblies-base +Description: Liberty ID-FF library - .NET bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains .NET assemblies that allow .NET / C# programs to use + lasso. + . + Homepage: http://lasso.entrouvert.org + diff --git a/liblasso0-cil.files b/liblasso0-cil.files new file mode 100644 index 00000000..9a997af7 --- /dev/null +++ b/liblasso0-cil.files @@ -0,0 +1,5 @@ +usr/lib/liblassosharpglue.so +usr/lib/pkgconfig/lasso-sharp.pc +usr/share/dotnet/lasso/lasso.dll +usr/share/dotnet/lasso/lasso.dll.config +usr/lib/mono/gac/ diff --git a/liblasso0-dev.files b/liblasso0-dev.files index bba219c8..cfa37bf1 100644 --- a/liblasso0-dev.files +++ b/liblasso0-dev.files @@ -1,5 +1,5 @@ -usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* -/usr/lib/*.la +usr/include/lasso +usr/lib/liblasso.a +usr/lib/liblasso.so +usr/lib/liblasso.la +usr/lib/pkgconfig/lasso.pc diff --git a/rules b/rules index f774f051..fd9f7e2a 100755 --- a/rules +++ b/rules @@ -68,7 +68,8 @@ install: build dh_installdirs # Add here commands to install the package into debian/tmp - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ + GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib" # Build architecture-independent files here. From a5dcd754ec9483c287f4200555c5deb7ead27c0d Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 31 Aug 2004 11:39:36 +0000 Subject: [PATCH 08/63] php4 packaging and renamed liblasso0-python2.3 to python2.3-lasso --- .cvsignore | 9 +++---- changelog | 4 +-- control | 26 ++++++++++++++++--- php4-lasso.examples | 1 + php4-lasso.files | 2 ++ ...0-python2.3.files => python2.3-lasso.files | 0 rules | 4 +-- 7 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 php4-lasso.examples create mode 100644 php4-lasso.files rename liblasso0-python2.3.files => python2.3-lasso.files (100%) diff --git a/.cvsignore b/.cvsignore index 1a0614c4..0c5f41df 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,10 +1,9 @@ files liblasso-dev liblasso0 -liblasso0-python2.3 -liblasso0-python2.3.substvars -liblasso0.postinst.debhelper -liblasso0.postrm.debhelper -liblasso0.substvars +python2.3-lasso +php4-lasso +*.substvars +*.debhelper tmp diff --git a/changelog b/changelog index 335a9843..beceaa8e 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,8 @@ -lasso (0.4.0-0.pre20040821.0) unstable; urgency=low +lasso (0.4.0-0.pre20040831.0) unstable; urgency=low * CVS snapshot. - -- Frederic Peters Sat, 21 Aug 2004 17:29:24 +0200 + -- Frederic Peters Tue, 31 Aug 2004 13:33:43 +0200 lasso (0.3.0-4) unstable; urgency=low diff --git a/control b/control index 664810d5..79fd307a 100644 --- a/control +++ b/control @@ -3,7 +3,8 @@ Priority: optional Section: libs Maintainer: Frederic Peters Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, - libxmlsec1-openssl, libglib2.0-dev, python2.3-dev, mono-mcs, mono-gac + libxmlsec1-openssl, libglib2.0-dev, python2.3-dev, mono-mcs, mono-gac, + php4-dev Standards-Version: 3.6.1 Package: liblasso0-dev @@ -36,7 +37,10 @@ Description: Liberty ID-FF library - runtime library . Homepage: http://lasso.entrouvert.org -Package: liblasso0-python2.3 +Package: python2.3-lasso +Conflicts: liblasso0-python2.3 +Replaces: liblasso0-python2.3 +Provides: liblasso0-python2.3 Section: python Architecture: any Depends: python2.3, ${shlibs:Depends}, ${misc:depends}, ${python:Depends} @@ -46,7 +50,7 @@ Description: Liberty ID-FF library - Python 2.3 bindings network identity federation and single sign-on. . This package contains Python 2.3 bindings for liblasso, needed to use lasso - in Python programs. + in Python applications. . Homepage: http://lasso.entrouvert.org @@ -59,8 +63,22 @@ Description: Liberty ID-FF library - .NET bindings defined by the Liberty Alliance consortium. They defines processes such as network identity federation and single sign-on. . - This package contains .NET assemblies that allow .NET / C# programs to use + This package contains .NET assemblies that allow .NET / C# applications to use lasso. . Homepage: http://lasso.entrouvert.org +Package: php4-lasso +Section: web +Architecture: any +Depends: phpapi-20020918, ${shlibs:Depends}, ${misc:depends} +Description: Liberty ID-FF library - PHP 4 bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains PHP 4 bindings for liblasso, needed to use lasso + in PHP applications. + . + Homepage: http://lasso.entrouvert.org + diff --git a/php4-lasso.examples b/php4-lasso.examples new file mode 100644 index 00000000..b809b977 --- /dev/null +++ b/php4-lasso.examples @@ -0,0 +1 @@ +php/examples/sample-sp/ diff --git a/php4-lasso.files b/php4-lasso.files new file mode 100644 index 00000000..6f557535 --- /dev/null +++ b/php4-lasso.files @@ -0,0 +1,2 @@ +usr/lib/php4/20020429/*.so + diff --git a/liblasso0-python2.3.files b/python2.3-lasso.files similarity index 100% rename from liblasso0-python2.3.files rename to python2.3-lasso.files diff --git a/rules b/rules index fd9f7e2a..f62218b1 100755 --- a/rules +++ b/rules @@ -32,7 +32,7 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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-java --disable-php + 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-java build: build-stamp @@ -82,7 +82,7 @@ binary-arch: build install dh_testroot dh_installchangelogs dh_installdocs - dh_installexamples + dh_installexamples -XCVS dh_installman dh_movefiles dh_link From 0eb153a361a1efc21c1f814a188ab1c6d45a8ec3 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 31 Aug 2004 11:40:08 +0000 Subject: [PATCH 09/63] cvs must ignore cil and dev packages directory --- .cvsignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 0c5f41df..ef2ea932 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,7 @@ files -liblasso-dev liblasso0 +liblasso0-cil +liblasso0-dev python2.3-lasso php4-lasso *.substvars From 91f8a009af4f4422aa29dd15a1b3926c91607c16 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 7 Sep 2004 11:16:45 +0000 Subject: [PATCH 10/63] updated debian packaging --- changelog | 16 +++++++++++++--- control | 16 +++++++--------- files | 5 +++++ liblasso0-cil.files => liblasso-cil.files | 2 ++ liblasso0-dev.dirs => liblasso1-dev.dirs | 0 liblasso0-dev.files => liblasso1-dev.files | 0 liblasso0.dirs => liblasso1.dirs | 0 liblasso0.files => liblasso1.files | 0 liblasso1.postinst.debhelper | 5 +++++ liblasso1.postrm.debhelper | 5 +++++ rules | 5 +++-- 11 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 files rename liblasso0-cil.files => liblasso-cil.files (75%) rename liblasso0-dev.dirs => liblasso1-dev.dirs (100%) rename liblasso0-dev.files => liblasso1-dev.files (100%) rename liblasso0.dirs => liblasso1.dirs (100%) rename liblasso0.files => liblasso1.files (100%) create mode 100644 liblasso1.postinst.debhelper create mode 100644 liblasso1.postrm.debhelper diff --git a/changelog b/changelog index beceaa8e..ea9870b8 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,18 @@ -lasso (0.4.0-0.pre20040831.0) unstable; urgency=low +lasso (0.4.0-1) unstable; urgency=low - * CVS snapshot. + * New upstream release. + * changed soname, liblasso0 -> liblasso1 + * Packaging of PHP4 binding and .NET assemblies. - -- Frederic Peters Tue, 31 Aug 2004 13:33:43 +0200 + -- Frederic Peters Mon, 6 Sep 2004 19:18:38 +0200 + +lasso (0.3.0-6) unstable; urgency=low + + * debian/control: improved package description (closes: #266556) + * python/: backported fix to use libtool correctly; should fix the build + failures on hppa and amd64 (closes: #267556, #268198) + + -- Frederic Peters Thu, 26 Aug 2004 17:01:13 +0200 lasso (0.3.0-4) unstable; urgency=low diff --git a/control b/control index 79fd307a..f4303c38 100644 --- a/control +++ b/control @@ -2,17 +2,15 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, - libxmlsec1-openssl, libglib2.0-dev, python2.3-dev, mono-mcs, mono-gac, - php4-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python2.3-dev, mono-mcs, mono-gac, mono-utils, php4-dev Standards-Version: 3.6.1 -Package: liblasso0-dev +Package: liblasso1-dev Section: libdevel Architecture: any -Depends: liblasso0 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev +Depends: liblasso1 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev Provides: liblasso-dev -Conflicts: liblasso-dev +Conflicts: liblasso-dev, liblasso0 Description: Liberty ID-FF library - development kit Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as @@ -23,7 +21,7 @@ Description: Liberty ID-FF library - development kit Homepage: http://lasso.entrouvert.org -Package: liblasso0 +Package: liblasso1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -54,8 +52,8 @@ Description: Liberty ID-FF library - Python 2.3 bindings . Homepage: http://lasso.entrouvert.org -Package: liblasso0-cil -Section: python +Package: liblasso-cil +Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:depends}, mono-assemblies-base Description: Liberty ID-FF library - .NET bindings diff --git a/files b/files new file mode 100644 index 00000000..ab9947e2 --- /dev/null +++ b/files @@ -0,0 +1,5 @@ +liblasso1-dev_0.4.0-1_i386.deb libdevel optional +liblasso1_0.4.0-1_i386.deb libs optional +python2.3-lasso_0.4.0-1_i386.deb python optional +liblasso-cil_0.4.0-1_i386.deb libs optional +php4-lasso_0.4.0-1_i386.deb web optional diff --git a/liblasso0-cil.files b/liblasso-cil.files similarity index 75% rename from liblasso0-cil.files rename to liblasso-cil.files index 9a997af7..2e6a094a 100644 --- a/liblasso0-cil.files +++ b/liblasso-cil.files @@ -1,5 +1,7 @@ usr/lib/liblassosharpglue.so +usr/lib/liblassosharpglue.la usr/lib/pkgconfig/lasso-sharp.pc usr/share/dotnet/lasso/lasso.dll usr/share/dotnet/lasso/lasso.dll.config usr/lib/mono/gac/ +usr/lib/mono/lasso/ diff --git a/liblasso0-dev.dirs b/liblasso1-dev.dirs similarity index 100% rename from liblasso0-dev.dirs rename to liblasso1-dev.dirs diff --git a/liblasso0-dev.files b/liblasso1-dev.files similarity index 100% rename from liblasso0-dev.files rename to liblasso1-dev.files diff --git a/liblasso0.dirs b/liblasso1.dirs similarity index 100% rename from liblasso0.dirs rename to liblasso1.dirs diff --git a/liblasso0.files b/liblasso1.files similarity index 100% rename from liblasso0.files rename to liblasso1.files diff --git a/liblasso1.postinst.debhelper b/liblasso1.postinst.debhelper new file mode 100644 index 00000000..3d89d3ef --- /dev/null +++ b/liblasso1.postinst.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "configure" ]; then + ldconfig +fi +# End automatically added section diff --git a/liblasso1.postrm.debhelper b/liblasso1.postrm.debhelper new file mode 100644 index 00000000..7f440472 --- /dev/null +++ b/liblasso1.postrm.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "remove" ]; then + ldconfig +fi +# End automatically added section diff --git a/rules b/rules index f62218b1..afc6e21d 100755 --- a/rules +++ b/rules @@ -32,7 +32,7 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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-java + 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-java --disable-gtk-doc build: build-stamp @@ -91,7 +91,8 @@ binary-arch: build install dh_fixperms dh_makeshlibs -a -V dh_installdeb - dh_shlibdeps + dh_shlibdeps -a + dh_makenetlibs -L liblasso-cil -r dh_gencontrol dh_md5sums dh_builddeb From 4138c7bc9bfd17dcd940b0bd6b0dd1406e46828b Mon Sep 17 00:00:00 2001 From: Emmanuel Raviart Date: Sat, 22 Jan 2005 15:57:56 +0000 Subject: [PATCH 11/63] Updated Copyright and authors. --- copyright | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/copyright b/copyright index 9f2b7d52..577eb9b6 100644 --- a/copyright +++ b/copyright @@ -7,10 +7,11 @@ Upstream Authors: Nicolas Clapies Valery Febvre + Frederic Peters (complete list in AUTHORS) -Copyright (c) 2004 Entr'ouvert +Copyright (c) 2004, 2005 Entr'ouvert Excepted the Lasso logo, copyright (c) 2004, Entr'ouvert & Florent Monnier License is GNU GPL v2 or later plus OpenSSL exception clause. From 647cc75f0b329cb434d50e975ec5b9c89e95e4fc Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 8 Feb 2005 13:13:20 +0000 Subject: [PATCH 12/63] updated debian packaging to what has just been uploaded to sid --- changelog | 26 ++++++++++++++++++++++ control | 12 +++++----- copyright | 3 +-- liblasso1-dev.dirs => liblasso3-dev.dirs | 0 liblasso1-dev.files => liblasso3-dev.files | 0 liblasso1.dirs => liblasso3.dirs | 0 liblasso1.files => liblasso3.files | 0 php4-lasso.files | 2 +- rules | 2 +- 9 files changed, 35 insertions(+), 10 deletions(-) rename liblasso1-dev.dirs => liblasso3-dev.dirs (100%) rename liblasso1-dev.files => liblasso3-dev.files (100%) rename liblasso1.dirs => liblasso3.dirs (100%) rename liblasso1.files => liblasso3.files (100%) diff --git a/changelog b/changelog index ea9870b8..367cf6d7 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,29 @@ +lasso (0.6.0-1) unstable; urgency=low + + * New upstream release. + * Rebuilt with new PHP API. (closes: #294003) + + -- Frederic Peters Tue, 8 Feb 2005 13:42:24 +0100 + +lasso (0.4.1-3) unstable; urgency=low + + * debian/control: added libexpat1-dev to build-depends; it is required for + the PHP binding. + + -- Frederic Peters Mon, 13 Sep 2004 09:26:34 +0200 + +lasso (0.4.1-2) unstable; urgency=low + + * debian/control: added python to build-depends + + -- Frederic Peters Sun, 12 Sep 2004 21:40:57 +0200 + +lasso (0.4.1-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Wed, 8 Sep 2004 10:40:56 +0200 + lasso (0.4.0-1) unstable; urgency=low * New upstream release. diff --git a/control b/control index f4303c38..ee940025 100644 --- a/control +++ b/control @@ -2,15 +2,15 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python2.3-dev, mono-mcs, mono-gac, mono-utils, php4-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, mono-mcs, mono-gac, mono-utils, php4-dev (>= 4:4.3.10-3), libexpat1-dev Standards-Version: 3.6.1 -Package: liblasso1-dev +Package: liblasso3-dev Section: libdevel Architecture: any -Depends: liblasso1 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev +Depends: liblasso3 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev Provides: liblasso-dev -Conflicts: liblasso-dev, liblasso0 +Conflicts: liblasso-dev, liblasso0, liblasso1 Description: Liberty ID-FF library - development kit Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as @@ -21,7 +21,7 @@ Description: Liberty ID-FF library - development kit Homepage: http://lasso.entrouvert.org -Package: liblasso1 +Package: liblasso3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -69,7 +69,7 @@ Description: Liberty ID-FF library - .NET bindings Package: php4-lasso Section: web Architecture: any -Depends: phpapi-20020918, ${shlibs:Depends}, ${misc:depends} +Depends: phpapi-20020918-zts, ${shlibs:Depends}, ${misc:depends} Description: Liberty ID-FF library - PHP 4 bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as diff --git a/copyright b/copyright index 577eb9b6..9f2b7d52 100644 --- a/copyright +++ b/copyright @@ -7,11 +7,10 @@ Upstream Authors: Nicolas Clapies Valery Febvre - Frederic Peters (complete list in AUTHORS) -Copyright (c) 2004, 2005 Entr'ouvert +Copyright (c) 2004 Entr'ouvert Excepted the Lasso logo, copyright (c) 2004, Entr'ouvert & Florent Monnier License is GNU GPL v2 or later plus OpenSSL exception clause. diff --git a/liblasso1-dev.dirs b/liblasso3-dev.dirs similarity index 100% rename from liblasso1-dev.dirs rename to liblasso3-dev.dirs diff --git a/liblasso1-dev.files b/liblasso3-dev.files similarity index 100% rename from liblasso1-dev.files rename to liblasso3-dev.files diff --git a/liblasso1.dirs b/liblasso3.dirs similarity index 100% rename from liblasso1.dirs rename to liblasso3.dirs diff --git a/liblasso1.files b/liblasso3.files similarity index 100% rename from liblasso1.files rename to liblasso3.files diff --git a/php4-lasso.files b/php4-lasso.files index 6f557535..be92d192 100644 --- a/php4-lasso.files +++ b/php4-lasso.files @@ -1,2 +1,2 @@ -usr/lib/php4/20020429/*.so +usr/lib/php4/*/*.so diff --git a/rules b/rules index afc6e21d..5af43c5b 100755 --- a/rules +++ b/rules @@ -32,7 +32,7 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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-java --disable-gtk-doc + 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-java --disable-gtk-doc --disable-perl build: build-stamp From f111f94718a668afb211a41aff7f4563751d6d26 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 26 May 2005 09:29:07 +0000 Subject: [PATCH 13/63] this file is generated --- files | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 files diff --git a/files b/files deleted file mode 100644 index ab9947e2..00000000 --- a/files +++ /dev/null @@ -1,5 +0,0 @@ -liblasso1-dev_0.4.0-1_i386.deb libdevel optional -liblasso1_0.4.0-1_i386.deb libs optional -python2.3-lasso_0.4.0-1_i386.deb python optional -liblasso-cil_0.4.0-1_i386.deb libs optional -php4-lasso_0.4.0-1_i386.deb web optional From 6f50becbd9c83de5e6f122a4b140754c4e9a212c Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 26 May 2005 09:29:45 +0000 Subject: [PATCH 14/63] new upstream --- changelog | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/changelog b/changelog index 367cf6d7..c2d26a61 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,35 @@ +lasso (0.6.2-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Thu, 26 May 2005 11:29:25 +0200 + +lasso (0.6.1-3) unstable; urgency=low + + * debian/control: fixed Depends line, this is no longer -zts. + * debian/control: updated Build-depends to php4-dev (>= 4:4.3.10-10) + (closes: #301330) + + -- Frederic Peters Fri, 25 Mar 2005 10:15:22 +0100 + +lasso (0.6.1-2) unstable; urgency=low + + * Rebuilt with PHP Zend Thread Safety disabled. + * lasso/xml/lib_authn_request.c, lasso/id-ff/login.c: backported + AssertionConsumerServiceID fix from CVS. + * python/lasso_wrap.c, python/lasso.py: regenerated with SWIG 1.3.22; + 1.3.24 created a buggy binding. + * debian/control: Build-depends on mono-utils (>= 1.0) + + -- Frederic Peters Fri, 25 Mar 2005 08:50:39 +0100 + +lasso (0.6.1-1) unstable; urgency=low + + * New upstream release. + * lasso/id-ff/login.c: backported SAML 1.0 compatibility fix from CVS. + + -- Frederic Peters Sun, 6 Mar 2005 14:07:45 +0100 + lasso (0.6.0-1) unstable; urgency=low * New upstream release. From 27248a135440af29f71e8c3858c409fefdc2036a Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 26 May 2005 09:29:57 +0000 Subject: [PATCH 15/63] no more php zts --- control | 4 ++-- php4-lasso.examples | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/control b/control index ee940025..27eef5ee 100644 --- a/control +++ b/control @@ -2,7 +2,7 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, mono-mcs, mono-gac, mono-utils, php4-dev (>= 4:4.3.10-3), libexpat1-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, mono-mcs, mono-gac, mono-utils (>= 1.0), php4-dev (>= 4:4.3.10-10), libexpat1-dev Standards-Version: 3.6.1 Package: liblasso3-dev @@ -69,7 +69,7 @@ Description: Liberty ID-FF library - .NET bindings Package: php4-lasso Section: web Architecture: any -Depends: phpapi-20020918-zts, ${shlibs:Depends}, ${misc:depends} +Depends: phpapi-20020918, ${shlibs:Depends}, ${misc:depends} Description: Liberty ID-FF library - PHP 4 bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as diff --git a/php4-lasso.examples b/php4-lasso.examples index b809b977..e69de29b 100644 --- a/php4-lasso.examples +++ b/php4-lasso.examples @@ -1 +0,0 @@ -php/examples/sample-sp/ From 6699ae0698757947899c82f26343ca5fe15e7fa9 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 2 Jun 2005 16:14:16 +0000 Subject: [PATCH 16/63] new mono packages no longer have this tool --- rules | 1 - 1 file changed, 1 deletion(-) diff --git a/rules b/rules index 5af43c5b..fa242f19 100755 --- a/rules +++ b/rules @@ -92,7 +92,6 @@ binary-arch: build install dh_makeshlibs -a -V dh_installdeb dh_shlibdeps -a - dh_makenetlibs -L liblasso-cil -r dh_gencontrol dh_md5sums dh_builddeb From 5f7a78576ba4924aa637a7a8afc105bf74f9f568 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Fri, 3 Jun 2005 18:21:22 +0000 Subject: [PATCH 17/63] updated debian packaging wrt new cli policy --- changelog | 10 +++++++++- control | 4 ++-- rules | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index c2d26a61..747c0f33 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,16 @@ +lasso (0.6.2-2) unstable; urgency=low + + * debian/rules: removed call to dh_makenetshlibs which is no longer shipped + with Mono 1.1 packages. (closes: #311837) + * debian/control, debian/rules: updated to new CLI policy. + + -- Frederic Peters Fri, 3 Jun 2005 20:15:12 +0200 + lasso (0.6.2-1) unstable; urgency=low * New upstream release. - -- Frederic Peters Thu, 26 May 2005 11:29:25 +0200 + -- Frederic Peters Thu, 26 May 2005 11:56:42 +0200 lasso (0.6.1-3) unstable; urgency=low diff --git a/control b/control index 27eef5ee..2956a6ae 100644 --- a/control +++ b/control @@ -2,7 +2,7 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, mono-mcs, mono-gac, mono-utils (>= 1.0), php4-dev (>= 4:4.3.10-10), libexpat1-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, mono-mcs | c-sharp-compiler, mono-gac, mono-utils (>= 1.0), cli-common (>= 0.1.3), php4-dev (>= 4:4.3.10-10), libexpat1-dev Standards-Version: 3.6.1 Package: liblasso3-dev @@ -55,7 +55,7 @@ Description: Liberty ID-FF library - Python 2.3 bindings Package: liblasso-cil Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends}, mono-assemblies-base +Depends: ${shlibs:Depends}, ${misc:depends}, ${cli:Depends} Description: Liberty ID-FF library - .NET bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as diff --git a/rules b/rules index fa242f19..1d5c9630 100755 --- a/rules +++ b/rules @@ -74,7 +74,7 @@ install: build # Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. + dh_makeclilibs -L liblasso-cil -r # Build architecture-dependent files here. binary-arch: build install @@ -90,6 +90,7 @@ binary-arch: build install dh_compress dh_fixperms dh_makeshlibs -a -V + dh_clideps -L liblasso-cil -r -d dh_installdeb dh_shlibdeps -a dh_gencontrol From d75cc9a2a9459b0b773d882487bef1b5865e49c7 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Wed, 10 Aug 2005 12:17:07 +0000 Subject: [PATCH 18/63] disabled c# in debian apckage --- control | 14 -------------- rules | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/control b/control index 2956a6ae..302cbbb4 100644 --- a/control +++ b/control @@ -52,20 +52,6 @@ Description: Liberty ID-FF library - Python 2.3 bindings . Homepage: http://lasso.entrouvert.org -Package: liblasso-cil -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends}, ${cli:Depends} -Description: Liberty ID-FF library - .NET bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. - . - This package contains .NET assemblies that allow .NET / C# applications to use - lasso. - . - Homepage: http://lasso.entrouvert.org - Package: php4-lasso Section: web Architecture: any diff --git a/rules b/rules index 1d5c9630..1e13f124 100755 --- a/rules +++ b/rules @@ -32,7 +32,7 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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-java --disable-gtk-doc --disable-perl + 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-java --disable-gtk-doc --disable-perl --enable-wsf --disable-csharp build: build-stamp @@ -74,7 +74,7 @@ install: build # Build architecture-independent files here. binary-indep: build install - dh_makeclilibs -L liblasso-cil -r + #dh_makeclilibs -L liblasso-cil -r # Build architecture-dependent files here. binary-arch: build install @@ -90,7 +90,7 @@ binary-arch: build install dh_compress dh_fixperms dh_makeshlibs -a -V - dh_clideps -L liblasso-cil -r -d + #dh_clideps -L liblasso-cil -r -d dh_installdeb dh_shlibdeps -a dh_gencontrol From d740e7a8ac00210f380c04cb47ada31d3db2d93c Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 29 Sep 2005 22:24:08 +0000 Subject: [PATCH 19/63] new upstream release --- changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changelog b/changelog index 747c0f33..45f96b08 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +lasso (0.6.3-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Fri, 30 Sep 2005 00:23:03 +0200 + +lasso (0.6.2-3) unstable; urgency=low + + * debian/control: removed liblasso-cil package since the .net assembly + doesn't work (and don't even compile anymore) (closes: #320898) + lasso (0.6.2-2) unstable; urgency=low * debian/rules: removed call to dh_makenetshlibs which is no longer shipped From 2ae56be7dd4898684cc1805bf138dced2fa4cfb0 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 15:15:44 +0000 Subject: [PATCH 20/63] updated FSF address --- copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/copyright b/copyright index 9f2b7d52..93764219 100644 --- a/copyright +++ b/copyright @@ -26,8 +26,8 @@ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 59 Temple -Place - Suite 330, Boston, MA 02111-1307, USA. +this program; if not, write to the Free Software Foundation, Inc., 51 +Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. In addition, as a special exception, Entr'ouvert gives permission to link the code of its release of Lasso with the OpenSSL project's "OpenSSL" From 7d6a2608521eed4318ba30334f2198bdd7021a2b Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 15:16:16 +0000 Subject: [PATCH 21/63] don't build wsf; touch swig files so they are not rebuilt even if swig is detected. --- rules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rules b/rules index 1e13f124..dadc27db 100755 --- a/rules +++ b/rules @@ -32,7 +32,11 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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-java --disable-gtk-doc --disable-perl --enable-wsf --disable-csharp + 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-java --disable-gtk-doc --disable-perl --disable-csharp + # be sure not to call swig: + touch php/lasso_wrap.c php/php_lasso.h php/lasso.php + touch python/lasso_wrap.c python/lasso.py + touch perl/lasso_wrap.c perl/lasso.pm build: build-stamp From 34a3df4e9a4960b9206e3e8cf25931f46975fca7 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 15:16:39 +0000 Subject: [PATCH 22/63] updated debian changelog with uploaded packages. --- changelog | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index 45f96b08..ae276cc2 100644 --- a/changelog +++ b/changelog @@ -1,14 +1,39 @@ +lasso (0.6.3-4) unstable; urgency=low + + * debian/control: removed mono packages from build-depends since the -cil + package is no longer built. + + -- Frederic Peters Thu, 6 Oct 2005 14:18:56 +0200 + +lasso (0.6.3-3) unstable; urgency=low + + * debian/control: fixed php depends line. (closes: #331710) + + -- Frederic Peters Tue, 4 Oct 2005 22:59:17 +0200 + +lasso (0.6.3-2) unstable; urgency=low + + * php/Makefile.am: don't patch autogenerated swig file if swig was not + present (which implies the file has already been patched) + * debian/rules: touch swig generated files after configure so swig is + not called; even if available. (closes: #331699) + + -- Frederic Peters Tue, 4 Oct 2005 21:52:25 +0200 + lasso (0.6.3-1) unstable; urgency=low * New upstream release. + * debian/copyright: new FSF address. - -- Frederic Peters Fri, 30 Sep 2005 00:23:03 +0200 + -- Frederic Peters Fri, 30 Sep 2005 01:07:49 +0200 lasso (0.6.2-3) unstable; urgency=low * debian/control: removed liblasso-cil package since the .net assembly doesn't work (and don't even compile anymore) (closes: #320898) + -- Frederic Peters Fri, 19 Aug 2005 23:08:43 +0200 + lasso (0.6.2-2) unstable; urgency=low * debian/rules: removed call to dh_makenetshlibs which is no longer shipped From 8413d2714f6529bd8b0fee73af12ac3e612fdabe Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 15:16:59 +0000 Subject: [PATCH 23/63] removed mono packages from build-depends --- control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control b/control index 302cbbb4..c2469777 100644 --- a/control +++ b/control @@ -2,7 +2,7 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, mono-mcs | c-sharp-compiler, mono-gac, mono-utils (>= 1.0), cli-common (>= 0.1.3), php4-dev (>= 4:4.3.10-10), libexpat1-dev +Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, php4-dev (>= 4:4.3.10-10), libexpat1-dev Standards-Version: 3.6.1 Package: liblasso3-dev @@ -55,7 +55,7 @@ Description: Liberty ID-FF library - Python 2.3 bindings Package: php4-lasso Section: web Architecture: any -Depends: phpapi-20020918, ${shlibs:Depends}, ${misc:depends} +Depends: phpapi-20050606, ${shlibs:Depends}, ${misc:depends} Description: Liberty ID-FF library - PHP 4 bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as From e6fe5b5971e0dcdd545ae54e4312e2062ef5410e Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 17:23:23 +0000 Subject: [PATCH 24/63] new liblasso-java package --- control | 14 ++++++++++++++ liblasso-java.dirs | 1 + liblasso-java.files | 2 ++ rules | 4 +++- 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 liblasso-java.dirs create mode 100644 liblasso-java.files diff --git a/control b/control index c2469777..4a7118de 100644 --- a/control +++ b/control @@ -66,3 +66,17 @@ Description: Liberty ID-FF library - PHP 4 bindings . Homepage: http://lasso.entrouvert.org +Package: liblasso-java +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends} +Description: Liberty ID-FF library - Java bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package provides the Java interface to liblasso, needed to use lasso in + Java applications. + . + Homepage: http://lasso.entrouvert.org + diff --git a/liblasso-java.dirs b/liblasso-java.dirs new file mode 100644 index 00000000..0b70e893 --- /dev/null +++ b/liblasso-java.dirs @@ -0,0 +1 @@ +usr/lib/jni/ diff --git a/liblasso-java.files b/liblasso-java.files new file mode 100644 index 00000000..35b30352 --- /dev/null +++ b/liblasso-java.files @@ -0,0 +1,2 @@ +usr/lib/jni/*.so +usr/share/java/*.jar diff --git a/rules b/rules index dadc27db..9341b167 100755 --- a/rules +++ b/rules @@ -32,7 +32,7 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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-java --disable-gtk-doc --disable-perl --disable-csharp + 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 --disable-perl --disable-csharp # be sure not to call swig: touch php/lasso_wrap.c php/php_lasso.h php/lasso.php touch python/lasso_wrap.c python/lasso.py @@ -74,6 +74,8 @@ install: build # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib" + mkdir $(CURDIR)/debian/tmp/usr/lib/jni/ + mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ # Build architecture-independent files here. From 90601942feb0112171b106ec93c6e989d1efc8f0 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 17:24:14 +0000 Subject: [PATCH 25/63] remove old and never necessary debhelper generated files --- liblasso1.postinst.debhelper | 5 ----- liblasso1.postrm.debhelper | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 liblasso1.postinst.debhelper delete mode 100644 liblasso1.postrm.debhelper diff --git a/liblasso1.postinst.debhelper b/liblasso1.postinst.debhelper deleted file mode 100644 index 3d89d3ef..00000000 --- a/liblasso1.postinst.debhelper +++ /dev/null @@ -1,5 +0,0 @@ -# Automatically added by dh_makeshlibs -if [ "$1" = "configure" ]; then - ldconfig -fi -# End automatically added section diff --git a/liblasso1.postrm.debhelper b/liblasso1.postrm.debhelper deleted file mode 100644 index 7f440472..00000000 --- a/liblasso1.postrm.debhelper +++ /dev/null @@ -1,5 +0,0 @@ -# Automatically added by dh_makeshlibs -if [ "$1" = "remove" ]; then - ldconfig -fi -# End automatically added section From 241c19207b23552720c0148bbe80e3f93f75d960 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 6 Oct 2005 17:24:55 +0000 Subject: [PATCH 26/63] updating ignored files with new packages --- .cvsignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ef2ea932..9502c51b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1,8 @@ files -liblasso0 -liblasso0-cil -liblasso0-dev +liblasso3 +liblaso-cil +liblasso-java +liblasso3-dev python2.3-lasso php4-lasso *.substvars From 59b743fa8236ebc9cff53bedd0ab266c4600d482 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Wed, 8 Mar 2006 12:08:53 +0000 Subject: [PATCH 27/63] update to 0.6.4 --- changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog b/changelog index ae276cc2..9467f7b6 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +lasso (0.6.4-0) unofficial; urgency=low + + * unofficial build. + + -- Frederic Peters Wed, 8 Mar 2006 13:08:34 +0100 + lasso (0.6.3-4) unstable; urgency=low * debian/control: removed mono packages from build-depends since the -cil From 4a7bdf00f8a26dc7731445a743599cb28e3a820e Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sun, 19 Mar 2006 18:03:21 +0000 Subject: [PATCH 28/63] removed hardcoded php dependency, added php:Depends substvar --- control | 2 +- rules | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/control b/control index 4a7118de..6f59555e 100644 --- a/control +++ b/control @@ -55,7 +55,7 @@ Description: Liberty ID-FF library - Python 2.3 bindings Package: php4-lasso Section: web Architecture: any -Depends: phpapi-20050606, ${shlibs:Depends}, ${misc:depends} +Depends: ${php:Depends}, ${shlibs:Depends}, ${misc:depends} Description: Liberty ID-FF library - PHP 4 bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as diff --git a/rules b/rules index 9341b167..e1c7d2a0 100755 --- a/rules +++ b/rules @@ -29,6 +29,8 @@ version=`ls src/.libs/lib*.so.* | \ major=`ls src/.libs/lib*.so.* | \ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +phpapiver=$(shell php-config --phpapi) + config.status: configure dh_testdir # Add here commands to configure the package. @@ -99,6 +101,7 @@ binary-arch: build install #dh_clideps -L liblasso-cil -r -d dh_installdeb dh_shlibdeps -a + echo "php:Depends=phpapi-$(phpapiver)" >> debian/php4-lasso.substvars dh_gencontrol dh_md5sums dh_builddeb From 0f0bdd23b98d5d162b88bc13fa103f1b2a44fae9 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 21 Mar 2006 09:03:37 +0000 Subject: [PATCH 29/63] note about 0.6.5 --- changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changelog b/changelog index 9467f7b6..afe5741f 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +lasso (0.6.5-0) unofficial; urgency=low + + * unofficial build. + + -- Frederic Peters Tue, 21 Mar 2006 10:02:53 +0100 + lasso (0.6.4-0) unofficial; urgency=low * unofficial build. From 52b478f0d29e2926d2736f3cf6d6b228b27c5191 Mon Sep 17 00:00:00 2001 From: Damien Laniel Date: Wed, 30 May 2007 17:44:30 +0000 Subject: [PATCH 30/63] updated Copyright dates in some more remaining files --- copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copyright b/copyright index 93764219..388a20d5 100644 --- a/copyright +++ b/copyright @@ -10,7 +10,7 @@ Upstream Authors: (complete list in AUTHORS) -Copyright (c) 2004 Entr'ouvert +Copyright (c) 2004-2007 Entr'ouvert Excepted the Lasso logo, copyright (c) 2004, Entr'ouvert & Florent Monnier License is GNU GPL v2 or later plus OpenSSL exception clause. From a629f7aec886a8abd1d1e3d0ab90fb28256a52b3 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 26 Jul 2007 18:07:30 +0000 Subject: [PATCH 31/63] updated packaging to current sid package --- changelog | 36 ++++++++++++++++++++++++++++++------ control | 34 +++++++++++----------------------- pycompat | 1 + python-lasso.files | 3 +++ rules | 29 +++++++++++++++++++++++------ 5 files changed, 68 insertions(+), 35 deletions(-) create mode 100644 pycompat create mode 100644 python-lasso.files diff --git a/changelog b/changelog index afe5741f..68035d43 100644 --- a/changelog +++ b/changelog @@ -1,14 +1,38 @@ -lasso (0.6.5-0) unofficial; urgency=low +lasso (2.0.0-1) unstable; urgency=low - * unofficial build. + * New upstream release. + * debian/control: removes php4-lasso since PHP4 is no longer provided. + (closes: #432422, #418268) - -- Frederic Peters Tue, 21 Mar 2006 10:02:53 +0100 + -- Frederic Peters Mon, 09 Jul 2007 22:55:58 +0200 -lasso (0.6.4-0) unofficial; urgency=low +lasso (0.6.5-3) unstable; urgency=low - * unofficial build. + * Converted to new Python policy (merged from unreported Ubuntu patch) + * debian/control: keep conflict on python2.4-lasso which is unnecessary + for Debian but will reduce Ubuntu changes. - -- Frederic Peters Wed, 8 Mar 2006 13:08:34 +0100 + -- Frederic Peters Sat, 21 Oct 2006 17:31:47 +0200 + +lasso (0.6.5-2) unstable; urgency=low + + * debian/control: adding libgcj-dev and fastjar to build-depends since + liblasso-java is now built. + + -- Frederic Peters Wed, 22 Mar 2006 11:06:56 +0100 + +lasso (0.6.5-1) unstable; urgency=low + + * New upstream release. + * Incorporates Ubuntu patch for phpapi version. + + -- Frederic Peters Tue, 21 Mar 2006 10:48:05 +0100 + +lasso (0.6.4-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Mon, 13 Mar 2006 11:38:09 +0100 lasso (0.6.3-4) unstable; urgency=low diff --git a/control b/control index 6f59555e..858fc6ab 100644 --- a/control +++ b/control @@ -2,8 +2,9 @@ Source: lasso Priority: optional Section: libs Maintainer: Frederic Peters -Build-Depends: debhelper (>= 4.0.0), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python, python2.3-dev, php4-dev (>= 4:4.3.10-10), libexpat1-dev -Standards-Version: 3.6.1 +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, libgcj-dev, fastjar, python-central (>= 0.5) +XS-Python-Version: all +Standards-Version: 3.7.2 Package: liblasso3-dev Section: libdevel @@ -35,37 +36,24 @@ Description: Liberty ID-FF library - runtime library . Homepage: http://lasso.entrouvert.org -Package: python2.3-lasso -Conflicts: liblasso0-python2.3 -Replaces: liblasso0-python2.3 -Provides: liblasso0-python2.3 +Package: python-lasso +Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Provides: liblasso0-python2.3, ${python:Provides} Section: python Architecture: any -Depends: python2.3, ${shlibs:Depends}, ${misc:depends}, ${python:Depends} -Description: Liberty ID-FF library - Python 2.3 bindings +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} +XB-Python-Version: ${python:Versions} +Description: Liberty ID-FF library - Python bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as network identity federation and single sign-on. . - This package contains Python 2.3 bindings for liblasso, needed to use lasso + This package contains Python bindings for liblasso, needed to use lasso in Python applications. . Homepage: http://lasso.entrouvert.org -Package: php4-lasso -Section: web -Architecture: any -Depends: ${php:Depends}, ${shlibs:Depends}, ${misc:depends} -Description: Liberty ID-FF library - PHP 4 bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. - . - This package contains PHP 4 bindings for liblasso, needed to use lasso - in PHP applications. - . - Homepage: http://lasso.entrouvert.org - Package: liblasso-java Section: libs Architecture: any diff --git a/pycompat b/pycompat new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/pycompat @@ -0,0 +1 @@ +2 diff --git a/python-lasso.files b/python-lasso.files new file mode 100644 index 00000000..cf15adc4 --- /dev/null +++ b/python-lasso.files @@ -0,0 +1,3 @@ +usr/lib/python*/site-packages/*.py +usr/lib/python*/site-packages/*.so + diff --git a/rules b/rules index e1c7d2a0..dd59f04d 100755 --- a/rules +++ b/rules @@ -12,6 +12,9 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +PYDEF := $(shell pyversions -vd) +PYVERS := $(shell pyversions -vr debian/control) +OTHERPYVERS := $(filter-out $(PYDEF), $(PYVERS)) CFLAGS = -Wall -g @@ -29,16 +32,14 @@ version=`ls src/.libs/lib*.so.* | \ major=`ls src/.libs/lib*.so.* | \ awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` -phpapiver=$(shell php-config --phpapi) - config.status: configure dh_testdir # Add here commands to configure the package. - 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 --disable-perl --disable-csharp + 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 --disable-perl --disable-csharp --disable-php4 # be sure not to call swig: - touch php/lasso_wrap.c php/php_lasso.h php/lasso.php touch python/lasso_wrap.c python/lasso.py touch perl/lasso_wrap.c perl/lasso.pm + touch java/lasso_wrap.c java/lasso.java build: build-stamp @@ -47,6 +48,14 @@ build-stamp: config.status # Add here commands to compile the package. $(MAKE) + set -e; \ + for v in $(OTHERPYVERS); do \ + rm -rf python$$v; \ + cp -a python python$$v; \ + sed "s/$(PYDEF)/$$v/g" python/Makefile > python$$v/Makefile; \ + $(MAKE) -C python$$v clean; \ + $(MAKE) -C python$$v; \ + done touch build-stamp @@ -64,6 +73,9 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif + for v in $(OTHERPYVERS); do \ + rm -rf python$$v; \ + done dh_clean @@ -76,6 +88,11 @@ install: build # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib" + set -e; \ + for v in $(OTHERPYVERS); do \ + $(MAKE) -C python$$v install DESTDIR=$(CURDIR)/debian/tmp; \ + done + mkdir $(CURDIR)/debian/tmp/usr/lib/jni/ mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ @@ -95,13 +112,13 @@ binary-arch: build install dh_movefiles dh_link dh_strip + dh_pycentral -ppython-lasso + dh_python dh_compress dh_fixperms dh_makeshlibs -a -V - #dh_clideps -L liblasso-cil -r -d dh_installdeb dh_shlibdeps -a - echo "php:Depends=phpapi-$(phpapiver)" >> debian/php4-lasso.substvars dh_gencontrol dh_md5sums dh_builddeb From a1d5996ce49a5e6e34691974bcb005271695b4a4 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 26 Jul 2007 18:17:24 +0000 Subject: [PATCH 32/63] python2.3-lasso was package for old policy --- python2.3-lasso.files | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 python2.3-lasso.files diff --git a/python2.3-lasso.files b/python2.3-lasso.files deleted file mode 100644 index fb065643..00000000 --- a/python2.3-lasso.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/python2.3/site-packages/*.py -usr/lib/python2.3/site-packages/*.so - From 36bc7c2238550653f428d6e7176a49d1546e8e45 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 21 Apr 2008 15:10:03 +0000 Subject: [PATCH 33/63] * ajout d'un package debian pour le binding php5 --- control | 14 ++++++++++++++ php5-lasso.files | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 php5-lasso.files diff --git a/control b/control index 858fc6ab..a2fca93f 100644 --- a/control +++ b/control @@ -68,3 +68,17 @@ Description: Liberty ID-FF library - Java bindings . Homepage: http://lasso.entrouvert.org +Package: php5-lasso +Section: web +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends} +Description: Liberty ID-FF library - PHP5 bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package provides the Java interface to liblasso, needed to use lasso in + Java applications. + . + Homepage: http://lasso.entrouvert.org + diff --git a/php5-lasso.files b/php5-lasso.files new file mode 100644 index 00000000..9dfeab0a --- /dev/null +++ b/php5-lasso.files @@ -0,0 +1,3 @@ +etc/php5/conf.d/lasso.ini +usr/lib/php5/*/*.so +usr/share/php/lasso.php From 69dd84c682e06dc5ef99529c0fd0d48f5e635c84 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 29 Apr 2008 10:45:08 +0000 Subject: [PATCH 34/63] updated to current packaging then updated for new bindings --- changelog | 32 ++++++++++++++++++++++++++++++++ control | 28 +++++++++++++++++++++------- copyright | 2 +- liblasso-cil.files | 7 ------- liblasso-java.files | 2 -- liblasso-java.install | 2 ++ liblasso-perl.install | 3 +++ liblasso3-dev.files | 5 ----- liblasso3-dev.install | 5 +++++ liblasso3.files | 1 - liblasso3.install | 1 + php4-lasso.examples | 0 php4-lasso.files | 2 -- php5-lasso.files | 3 --- php5-lasso.install | 3 +++ python-lasso.files | 3 --- python-lasso.install | 2 ++ rules | 22 ++++++++++------------ 18 files changed, 80 insertions(+), 43 deletions(-) delete mode 100644 liblasso-cil.files delete mode 100644 liblasso-java.files create mode 100644 liblasso-java.install create mode 100644 liblasso-perl.install delete mode 100644 liblasso3-dev.files create mode 100644 liblasso3-dev.install delete mode 100644 liblasso3.files create mode 100644 liblasso3.install delete mode 100644 php4-lasso.examples delete mode 100644 php4-lasso.files delete mode 100644 php5-lasso.files create mode 100644 php5-lasso.install delete mode 100644 python-lasso.files create mode 100644 python-lasso.install diff --git a/changelog b/changelog index 68035d43..0fdec2e1 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,35 @@ +lasso (2.1.98-0) unstable; urgency=low + + * snapshot + + -- Frederic Peters Tue, 29 Apr 2008 12:02:56 +0200 + +lasso (2.1.1-3) unstable; urgency=low + + * debian/rules: added call to dh_perl; debian/control: added ${perl:Depends} + (closes: #463097) + * configure(.ac): fixed gcj check to work with gcj-4.3; debian/control: + updated build-deps for gcj 4.3 and added gcc-4.3; debian/rules: force + gcc-4.3 so jni.h is found and the java interface is built. + (closes: #464319) + + -- Frederic Peters Tue, 25 Mar 2008 16:48:15 +0100 + +lasso (2.1.1-2) unstable; urgency=low + + * debian/rules, debian/*.files: updated from dh_movefiles to dh_install + * really install files in liblasso-perl package (closes: #446578) + + -- Frederic Peters Mon, 15 Oct 2007 17:12:37 +0200 + +lasso (2.1.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: added liblasso-perl, Perl bindings for the library. + * debian/rules: --enable-perl + + -- Frederic Peters Wed, 22 Aug 2007 18:08:12 +0200 + lasso (2.0.0-1) unstable; urgency=low * New upstream release. diff --git a/control b/control index a2fca93f..ff5a823b 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, libgcj-dev, fastjar, python-central (>= 0.5) +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, gcj, gcj-4.3 XS-Python-Version: all Standards-Version: 3.7.2 @@ -68,17 +68,31 @@ Description: Liberty ID-FF library - Java bindings . Homepage: http://lasso.entrouvert.org -Package: php5-lasso -Section: web +Package: liblasso-perl +Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends} -Description: Liberty ID-FF library - PHP5 bindings +Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} +Description: Liberty ID-FF library - Perl bindings Lasso is an implementation of the Liberty Identity Federation specifications defined by the Liberty Alliance consortium. They defines processes such as network identity federation and single sign-on. . - This package provides the Java interface to liblasso, needed to use lasso in - Java applications. + This package contains Perl bindings for liblasso, needed to use lasso + in Perl applications. + . + Homepage: http://lasso.entrouvert.org + +Package: php5-lasso +Section: web +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends} +Description: Liberty ID-FF library - PHP 5 bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains PHP bindings for liblasso, needed to use lasso + in PHP applications. . Homepage: http://lasso.entrouvert.org diff --git a/copyright b/copyright index 388a20d5..93764219 100644 --- a/copyright +++ b/copyright @@ -10,7 +10,7 @@ Upstream Authors: (complete list in AUTHORS) -Copyright (c) 2004-2007 Entr'ouvert +Copyright (c) 2004 Entr'ouvert Excepted the Lasso logo, copyright (c) 2004, Entr'ouvert & Florent Monnier License is GNU GPL v2 or later plus OpenSSL exception clause. diff --git a/liblasso-cil.files b/liblasso-cil.files deleted file mode 100644 index 2e6a094a..00000000 --- a/liblasso-cil.files +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/liblassosharpglue.so -usr/lib/liblassosharpglue.la -usr/lib/pkgconfig/lasso-sharp.pc -usr/share/dotnet/lasso/lasso.dll -usr/share/dotnet/lasso/lasso.dll.config -usr/lib/mono/gac/ -usr/lib/mono/lasso/ diff --git a/liblasso-java.files b/liblasso-java.files deleted file mode 100644 index 35b30352..00000000 --- a/liblasso-java.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/jni/*.so -usr/share/java/*.jar diff --git a/liblasso-java.install b/liblasso-java.install new file mode 100644 index 00000000..758673ed --- /dev/null +++ b/liblasso-java.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/jni/*.so +debian/tmp/usr/share/java/*.jar diff --git a/liblasso-perl.install b/liblasso-perl.install new file mode 100644 index 00000000..68e7b034 --- /dev/null +++ b/liblasso-perl.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/perl/5.8.8/lasso.pm usr/lib/perl5/ +debian/tmp/usr/lib/perl/5.8.8/auto/lasso/lasso.bs usr/lib/perl5/auto/lasso/ +debian/tmp/usr/lib/perl/5.8.8/auto/lasso/lasso.so usr/lib/perl5/auto/lasso/ diff --git a/liblasso3-dev.files b/liblasso3-dev.files deleted file mode 100644 index cfa37bf1..00000000 --- a/liblasso3-dev.files +++ /dev/null @@ -1,5 +0,0 @@ -usr/include/lasso -usr/lib/liblasso.a -usr/lib/liblasso.so -usr/lib/liblasso.la -usr/lib/pkgconfig/lasso.pc diff --git a/liblasso3-dev.install b/liblasso3-dev.install new file mode 100644 index 00000000..ad209437 --- /dev/null +++ b/liblasso3-dev.install @@ -0,0 +1,5 @@ +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/liblasso3.files b/liblasso3.files deleted file mode 100644 index d0dbfd18..00000000 --- a/liblasso3.files +++ /dev/null @@ -1 +0,0 @@ -usr/lib/lib*.so.* diff --git a/liblasso3.install b/liblasso3.install new file mode 100644 index 00000000..c45ebcf2 --- /dev/null +++ b/liblasso3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* diff --git a/php4-lasso.examples b/php4-lasso.examples deleted file mode 100644 index e69de29b..00000000 diff --git a/php4-lasso.files b/php4-lasso.files deleted file mode 100644 index be92d192..00000000 --- a/php4-lasso.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/php4/*/*.so - diff --git a/php5-lasso.files b/php5-lasso.files deleted file mode 100644 index 9dfeab0a..00000000 --- a/php5-lasso.files +++ /dev/null @@ -1,3 +0,0 @@ -etc/php5/conf.d/lasso.ini -usr/lib/php5/*/*.so -usr/share/php/lasso.php diff --git a/php5-lasso.install b/php5-lasso.install new file mode 100644 index 00000000..61607e59 --- /dev/null +++ b/php5-lasso.install @@ -0,0 +1,3 @@ +debian/tmp/etc/php5/ +debian/tmp/usr/share/php/ +debian/tmp/usr/lib/php5/*/lasso.so diff --git a/python-lasso.files b/python-lasso.files deleted file mode 100644 index cf15adc4..00000000 --- a/python-lasso.files +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/python*/site-packages/*.py -usr/lib/python*/site-packages/*.so - diff --git a/python-lasso.install b/python-lasso.install new file mode 100644 index 00000000..5da02991 --- /dev/null +++ b/python-lasso.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python*/site-packages/*.py +debian/tmp/usr/lib/python*/site-packages/*.so diff --git a/rules b/rules index dd59f04d..51f6c022 100755 --- a/rules +++ b/rules @@ -35,11 +35,8 @@ major=`ls src/.libs/lib*.so.* | \ config.status: configure dh_testdir # Add here commands to configure the package. - 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 --disable-perl --disable-csharp --disable-php4 - # be sure not to call swig: - touch python/lasso_wrap.c python/lasso.py + 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/ touch perl/lasso_wrap.c perl/lasso.pm - touch java/lasso_wrap.c java/lasso.java build: build-stamp @@ -50,11 +47,11 @@ build-stamp: config.status $(MAKE) set -e; \ for v in $(OTHERPYVERS); do \ - rm -rf python$$v; \ - cp -a python python$$v; \ - sed "s/$(PYDEF)/$$v/g" python/Makefile > python$$v/Makefile; \ - $(MAKE) -C python$$v clean; \ - $(MAKE) -C python$$v; \ + rm -rf bindings/python$$v; \ + cp -a bindings/python bindings/python$$v; \ + sed "s/$(PYDEF)/$$v/g" bindings/python/Makefile > bindings/python$$v/Makefile; \ + $(MAKE) -C bindings/python$$v clean; \ + $(MAKE) -C bindings/python$$v; \ done touch build-stamp @@ -74,7 +71,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" endif for v in $(OTHERPYVERS); do \ - rm -rf python$$v; \ + rm -rf bindings/python$$v; \ done dh_clean @@ -90,7 +87,7 @@ install: build GACUTIL="/usr/bin/gacutil -root $(CURDIR)/debian/tmp/usr/lib" set -e; \ for v in $(OTHERPYVERS); do \ - $(MAKE) -C python$$v install DESTDIR=$(CURDIR)/debian/tmp; \ + $(MAKE) -C bindings/python$$v install DESTDIR=$(CURDIR)/debian/tmp; \ done mkdir $(CURDIR)/debian/tmp/usr/lib/jni/ @@ -109,9 +106,10 @@ binary-arch: build install dh_installdocs dh_installexamples -XCVS dh_installman - dh_movefiles + dh_install dh_link dh_strip + dh_perl dh_pycentral -ppython-lasso dh_python dh_compress From 198215ac31012b1cbb7dab1c0e8e621611050efc Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 29 Apr 2008 13:31:38 +0000 Subject: [PATCH 35/63] added build-dep on php5-dev --- control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control b/control index ff5a823b..5bc2e28f 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, gcj, gcj-4.3 +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, gcj, gcj-4.3, php5-dev XS-Python-Version: all Standards-Version: 3.7.2 From 4e0605a909c9f207c9223f859baf73d389e9b8b1 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Tue, 29 Apr 2008 20:29:43 +0000 Subject: [PATCH 36/63] updated with 2.1.98 packaging --- changelog | 16 +++++++++++++--- control | 8 ++++---- rules | 7 ++++--- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/changelog b/changelog index 0fdec2e1..64a2fc48 100644 --- a/changelog +++ b/changelog @@ -1,8 +1,18 @@ -lasso (2.1.98-0) unstable; urgency=low +lasso (2.1.98-1) unstable; urgency=low - * snapshot + * New upstream release (RC). + * debian/control: + * build new php5-lasso package. + * limit liblasso-java to architecture with gcj (closes: #477870). + * add Homepage field. + * liblasso3-dev: Replace ${Source-Version} with ${binary:Version} + (from Ubuntu patch) + * debian/rules: + * ignore liblasso-java package on architectures without gcj. + * update to match new upstream language bindings layout. + * don't ignore a make clean error. (from Ubuntu patch) - -- Frederic Peters Tue, 29 Apr 2008 12:02:56 +0200 + -- Frederic Peters Tue, 29 Apr 2008 22:03:51 +0200 lasso (2.1.1-3) unstable; urgency=low diff --git a/control b/control index 5bc2e28f..ba5918cc 100644 --- a/control +++ b/control @@ -2,14 +2,15 @@ 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, 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, gcj-4.3, php5-dev XS-Python-Version: all Standards-Version: 3.7.2 +Homepage: http://lasso.entrouvert.org Package: liblasso3-dev Section: libdevel Architecture: any -Depends: liblasso3 (= ${Source-Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev +Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev Provides: liblasso-dev Conflicts: liblasso-dev, liblasso0, liblasso1 Description: Liberty ID-FF library - development kit @@ -21,7 +22,6 @@ Description: Liberty ID-FF library - development kit . Homepage: http://lasso.entrouvert.org - Package: liblasso3 Section: libs Architecture: any @@ -56,7 +56,7 @@ Description: Liberty ID-FF library - Python bindings Package: liblasso-java Section: libs -Architecture: any +Architecture: amd64 i386 ia64 powerpc ppc64 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 51f6c022..f6af92e1 100755 --- a/rules +++ b/rules @@ -61,8 +61,7 @@ clean: dh_testroot rm -f build-stamp - # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -91,7 +90,9 @@ install: build done mkdir $(CURDIR)/debian/tmp/usr/lib/jni/ - mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ + if [ -e $(CURDIR)/debian/tmp/usr/lib/java ]; then \ + mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ ; \ + fi # Build architecture-independent files here. From 36f01f5e09cc287386211bacba80b7d710ac0bbb Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 29 May 2008 10:26:59 +0000 Subject: [PATCH 37/63] 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 From 5a590abce08deeff56160944726ac2075c851d67 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Thu, 29 May 2008 10:29:03 +0000 Subject: [PATCH 38/63] debian/control is now generated --- control.in | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 control.in diff --git a/control.in b/control.in new file mode 100644 index 00000000..3eb3f68b --- /dev/null +++ b/control.in @@ -0,0 +1,98 @@ +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 [!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 + +Package: liblasso3-dev +Section: libdevel +Architecture: any +Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev +Provides: liblasso-dev +Conflicts: liblasso-dev, liblasso0, liblasso1 +Description: Liberty ID-FF library - development kit + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains the development files for Lasso. + . + Homepage: http://lasso.entrouvert.org + +Package: liblasso3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Liberty ID-FF library - runtime library + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains liblasso library used by applications to gain Library + Alliance support. + . + Homepage: http://lasso.entrouvert.org + +Package: python-lasso +Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Provides: liblasso0-python2.3, ${python:Provides} +Section: python +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} +XB-Python-Version: ${python:Versions} +Description: Liberty ID-FF library - Python bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains Python bindings for liblasso, needed to use lasso + in Python applications. + . + Homepage: http://lasso.entrouvert.org + +#JAVA#Package: liblasso-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: Liberty ID-FF library - Java bindings +#JAVA# Lasso is an implementation of the Liberty Identity Federation specifications +#JAVA# defined by the Liberty Alliance consortium. They defines processes such as +#JAVA# network identity federation and single sign-on. +#JAVA# . +#JAVA# This package provides the Java interface to liblasso, needed to use lasso in +#JAVA# Java applications. +#JAVA# . +#JAVA# Homepage: http://lasso.entrouvert.org + +Package: liblasso-perl +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} +Description: Liberty ID-FF library - Perl bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains Perl bindings for liblasso, needed to use lasso + in Perl applications. + . + Homepage: http://lasso.entrouvert.org + +Package: php5-lasso +Section: web +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends} +Description: Liberty ID-FF library - PHP 5 bindings + Lasso is an implementation of the Liberty Identity Federation specifications + defined by the Liberty Alliance consortium. They defines processes such as + network identity federation and single sign-on. + . + This package contains PHP bindings for liblasso, needed to use lasso + in PHP applications. + . + Homepage: http://lasso.entrouvert.org + From 9990d33a84db6318e3889dc75ec625db588ab7d3 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 21 Jul 2010 14:12:06 +0000 Subject: [PATCH 39/63] [Core] remove now useless .cvsignore files --- .cvsignore | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 9502c51b..00000000 --- a/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -files -liblasso3 -liblaso-cil -liblasso-java -liblasso3-dev -python2.3-lasso -php4-lasso -*.substvars -*.debhelper -tmp - From a0d546d765dd6b0a29209d5da59775e35955dd9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 8 Feb 2011 11:14:28 +0100 Subject: [PATCH 40/63] [debian] sync packaging with official package --- changelog | 47 +++++++++++++++++++++++++++++ control | 69 ++++++++++++++++++------------------------- control.in | 69 ++++++++++++++++++------------------------- liblasso-perl.install | 6 ++-- rules | 9 ++++-- 5 files changed, 113 insertions(+), 87 deletions(-) diff --git a/changelog b/changelog index 5f189065..a75f9d01 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,50 @@ +lasso (2.3.5-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 08 Feb 2011 09:58:03 +0100 + +lasso (2.2.1-4) unstable; urgency=low + + * debian/control, debian/rules: updated build-depends for recent gcj + changes, and to use the default gcc version. (Closes: #566895) + + -- Frederic Peters Mon, 25 Jan 2010 22:34:55 +0100 + +lasso (2.2.1-3) unstable; urgency=low + + * debian/control, debian/rules: add missing dependency on phpapi-$foo. + (Closes: #566288) + + -- Frederic Peters Sun, 24 Jan 2010 16:25:18 +0100 + +lasso (2.2.1-2) unstable; urgency=high + + * Correctly check for signature validity (CVE-2009-0050) (Closes: #511262) + + -- Frederic Peters Fri, 09 Jan 2009 10:30:58 +0100 + +lasso (2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Frederic Peters Tue, 22 Jul 2008 15:51:52 +0200 + +lasso (2.2.0-1) unstable; urgency=low + + * New upstream release. + * Acknowledge NMU. + * Fixed missing quotes in configure.in (Closes: #487816) + * debian/control: + * Updated package descriptions, + * Used new Homepage field. + * Moved liblasso-perl to perl section. + * debian/rules: + * remove config.log on clean. + * remove empty id-wsf include directory. + + -- Frederic Peters Sun, 13 Jul 2008 12:06:12 +0200 + lasso (2.1.98-4.1) unstable; urgency=high * NMU. diff --git a/control b/control index d8ac53ea..819d41ef 100644 --- a/control +++ b/control @@ -2,9 +2,9 @@ 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 [!alpha !arm !hppa !hurd-i386], gcj-4.3 [!alpha !arm !hppa !hurd-i386], 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), gcj, gcj-jre, gcj-jdk, php5-dev, python-lxml XS-Python-Version: all -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org Package: liblasso3-dev @@ -13,28 +13,24 @@ Architecture: any Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev Provides: liblasso-dev Conflicts: liblasso-dev, liblasso0, liblasso1 -Description: Liberty ID-FF library - development kit - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - development kit + 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 contains the development files for Lasso. - . - Homepage: http://lasso.entrouvert.org Package: liblasso3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Liberty ID-FF library - runtime library - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - runtime library + 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 contains liblasso library used by applications to gain Library Alliance support. - . - Homepage: http://lasso.entrouvert.org Package: python-lasso Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso @@ -44,55 +40,46 @@ Section: python Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} XB-Python-Version: ${python:Versions} -Description: Liberty ID-FF library - Python bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso in Python applications. - . - Homepage: http://lasso.entrouvert.org 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: Liberty ID-FF library - Java bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +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. - . - Homepage: http://lasso.entrouvert.org Package: liblasso-perl -Section: libs +Section: perl Architecture: any Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} -Description: Liberty ID-FF library - Perl bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - Perl 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 contains Perl bindings for liblasso, needed to use lasso in Perl applications. - . - Homepage: http://lasso.entrouvert.org Package: php5-lasso Section: web Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends} -Description: Liberty ID-FF library - PHP 5 bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - PHP 5 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 contains PHP bindings for liblasso, needed to use lasso in PHP applications. - . - Homepage: http://lasso.entrouvert.org - diff --git a/control.in b/control.in index 3eb3f68b..e980a7e2 100644 --- a/control.in +++ b/control.in @@ -2,9 +2,9 @@ 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 [!alpha !arm !hppa !hurd-i386], gcj-4.3 [!alpha !arm !hppa !hurd-i386], 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), gcj, gcj-jre, gcj-jdk, php5-dev, python-lxml XS-Python-Version: all -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org Package: liblasso3-dev @@ -13,28 +13,24 @@ Architecture: any Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev Provides: liblasso-dev Conflicts: liblasso-dev, liblasso0, liblasso1 -Description: Liberty ID-FF library - development kit - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - development kit + 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 contains the development files for Lasso. - . - Homepage: http://lasso.entrouvert.org Package: liblasso3 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Liberty ID-FF library - runtime library - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - runtime library + 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 contains liblasso library used by applications to gain Library Alliance support. - . - Homepage: http://lasso.entrouvert.org Package: python-lasso Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso @@ -44,55 +40,46 @@ Section: python Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} XB-Python-Version: ${python:Versions} -Description: Liberty ID-FF library - Python bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso in Python applications. - . - Homepage: http://lasso.entrouvert.org #JAVA#Package: liblasso-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: Liberty ID-FF library - Java bindings -#JAVA# Lasso is an implementation of the Liberty Identity Federation specifications -#JAVA# defined by the Liberty Alliance consortium. They defines processes such as -#JAVA# network identity federation and single sign-on. +#JAVA#Description: Library for Liberty Alliance and SAML protocols - Java bindings +#JAVA# Lasso is an implementation of Liberty Alliance and related protocols, for +#JAVA# network identity federations, single sign-on and other web services protocols. +#JAVA# The main specifications implemented by the library are ID-FF, ID-WSF and SAML. #JAVA# . #JAVA# This package provides the Java interface to liblasso, needed to use lasso in #JAVA# Java applications. -#JAVA# . -#JAVA# Homepage: http://lasso.entrouvert.org Package: liblasso-perl -Section: libs +Section: perl Architecture: any Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} -Description: Liberty ID-FF library - Perl bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Description: Library for Liberty Alliance and SAML protocols - Perl 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 contains Perl bindings for liblasso, needed to use lasso in Perl applications. - . - Homepage: http://lasso.entrouvert.org Package: php5-lasso Section: web Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends} -Description: Liberty ID-FF library - PHP 5 bindings - Lasso is an implementation of the Liberty Identity Federation specifications - defined by the Liberty Alliance consortium. They defines processes such as - network identity federation and single sign-on. +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - PHP 5 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 contains PHP bindings for liblasso, needed to use lasso in PHP applications. - . - Homepage: http://lasso.entrouvert.org - diff --git a/liblasso-perl.install b/liblasso-perl.install index 68e7b034..a5714aff 100644 --- a/liblasso-perl.install +++ b/liblasso-perl.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/perl/5.8.8/lasso.pm usr/lib/perl5/ -debian/tmp/usr/lib/perl/5.8.8/auto/lasso/lasso.bs usr/lib/perl5/auto/lasso/ -debian/tmp/usr/lib/perl/5.8.8/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/rules b/rules index ecaa2891..ede7a6c5 100755 --- a/rules +++ b/rules @@ -66,8 +66,7 @@ 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) $(CONFIGURE_ARGS) - touch perl/lasso_wrap.c perl/lasso.pm + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS) build: build-stamp @@ -111,6 +110,8 @@ endif rm -rf bindings/python$$v; \ done + rm -f config.log + dh_clean install: build @@ -132,6 +133,9 @@ install: build mv $(CURDIR)/debian/tmp/usr/lib/java/*.so $(CURDIR)/debian/tmp/usr/lib/jni/ ; \ fi + # remove id-wsf directory if it is empty + -rmdir $(CURDIR)/debian/tmp/usr/include/lasso/id-wsf/ + # Build architecture-independent files here. binary-indep: build install @@ -156,6 +160,7 @@ binary-arch: build install dh_makeshlibs -a -V dh_installdeb dh_shlibdeps -a + echo "php:Depends=phpapi-`php-config5 --phpapi`" >> $(CURDIR)/debian/php5-lasso.substvars dh_gencontrol dh_md5sums dh_builddeb From 24fa3f9fa6c8ae3f1a149fb90861c5c455b53ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 8 Feb 2011 11:15:19 +0100 Subject: [PATCH 41/63] [debian] adapt packaging to official section overrides --- control.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control.in b/control.in index e980a7e2..ca21fb1d 100644 --- a/control.in +++ b/control.in @@ -49,7 +49,7 @@ Description: Library for Liberty Alliance and SAML protocols - Python bindings in Python applications. #JAVA#Package: liblasso-java -#JAVA#Section: libs +#JAVA#Section: java #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: web +Section: php Architecture: any Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} Description: Library for Liberty Alliance and SAML protocols - PHP 5 bindings From ed8a8f18cbe1d85760a13de2c51b268324ee5a03 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 27 Sep 2013 12:03:49 +0200 Subject: [PATCH 42/63] debian: import current packging for debian wheezy --- changelog | 44 +++++++++++++++++++++++++++++++++++++++++++ compat | 2 +- control | 24 +++++++++++------------ control.in | 6 +++--- liblasso-perl.install | 6 +++--- liblasso3-dev.install | 1 - rules | 4 ++-- 7 files changed, 65 insertions(+), 22 deletions(-) mode change 100755 => 100644 rules 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 From 25eb3edef9c031719574bdbf39f6dab1873a4781 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 27 Sep 2013 16:39:12 +0200 Subject: [PATCH 43/63] debian: add a source/format file --- source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 source/format diff --git a/source/format b/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) From 1ce0510a234306ecc1e1687e89d11239e5ccbd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Wed, 4 Dec 2013 18:04:53 +0100 Subject: [PATCH 44/63] debian: replace dh_pycentral by dh_python --- control | 14 +------------- rules | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/control b/control index 55958196..ae645adc 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), php5-dev, python-lxml, chrpath +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, php5-dev, python-lxml, chrpath XS-Python-Version: all Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org @@ -48,18 +48,6 @@ 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-perl Section: perl Architecture: any diff --git a/rules b/rules index b7a053f2..7efc3eda 100644 --- a/rules +++ b/rules @@ -154,7 +154,7 @@ binary-arch: build install dh_link dh_strip dh_perl - dh_pycentral -ppython-lasso + dh_python2 -ppython-lasso dh_compress dh_fixperms dh_makeshlibs -a -V From fb0e621c49977bcbf2823486cf73cd520f6403c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Fri, 6 Dec 2013 09:36:40 +0100 Subject: [PATCH 45/63] python-lasso.install: don't install old /usr/lib/python*/site-packages --- python-lasso.install | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 python-lasso.install diff --git a/python-lasso.install b/python-lasso.install deleted file mode 100644 index 5da02991..00000000 --- a/python-lasso.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/python*/site-packages/*.py -debian/tmp/usr/lib/python*/site-packages/*.so From 6af6a0bcc564e8064b3590c14bb0fed0bd90d1c9 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Sun, 8 Dec 2013 17:32:45 +0100 Subject: [PATCH 46/63] update control.in with control --- control.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control.in b/control.in index 6e9556b3..ed35df59 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), php5-dev, python-lxml, chrpath +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, php5-dev, python-lxml, chrpath XS-Python-Version: all Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org From e80648258e737428e322379c0c81b8d793a9269a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Tue, 10 Dec 2013 14:53:57 +0100 Subject: [PATCH 47/63] add python-lasso.install with python files --- python-lasso.install | 2 ++ rules | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 python-lasso.install diff --git a/python-lasso.install b/python-lasso.install new file mode 100644 index 00000000..c60282eb --- /dev/null +++ b/python-lasso.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python*/dist-packages/*.py +debian/tmp/usr/lib/python*/dist-packages/*.so diff --git a/rules b/rules index 7efc3eda..56f3b4db 100644 --- a/rules +++ b/rules @@ -51,8 +51,6 @@ CONFIGURE_ARGS := \ --enable-tests=no \ --disable-gtk-doc \ --enable-perl \ - --disable-csharp \ - --disable-php4 \ --with-php5-config-dir=/etc/php5/conf.d/ From ee45e57f9243aad6b8cea5ee4d9571b13683a9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 29 Dec 2013 10:24:54 +0100 Subject: [PATCH 48/63] import 2.3.6-2.1 leftovers --- changelog | 7 +++++++ control | 1 - control.in | 1 - pycompat | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 pycompat diff --git a/changelog b/changelog index 61aa1f00..c4d31dcd 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +lasso (2.3.6-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Convert to dh_python2 (Closes: #616856). + + -- Luca Falavigna Thu, 30 May 2013 20:36:16 +0200 + lasso (2.3.6-2) unstable; urgency=low * Fix building against glib 2.32 (closes: #665565, #666636) diff --git a/control b/control index ae645adc..192613b9 100644 --- a/control +++ b/control @@ -39,7 +39,6 @@ Provides: liblasso0-python2.3, ${python:Provides} Section: python Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} -XB-Python-Version: ${python:Versions} Description: Library for Liberty Alliance and SAML protocols - Python bindings Lasso is an implementation of Liberty Alliance and related protocols, for network identity federations, single sign-on and other web services protocols. diff --git a/control.in b/control.in index ed35df59..b6cd1481 100644 --- a/control.in +++ b/control.in @@ -39,7 +39,6 @@ Provides: liblasso0-python2.3, ${python:Provides} Section: python Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} -XB-Python-Version: ${python:Versions} Description: Library for Liberty Alliance and SAML protocols - Python bindings Lasso is an implementation of Liberty Alliance and related protocols, for network identity federations, single sign-on and other web services protocols. diff --git a/pycompat b/pycompat deleted file mode 100644 index 0cfbf088..00000000 --- a/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 From dd8d85e2a83193951f8c70a0290669d4e44f0506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 29 Dec 2013 10:25:52 +0100 Subject: [PATCH 49/63] import 2.3.6-2.2 changelog entry --- changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changelog b/changelog index c4d31dcd..8af9dd3e 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,12 @@ +lasso (2.3.6-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Apply commit a5674b48 from upstream to port to the libxml buffer API. + Also adopt changes for the Perl binding. libxml stopped to expose the + internals of xmlOutputBuffer in 2.9. (Closes: #713668) + + -- Sebastian Ramacher Tue, 30 Jul 2013 14:19:34 +0200 + lasso (2.3.6-2.1) unstable; urgency=low * Non-maintainer upload. From fba81e5d234ad2cb2e8d1bc8d3ec245d51f745e8 Mon Sep 17 00:00:00 2001 From: Moritz Muehlenhoff Date: Sun, 29 Dec 2013 10:27:20 +0100 Subject: [PATCH 50/63] enable hardened build flags --- rules | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/rules b/rules index 56f3b4db..031db6f4 100644 --- a/rules +++ b/rules @@ -28,13 +28,11 @@ PYDEF := $(shell pyversions -vd) PYVERS := $(shell pyversions -vr debian/control) OTHERPYVERS := $(filter-out $(PYDEF), $(PYVERS)) -CFLAGS = -Wall -g +CFLAGS = `dpkg-buildflags --get CFLAGS` +CFLAGS += -Wall +LDFLAGS = `dpkg-buildflags --get LDFLAGS` +CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif @@ -64,7 +62,7 @@ endif config.status: configure dh_testdir # Add here commands to configure the package. - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS) + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS) build: build-stamp From 9769c8bef35d376c2c0d355711954cef5984549c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 29 Dec 2013 10:30:02 +0100 Subject: [PATCH 51/63] use php5enmod and php5dismod --- php5-lasso.postinst | 7 +++++++ php5-lasso.prerm | 7 +++++++ rules | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 php5-lasso.postinst create mode 100644 php5-lasso.prerm diff --git a/php5-lasso.postinst b/php5-lasso.postinst new file mode 100644 index 00000000..7fc54e5b --- /dev/null +++ b/php5-lasso.postinst @@ -0,0 +1,7 @@ +#! /bin/sh -e + +if [ "$1" = "configure" ]; then + php5enmod lasso +fi + +#DEBHELPER# diff --git a/php5-lasso.prerm b/php5-lasso.prerm new file mode 100644 index 00000000..57eb1e8e --- /dev/null +++ b/php5-lasso.prerm @@ -0,0 +1,7 @@ +#! /bin/sh -e + +if [ "$1" = "remove" ]; then + phpdismod lasso +fi + +#DEBHELPER# diff --git a/rules b/rules index 031db6f4..a676e6b7 100644 --- a/rules +++ b/rules @@ -49,7 +49,9 @@ CONFIGURE_ARGS := \ --enable-tests=no \ --disable-gtk-doc \ --enable-perl \ - --with-php5-config-dir=/etc/php5/conf.d/ + --disable-csharp \ + --disable-php4 \ + --with-php5-config-dir=/etc/php5/mods-available/ ifeq ($(with_java),yes) From c8a6863920cba83d33ae32049da0d10abd64953b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 29 Dec 2013 10:30:45 +0100 Subject: [PATCH 52/63] import 2.3.6-3 changelog entry --- changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changelog b/changelog index 8af9dd3e..bd38fc39 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +lasso (2.3.6-3) unstable; urgency=medium + + * Remove double-free in lasso_node_build_deflated_query. (thanks Andjelko + Horvat, closes: #732543) + * Enable hardened build flags. (thanks Moritz Muehlenhoff, closes: #667555) + * debian/php5-lasso.{postinst,prerm}: use php5enmod and php5dismod. + (closes: #667766) + * bindings/php5/lasso.ini: change comment marker. (closes: #571736) + + -- Frederic Peters Sun, 29 Dec 2013 10:06:47 +0100 + lasso (2.3.6-2.2) unstable; urgency=low * Non-maintainer upload. From 20cc7fea79be4dc0a23e22dad7eb67b95f08c4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 11 Aug 2014 10:11:27 +0200 Subject: [PATCH 53/63] debian: accomodate perl now installing in the right directory --- liblasso-perl.install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liblasso-perl.install b/liblasso-perl.install index b1f08337..0911b504 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/ From 8b396a04a3e82f17560bfb19b0e073a963422d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 11 Aug 2014 10:32:29 +0200 Subject: [PATCH 54/63] debian: don't move perl files --- liblasso-perl.install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liblasso-perl.install b/liblasso-perl.install index 0911b504..e8063272 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/perl5/Lasso.pm +debian/tmp/usr/lib/perl5/auto/Lasso/Lasso.bs +debian/tmp/usr/lib/perl5/auto/Lasso/Lasso.so From ae55fc9a98ff11360311081492c70ea9975893ea Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 12 Feb 2015 22:37:52 +0100 Subject: [PATCH 55/63] Add dependency on python-six --- control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control b/control index 192613b9..ae0af1d9 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, php5-dev, python-lxml, chrpath +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, php5-dev, python-lxml, chrpath, python-six XS-Python-Version: all Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org From 47fa21b757c5a9956baf67fff4a4620fbd2ae204 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 12 Feb 2015 23:04:01 +0100 Subject: [PATCH 56/63] Remove control.in --- control.in | 84 ------------------------------------------------------ 1 file changed, 84 deletions(-) delete mode 100644 control.in diff --git a/control.in b/control.in deleted file mode 100644 index b6cd1481..00000000 --- a/control.in +++ /dev/null @@ -1,84 +0,0 @@ -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, php5-dev, python-lxml, chrpath -XS-Python-Version: all -Standards-Version: 3.8.0 -Homepage: http://lasso.entrouvert.org - -Package: liblasso3-dev -Section: libdevel -Architecture: any -Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev -Provides: liblasso-dev -Conflicts: liblasso-dev, liblasso0, liblasso1 -Description: Library for Liberty Alliance and SAML protocols - development kit - 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 contains the development files for Lasso. - -Package: liblasso3 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Library for Liberty Alliance and SAML protocols - runtime library - 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 contains liblasso library used by applications to gain Library - Alliance support. - -Package: python-lasso -Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso -Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso -Provides: liblasso0-python2.3, ${python:Provides} -Section: python -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} -Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso - in Python applications. - -#JAVA#Package: liblasso-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 -#JAVA# Lasso is an implementation of Liberty Alliance and related protocols, for -#JAVA# network identity federations, single sign-on and other web services protocols. -#JAVA# The main specifications implemented by the library are ID-FF, ID-WSF and SAML. -#JAVA# . -#JAVA# This package provides the Java interface to liblasso, needed to use lasso in -#JAVA# Java applications. - -Package: liblasso-perl -Section: perl -Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} -Description: Library for Liberty Alliance and SAML protocols - Perl 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 contains Perl bindings for liblasso, needed to use lasso - in Perl applications. - -Package: php5-lasso -Section: web -Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} -Description: Library for Liberty Alliance and SAML protocols - PHP 5 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 contains PHP bindings for liblasso, needed to use lasso - in PHP applications. From 5dd34825c398ac6ebb83aecc08b84ad32b1c7131 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 13 Feb 2015 10:29:38 +0100 Subject: [PATCH 57/63] Revert "Remove control.in" This reverts commit 176e0716f8f8593860e0603697db5dec5675f5b3. --- control.in | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 control.in diff --git a/control.in b/control.in new file mode 100644 index 00000000..b6cd1481 --- /dev/null +++ b/control.in @@ -0,0 +1,84 @@ +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, php5-dev, python-lxml, chrpath +XS-Python-Version: all +Standards-Version: 3.8.0 +Homepage: http://lasso.entrouvert.org + +Package: liblasso3-dev +Section: libdevel +Architecture: any +Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev +Provides: liblasso-dev +Conflicts: liblasso-dev, liblasso0, liblasso1 +Description: Library for Liberty Alliance and SAML protocols - development kit + 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 contains the development files for Lasso. + +Package: liblasso3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Library for Liberty Alliance and SAML protocols - runtime library + 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 contains liblasso library used by applications to gain Library + Alliance support. + +Package: python-lasso +Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Provides: liblasso0-python2.3, ${python:Provides} +Section: python +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso + in Python applications. + +#JAVA#Package: liblasso-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 +#JAVA# Lasso is an implementation of Liberty Alliance and related protocols, for +#JAVA# network identity federations, single sign-on and other web services protocols. +#JAVA# The main specifications implemented by the library are ID-FF, ID-WSF and SAML. +#JAVA# . +#JAVA# This package provides the Java interface to liblasso, needed to use lasso in +#JAVA# Java applications. + +Package: liblasso-perl +Section: perl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} +Description: Library for Liberty Alliance and SAML protocols - Perl 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 contains Perl bindings for liblasso, needed to use lasso + in Perl applications. + +Package: php5-lasso +Section: web +Architecture: any +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - PHP 5 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 contains PHP bindings for liblasso, needed to use lasso + in PHP applications. From f817e39e3ec05e1ef368e3b413c2210498ec1845 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 13 Feb 2015 14:11:09 +0100 Subject: [PATCH 58/63] Remove control and add python-six to control.in --- control | 72 ------------------------------------------------------ control.in | 2 +- 2 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 control diff --git a/control b/control deleted file mode 100644 index ae0af1d9..00000000 --- a/control +++ /dev/null @@ -1,72 +0,0 @@ -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, php5-dev, python-lxml, chrpath, python-six -XS-Python-Version: all -Standards-Version: 3.8.0 -Homepage: http://lasso.entrouvert.org - -Package: liblasso3-dev -Section: libdevel -Architecture: any -Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev -Provides: liblasso-dev -Conflicts: liblasso-dev, liblasso0, liblasso1 -Description: Library for Liberty Alliance and SAML protocols - development kit - 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 contains the development files for Lasso. - -Package: liblasso3 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Library for Liberty Alliance and SAML protocols - runtime library - 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 contains liblasso library used by applications to gain Library - Alliance support. - -Package: python-lasso -Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso -Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso -Provides: liblasso0-python2.3, ${python:Provides} -Section: python -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} -Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso - in Python applications. - -Package: liblasso-perl -Section: perl -Architecture: any -Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} -Description: Library for Liberty Alliance and SAML protocols - Perl 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 contains Perl bindings for liblasso, needed to use lasso - in Perl applications. - -Package: php5-lasso -Section: web -Architecture: any -Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} -Description: Library for Liberty Alliance and SAML protocols - PHP 5 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 contains PHP bindings for liblasso, needed to use lasso - in PHP applications. diff --git a/control.in b/control.in index b6cd1481..19a93c37 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, php5-dev, python-lxml, chrpath +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, php5-dev, python-lxml, chrpath, python-six XS-Python-Version: all Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org From 2c5034d24002ce9c039ec0d6656cfab2b3baf03d Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 13 Feb 2015 14:37:57 +0100 Subject: [PATCH 59/63] Re-add control for eobuilder --- control | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 control diff --git a/control b/control new file mode 100644 index 00000000..ae0af1d9 --- /dev/null +++ b/control @@ -0,0 +1,72 @@ +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, php5-dev, python-lxml, chrpath, python-six +XS-Python-Version: all +Standards-Version: 3.8.0 +Homepage: http://lasso.entrouvert.org + +Package: liblasso3-dev +Section: libdevel +Architecture: any +Depends: liblasso3 (= ${binary:Version}), libxml2-dev, libxmlsec1-dev, libglib2.0-dev +Provides: liblasso-dev +Conflicts: liblasso-dev, liblasso0, liblasso1 +Description: Library for Liberty Alliance and SAML protocols - development kit + 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 contains the development files for Lasso. + +Package: liblasso3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Library for Liberty Alliance and SAML protocols - runtime library + 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 contains liblasso library used by applications to gain Library + Alliance support. + +Package: python-lasso +Conflicts: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Replaces: liblasso0-python2.3, python2.3-lasso, python2.4-lasso +Provides: liblasso0-python2.3, ${python:Provides} +Section: python +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso + in Python applications. + +Package: liblasso-perl +Section: perl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:depends}, ${perl:Depends} +Description: Library for Liberty Alliance and SAML protocols - Perl 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 contains Perl bindings for liblasso, needed to use lasso + in Perl applications. + +Package: php5-lasso +Section: web +Architecture: any +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - PHP 5 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 contains PHP bindings for liblasso, needed to use lasso + in PHP applications. From 945fb5b2074fcc48de66a3713d0bd4d66c9a6282 Mon Sep 17 00:00:00 2001 From: EO builder bot Date: Wed, 25 Feb 2015 16:35:19 +0100 Subject: [PATCH 60/63] debian: add python3 support --- control.in | 17 +++++++++++++++-- python3-lasso.install | 2 ++ rules | 23 +++++++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 python3-lasso.install diff --git a/control.in b/control.in index 19a93c37..e2caa090 100644 --- a/control.in +++ b/control.in @@ -2,8 +2,9 @@ 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, php5-dev, python-lxml, chrpath, python-six -XS-Python-Version: all +Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.6), python3-all-dev (>= 3.2), libexpat1-dev, fastjar, php5-dev, python-lxml, chrpath, python-six +X-Python-Version: >= 2.6 +X-Python3-Version: >= 3.2 Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org @@ -47,6 +48,18 @@ 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: python3-lasso +Section: python +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso + in Python applications. + #JAVA#Package: liblasso-java #JAVA#Section: libs #JAVA#Architecture: amd64 armel i386 ia64 mips mipsel powerpc ppc64 s390 sparc kfreebsd-i386 kfreebsd-amd64 diff --git a/python3-lasso.install b/python3-lasso.install new file mode 100644 index 00000000..89f00bf0 --- /dev/null +++ b/python3-lasso.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python3*/dist-packages/*.py +debian/tmp/usr/lib/python3*/dist-packages/*.so diff --git a/rules b/rules index a676e6b7..2754cc03 100644 --- a/rules +++ b/rules @@ -6,6 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/python/python.mk # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -26,6 +27,7 @@ endif PYDEF := $(shell pyversions -vd) PYVERS := $(shell pyversions -vr debian/control) +PY3VERS := $(shell py3versions -vr '>= 3.0') OTHERPYVERS := $(filter-out $(PYDEF), $(PYVERS)) CFLAGS = `dpkg-buildflags --get CFLAGS` @@ -49,11 +51,8 @@ CONFIGURE_ARGS := \ --enable-tests=no \ --disable-gtk-doc \ --enable-perl \ - --disable-csharp \ - --disable-php4 \ --with-php5-config-dir=/etc/php5/mods-available/ - ifeq ($(with_java),yes) CONFIGURE_ARGS += --enable-java else @@ -82,6 +81,14 @@ build-stamp: config.status $(MAKE) -C bindings/python$$v; \ done + for v in $(PY3VERS); do \ + rm -rf bindings/python$$v; \ + cp -a bindings/python bindings/python$$v; \ + sed "s/$(PYDEF)/$$v/g" bindings/python/Makefile > bindings/python$$v/Makefile; \ + $(MAKE) -C bindings/python$$v clean; \ + $(MAKE) -C bindings/python$$v; \ + done + touch build-stamp clean: @@ -108,6 +115,10 @@ endif rm -rf bindings/python$$v; \ done + for v in $(PY3VERS); do \ + rm -rf bindings/python$$v; \ + done + rm -f config.log dh_clean @@ -125,6 +136,9 @@ install: build for v in $(OTHERPYVERS); do \ $(MAKE) -C bindings/python$$v install DESTDIR=$(CURDIR)/debian/tmp; \ done + for v in $(PY3VERS); do \ + $(MAKE) -C bindings/python$$v install DESTDIR=$(CURDIR)/debian/tmp; \ + done mkdir $(CURDIR)/debian/tmp/usr/lib/jni/ if [ -e $(CURDIR)/debian/tmp/usr/lib/java ]; then \ @@ -153,6 +167,7 @@ binary-arch: build install dh_strip dh_perl dh_python2 -ppython-lasso + dh_python3 -ppython3-lasso dh_compress dh_fixperms dh_makeshlibs -a -V @@ -164,4 +179,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install From 28faf9b25e5314a76aee268f84ed8390b202f6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Wed, 25 Feb 2015 17:57:47 +0100 Subject: [PATCH 61/63] debian/control: like control.in, control must be updated --- control | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/control b/control index ae0af1d9..f6bcb506 100644 --- a/control +++ b/control @@ -2,8 +2,9 @@ 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, php5-dev, python-lxml, chrpath, python-six -XS-Python-Version: all +Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.6), python3-all-dev (>= 3.2), libexpat1-dev, fastjar, php5-dev, python-lxml, chrpath, python-six +X-Python-Version: >= 2.6 +X-Python3-Version: >= 3.2 Standards-Version: 3.8.0 Homepage: http://lasso.entrouvert.org @@ -47,6 +48,18 @@ 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: python3-lasso +Section: python +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:depends} +Description: Library for Liberty Alliance and SAML protocols - Python 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 contains Python bindings for liblasso, needed to use lasso + in Python applications. + Package: liblasso-perl Section: perl Architecture: any From c54dbab12b8090361084e3eeac502812bd7d5319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Wed, 25 Feb 2015 18:00:46 +0100 Subject: [PATCH 62/63] control: update build-dependencies for python3 --- control | 2 +- control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control b/control index f6bcb506..60c4d230 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.6), python3-all-dev (>= 3.2), libexpat1-dev, fastjar, php5-dev, python-lxml, chrpath, python-six +Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.6), python3-all-dev (>= 3.2), libexpat1-dev, fastjar, php5-dev, python-lxml, python3-lxml, python-six, python3-six, chrpath X-Python-Version: >= 2.6 X-Python3-Version: >= 3.2 Standards-Version: 3.8.0 diff --git a/control.in b/control.in index e2caa090..0e25ed16 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.6), python3-all-dev (>= 3.2), libexpat1-dev, fastjar, php5-dev, python-lxml, chrpath, python-six +Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev, libxslt1-dev, libxmlsec1-dev, libxmlsec1-openssl, libglib2.0-dev, python-all-dev (>= 2.6), python3-all-dev (>= 3.2), libexpat1-dev, fastjar, php5-dev, python-lxml, python3-lxml, python-six, python3-six, chrpath X-Python-Version: >= 2.6 X-Python3-Version: >= 3.2 Standards-Version: 3.8.0 From 0001ab9af1e3a7e19000a65b75ebc3c42f76a739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= Date: Wed, 25 Feb 2015 19:58:57 +0100 Subject: [PATCH 63/63] python-lasso.install: just install python 2 files --- python-lasso.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-lasso.install b/python-lasso.install index c60282eb..6e8f7ef0 100644 --- a/python-lasso.install +++ b/python-lasso.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/python*/dist-packages/*.py -debian/tmp/usr/lib/python*/dist-packages/*.so +debian/tmp/usr/lib/python2*/dist-packages/*.py +debian/tmp/usr/lib/python2*/dist-packages/*.so