updated to current packaging then updated for new bindings

18 files changed, 77 insertions, 40 deletions

diff --git a/debian/changelog b/debian/changelog
index 68035d43..0fdec2e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+lasso (2.1.98-0) unstable; urgency=low
+
+  * snapshot
+
+ -- Frederic Peters <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  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 <fpeters@debian.org>  Wed, 22 Aug 2007 18:08:12 +0200
+
 lasso (2.0.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index a2fca93f..ff5a823b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ 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, 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: 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 - PHP5 bindings
+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 provides the Java interface to liblasso, needed to use lasso in
- Java applications.
+ This package contains PHP bindings for liblasso, needed to use lasso
+ in PHP applications.
  .
  Homepage: http://lasso.entrouvert.org
 
diff --git a/debian/copyright b/debian/copyright
index 388a20d5..93764219 100644
--- a/debian/copyright
+++ b/debian/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/debian/liblasso-cil.files b/debian/liblasso-cil.files
deleted file mode 100644
index 2e6a094a..00000000
--- a/debian/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/debian/liblasso-java.files b/debian/liblasso-java.files
deleted file mode 100644
index 35b30352..00000000
--- a/debian/liblasso-java.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/jni/*.so
-usr/share/java/*.jar
diff --git a/debian/liblasso-java.install b/debian/liblasso-java.install
new file mode 100644
index 00000000..758673ed
--- /dev/null
+++ b/debian/liblasso-java.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/jni/*.so
+debian/tmp/usr/share/java/*.jar
diff --git a/debian/liblasso-perl.install b/debian/liblasso-perl.install
new file mode 100644
index 00000000..68e7b034
--- /dev/null
+++ b/debian/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/debian/liblasso3-dev.files b/debian/liblasso3-dev.files
deleted file mode 100644
index cfa37bf1..00000000
--- a/debian/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/debian/liblasso3-dev.install b/debian/liblasso3-dev.install
new file mode 100644
index 00000000..ad209437
--- /dev/null
+++ b/debian/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/debian/liblasso3.files b/debian/liblasso3.files
deleted file mode 100644
index d0dbfd18..00000000
--- a/debian/liblasso3.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff --git a/debian/liblasso3.install b/debian/liblasso3.install
new file mode 100644
index 00000000..c45ebcf2
--- /dev/null
+++ b/debian/liblasso3.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff --git a/debian/php4-lasso.examples b/debian/php4-lasso.examples
deleted file mode 100644
index e69de29b..00000000
--- a/debian/php4-lasso.examples
+++ /dev/null
diff --git a/debian/php4-lasso.files b/debian/php4-lasso.files
deleted file mode 100644
index be92d192..00000000
--- a/debian/php4-lasso.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/php4/*/*.so
-
diff --git a/debian/php5-lasso.files b/debian/php5-lasso.files
deleted file mode 100644
index 9dfeab0a..00000000
--- a/debian/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/debian/php5-lasso.install b/debian/php5-lasso.install
new file mode 100644
index 00000000..61607e59
--- /dev/null
+++ b/debian/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/debian/python-lasso.files b/debian/python-lasso.files
deleted file mode 100644
index cf15adc4..00000000
--- a/debian/python-lasso.files
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/python*/site-packages/*.py
-usr/lib/python*/site-packages/*.so
-
diff --git a/debian/python-lasso.install b/debian/python-lasso.install
new file mode 100644
index 00000000..5da02991
--- /dev/null
+++ b/debian/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/debian/rules b/debian/rules
index dd59f04d..51f6c022 100755
--- a/debian/rules
+++ b/debian/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