[SCM] Debian branch, master, updated. debian/1.2.2-3-8-g56fdb47
Xavier Guimard
x.guimard at free.fr
Fri Feb 8 20:22:12 UTC 2013
The following commit has been merged in the master branch:
commit 35216b70932a896b6242ecfc0e4324f32aeba345
Merge: 3d285d80ec74d63a439ab01576fcbf40c592690a 25ac2fc4062cd812b08781354826c94ab9a0eb5d
Author: Xavier Guimard <x.guimard at free.fr>
Date: Fri Feb 8 21:08:36 2013 +0100
Merge tag 'upstream/1.2.3'
Upstream version 1.2.3
Conflicts:
debian/NEWS
debian/README.Debian
debian/changelog
debian/control
debian/copyright
debian/liblemonldap-ng-handler-perl.install
debian/liblemonldap-ng-handler-perl.links
debian/liblemonldap-ng-handler-perl.postinst
debian/liblemonldap-ng-portal-perl.dirs
debian/rules
diff --combined debian/README.Debian
index e0befd3,ea004ab..d6c18fd
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -22,6 -22,7 +22,6 @@@ Enable the components you've installed
# Handler
a2ensite handler-apache2.conf
- a2ensite test-apache2.conf
and enable mod_perl if not already loaded:
@@@ -42,10 -43,12 +42,12 @@@ Be sure that your browser can join (ada
4 - Connect to the manager
--------------------------
- Go to http://manager.example.com/, you'll be redirected to the portal.
+ Go to http://manager.example.com/, you'll be redirected to the portal. Then
+ enjoy!
+
+ 5 - Default accounts
+ --------------------
- * Default accounts
- ----------------
By default, LemonLDAP::NG use "Demo" authentication backend, so you can use the
following accounts:
@@@ -54,7 -57,7 +56,7 @@@
msmith msmith user
dwho dwho administrator
- 5 - Base configuration file
+ 6 - Base configuration file
---------------------------
The configuration is managed by the manager with the exception of some basic
diff --combined debian/control
index c175cc7,036059d..563e519
--- a/debian/control
+++ b/debian/control
@@@ -6,38 -6,27 +6,39 @@@ Priority: optiona
Build-Depends: debhelper (>= 8),
po-debconf
Build-Depends-Indep: libapache-session-perl,
+ libauthcas-perl,
+ libauthen-captcha-perl,
libcache-cache-perl,
- libnet-cidr-lite-perl,
+ libcache-memcached-perl,
libclone-perl,
libcrypt-openssl-rsa-perl,
libcrypt-openssl-x509-perl,
libcrypt-rijndael-perl,
libconfig-inifiles-perl,
libdbi-perl,
+ libdigest-hmac-perl,
+ libglib-perl,
libhtml-template-perl,
libio-string-perl,
+ liblasso-perl (>= 2.3.0),
libmime-lite-perl,
++ libnet-cidr-lite-perl,
libnet-ldap-perl,
+ libnet-openid-consumer-perl,
+ libnet-openid-server-perl,
libregexp-assemble-perl,
libsoap-lite-perl,
libstring-random-perl,
+ libtest-mockobject-perl,
+ libtest-pod-perl,
liburi-perl,
libwww-perl,
libxml-libxslt-perl,
libxml-simple-perl,
perl
Standards-Version: 3.9.4
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/lemonldap-ng.git
+Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/lemonldap-ng.git
Homepage: http://lemonldap-ng.org/
Package: lemonldap-ng
@@@ -81,7 -70,6 +82,7 @@@ Architecture: al
Depends: ${misc:Depends},
${perl:Depends},
libapache2-mod-perl2,
+ libapache-session-perl,
liblemonldap-ng-conf-perl (= ${binary:Version}),
liburi-perl,
libwww-perl
@@@ -109,11 -97,15 +110,13 @@@ Architecture: al
Depends: ${misc:Depends},
${perl:Depends},
debconf,
- libapache-session-perl,
libcache-cache-perl,
libconfig-inifiles-perl,
libcrypt-openssl-bignum-perl,
libcrypt-rijndael-perl,
- libxml-simple-perl
+ libxml-simple-perl,
+ libxml-libxml-perl,
- libxml-libxslt-perl,
+ libnet-cidr-lite-perl
Recommends: libdbi-perl,
libsoap-lite-perl
Description: Lemonldap::NG common files
@@@ -138,15 -130,13 +141,15 @@@ Depends: ${misc:Depends}
libcrypt-openssl-x509-perl,
libhtml-template-perl,
libjson-perl,
+ libjs-jquery,
+ libjs-jquery-cookie,
liblemonldap-ng-conf-perl (= ${binary:Version}),
liblemonldap-ng-handler-perl (= ${binary:Version}),
libxml-libxml-perl,
libxml-libxslt-perl,
libxml-simple-perl
Recommends: lemonldap-ng-doc (= ${binary:Version}),
- libapache-session-browseable-perl,
+ libapache-session-browseable-perl | libapache-session-perl,
libsoap-lite-perl
Pre-Depends: debconf
Description: Lemonldap::NG manager part
@@@ -166,26 -156,20 +169,25 @@@ Package: liblemonldap-ng-portal-per
Architecture: all
Depends: ${misc:Depends},
${perl:Depends},
+ libapache-session-perl,
libclone-perl,
libcrypt-openssl-x509-perl,
libhtml-template-perl,
+ libjs-jquery,
+ libjs-jquery-cookie,
liblemonldap-ng-conf-perl (= ${binary:Version}),
libmime-lite-perl,
libregexp-assemble-perl,
libsoap-lite-perl,
libstring-random-perl,
- libxml-libxml-perl,
+ libxml-libxslt-perl
Recommends: libapache-session-browseable-perl,
libconvert-pem-perl,
libemail-date-format-perl,
libnet-ldap-perl,
libnet-openid-consumer-perl | libnet-openid-server-perl | liblasso-perl (>= 2.3.0) | libnet-twitter-perl | libauthcas-perl
Suggests: libauthcas-perl,
+ libauthen-captcha-perl,
libauthen-sasl-perl,
liblasso-perl (>= 2.3.0),
liblemonldap-ng-handler-perl (= ${binary:Version}),
--
Debian
More information about the Pkg-perl-cvs-commits
mailing list