[debian] sync packaging with official package

5 files changed, 113 insertions, 87 deletions

diff --git a/debian/changelog b/debian/changelog
index 5f189065..a75f9d01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+lasso (2.3.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  Fri, 09 Jan 2009 10:30:58 +0100
+
+lasso (2.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <fpeters@debian.org>  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 <fpeters@debian.org>  Sun, 13 Jul 2008 12:06:12 +0200
+
 lasso (2.1.98-4.1) unstable; urgency=high
 
   * NMU.
diff --git a/debian/control b/debian/control
index d8ac53ea..819d41ef 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: lasso
 Priority: optional
 Section: libs
 Maintainer: Frederic Peters <fpeters@debian.org>
-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/debian/control.in b/debian/control.in
index 3eb3f68b..e980a7e2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,9 +2,9 @@ Source: lasso
 Priority: optional
 Section: libs
 Maintainer: Frederic Peters <fpeters@debian.org>
-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/debian/liblasso-perl.install b/debian/liblasso-perl.install
index 68e7b034..a5714aff 100644
--- a/debian/liblasso-perl.install
+++ b/debian/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/debian/rules b/debian/rules
index ecaa2891..ede7a6c5 100755
--- a/debian/rules
+++ b/debian/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