LEMONLDAP::NG : Debian installation update since Makefile changes
This commit is contained in:
Xavier Guimard
parent
aedf90d531
commit
701c342268
|
|
@ -49,15 +49,15 @@ manager: manager_conf
|
|||
configure: handler_conf portal_conf manager_conf
|
||||
|
||||
handler_conf:
|
||||
@cd ${SRCHANDLERDIR}; perl Makefile.PL
|
||||
@cd ${SRCHANDLERDIR}; perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
|
||||
@touch handler_conf
|
||||
|
||||
portal_conf:
|
||||
@cd ${SRCPORTALDIR}; perl Makefile.PL
|
||||
@cd ${SRCPORTALDIR}; perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
|
||||
@touch portal_conf
|
||||
|
||||
manager_conf:
|
||||
@cd ${SRCMANAGERDIR}; perl Makefile.PL
|
||||
@cd ${SRCMANAGERDIR}; perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS)
|
||||
@touch manager_conf
|
||||
|
||||
test: manager handler portal manager_test handler_test portal_test
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
lemonldap-ng (0.9.3) unstable; urgency=low
|
||||
|
||||
[ Clement Oudot ]
|
||||
* New menu and skin (pastel)
|
||||
* Authentication and UserDB separation
|
||||
|
||||
-- Clement Oudot <coudot@linagora.com> Mon, 13 Oct 2008 18:00:00 +0200
|
||||
[ Xavier Guimard ]
|
||||
* Authentication and UserDB separation
|
||||
* New session explorer system
|
||||
|
||||
-- Xavier Guimard <x.guimard@free.fr> Tue, 11 Nov 2008 16:23:19 +0100
|
||||
|
||||
lemonldap-ng (0.9.2.2) unstable; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
lemonldap-ng (0.9.2.2-0) unstable; urgency=low
|
||||
lemonldap-ng (0.9.3-0) unstable; urgency=low
|
||||
|
||||
* Local build
|
||||
|
||||
-- Xavier Guimard <x.guimard@free.fr> Mon, 25 Aug 2008 22:10:19 +0200
|
||||
-- Xavier Guimard <x.guimard@free.fr> Tue, 11 Nov 2008 16:24:00 +0100
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Description: Lemonldap::NG apache administration interface part
|
|||
|
||||
Package: liblemonldap-ng-manager-perl
|
||||
Architecture: all
|
||||
Depends: libxml-simple-perl, liblemonldap-ng-conf-perl (>=0.8.2.3)
|
||||
Depends: libxml-simple-perl, liblemonldap-ng-conf-perl (>=0.8.2.3), libjs-jquery
|
||||
Recommends: libcache-cache-perl, libapache-session-perl, libsoap-lite-perl
|
||||
Description: Lemonldap::NG apache manager part
|
||||
Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
|
||||
|
|
@ -59,7 +59,7 @@ Description: Lemonldap::NG apache manager part
|
|||
|
||||
Package: liblemonldap-ng-portal-perl
|
||||
Architecture: all
|
||||
Depends: libapache-session-perl, libnet-ldap-perl, liblemonldap-ng-conf-perl (>=0.8.2.3), libhtml-template-perl
|
||||
Depends: libapache-session-perl, libnet-ldap-perl, liblemonldap-ng-conf-perl (>=0.8.2.3), libhtml-template-perl, libjs-jquery
|
||||
Suggests: liblasso-perl, libcgi-session-perl, slapd
|
||||
Description: Lemonldap::NG apache authentication portal part
|
||||
Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
|
||||
|
|
|
|||
|
|
@ -1,3 +1,2 @@
|
|||
debian/tmp/var/lib/lemonldap-ng/test.pl
|
||||
debian/tmp/var/lib/lemonldap-ng/apache-protected-area.conf
|
||||
debian/tmp/var/lib/lemonldap-ng/apache2-protected-area.conf
|
||||
debian/tmp/var/lib/lemonldap-ng/test/index.pl
|
||||
debian/tmp/etc/lemonldap-ng/handler-apache*
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
debian/tmp/var/lib/lemonldap-ng/apache-session-mysql.sql
|
||||
debian/tmp/var/lib/lemonldap-ng/lmConfig.mysql
|
||||
debian/tmp/var/lib/lemonldap-ng/conf
|
||||
debian/tmp/etc/lemonldap-ng/apache-session-mysql.sql
|
||||
debian/tmp/etc/lemonldap-ng/lmConfig.mysql
|
||||
debian/tmp/var/lib/lemonldap-ng/conf/*
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
debian/tmp/usr/share/perl5/Lemonldap/NG/Handler*
|
||||
debian/tmp/usr/share/man/man3/Lemonldap::NG::Handler*
|
||||
debian/tmp/etc/lemonldap-ng/MyHandler.pm
|
||||
|
|
|
|||
|
|
@ -5,13 +5,10 @@ set -e
|
|||
|
||||
. /usr/share/debconf/confmodule
|
||||
|
||||
EXAMPLEHANDLERFILE=/usr/share/doc/liblemonldap-ng-handler-perl/examples/MyHandler-Debian.pm
|
||||
HANDLERFILE=/var/lib/lemonldap-ng/handler/MyHandler.pm
|
||||
SESSIONSDIR=/var/lib/lemonldap-ng/sessions
|
||||
|
||||
if [ "$1" == "configure" ]
|
||||
then
|
||||
[ -e $HANDLERFILE ] || cp $EXAMPLEHANDLERFILE $HANDLERFILE
|
||||
chmod 770 $SESSIONSDIR
|
||||
chmod 770 $SESSIONSDIR/lock
|
||||
chown -R www-data:www-data $SESSIONSDIR
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
debian/tmp/var/lib/lemonldap-ng/manager/*
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/index*
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/mrtg
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/sessions.pl
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/soapserver.pl
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Help.pm
|
|||
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Base.pm
|
||||
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/_HTML.pm
|
||||
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/_Response.pm
|
||||
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Sessions.pm
|
||||
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/SOAPServer.pm
|
||||
debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Restricted.pm
|
||||
debian/tmp/usr/share/perl5/auto/Lemonldap/NG/Manager
|
||||
|
|
@ -15,6 +16,7 @@ debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Restricted.3pm
|
|||
debian/tmp/var/lib/lemonldap-ng/manager/apply.conf /etc/lemonldap-ng
|
||||
debian/manager-apache*.conf /etc/lemonldap-ng
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/imgs
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/images
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/theme
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/lemonldap-ng-manager.js
|
||||
debian/tmp/var/lib/lemonldap-ng/manager/scripts/lmConfigEditor /usr/share/lemonldap-ng/bin
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
debian/tmp/var/lib/lemonldap-ng/portal/*
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/
|
||||
debian/tmp/var/lib/lemonldap-ng/portal/*.pl
|
||||
|
|
|
|||
|
|
@ -4,8 +4,4 @@ debian/tmp/usr/share/man/man3/Lemonldap::NG::Portal*
|
|||
debian/portal-apache*.conf /etc/lemonldap-ng
|
||||
debian/tmp/var/lib/lemonldap-ng/portal/skins
|
||||
debian/tmp/var/lib/lemonldap-ng/portal/scripts/purgeCentralCache /usr/share/lemonldap-ng/bin
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/error403.pl
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/idps.xml
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/liberty
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/ressources
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/tpl
|
||||
debian/tmp/var/lib/lemonldap-ng/liberty-alliance-sp-portal/
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ export PERL_MM_USE_DEFAULT=1
|
|||
|
||||
LM_ROOT=/var/lib/lemonldap-ng/
|
||||
DEB_TMP_LM_ROOT=debian/tmp$(LM_ROOT)
|
||||
LM_CONF_ROOT=/etc/lemonldap-ng/
|
||||
DEB_TMP_LM_CONF_ROOT=debian/tmp$(LM_CONF_ROOT)
|
||||
|
||||
configure: configure-stamp
|
||||
configure-stamp:
|
||||
|
|
@ -50,26 +52,25 @@ install: build
|
|||
dh_installdirs
|
||||
|
||||
# Add here commands to install the package into debian/lemonldap-ng.
|
||||
$(MAKE) test
|
||||
#$(MAKE) test
|
||||
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
|
||||
$(MAKE) example \
|
||||
EXAMPLEDIRBUILD=$(DEB_TMP_LM_ROOT) \
|
||||
EXAMPLEDIR=$(LM_ROOT) \
|
||||
EXAMPLECONFDIR=$(LM_ROOT)conf/ \
|
||||
EXAMPLELASPDIRBUILD=$(DEB_TMP_LM_ROOT)liberty-alliance-sp-portal/ \
|
||||
EXAMPLELASPDIR=$(LM_ROOT)liberty-alliance-sp-portal/
|
||||
EXAMPLEROOT=debian/tmp/ \
|
||||
DESTDOCSDIR=debian/tmp/docs/ \
|
||||
REALDESTFILECONFDIR=$(LM_ROOT)conf/ \
|
||||
DESTFILECONFDIR=$(LM_ROOT)conf/
|
||||
|
||||
# Debian example files
|
||||
mv $(DEB_TMP_LM_CONF_ROOT)conf $(DEB_TMP_LM_ROOT)
|
||||
cp $(DEB_TMP_LM_ROOT)handler/MyHandler.pm $(DEB_TMP_LM_CONF_ROOT)MyHandler.pm
|
||||
cp $(DEB_TMP_LM_ROOT)handler/MyHandler.pm $(DEB_TMP_LM_ROOT)handler/MyHandler-Debian.pm
|
||||
cp $(DEB_TMP_LM_ROOT)portal/index.pl $(DEB_TMP_LM_ROOT)portal/index-Debian.pl
|
||||
cp $(DEB_TMP_LM_ROOT)portal/index_skin.pl $(DEB_TMP_LM_ROOT)portal/index_skin-Debian.pl
|
||||
cp $(DEB_TMP_LM_ROOT)liberty-alliance-sp-portal/index.pl $(DEB_TMP_LM_ROOT)liberty-alliance-sp-portal/index-Debian.pl
|
||||
cp $(DEB_TMP_LM_ROOT)manager/index.pl $(DEB_TMP_LM_ROOT)manager/index-Debian.pl
|
||||
mv $(DEB_TMP_LM_ROOT)index.pl $(DEB_TMP_LM_ROOT)test.pl
|
||||
mv $(DEB_TMP_LM_ROOT)handler/lmH-apache.conf $(DEB_TMP_LM_ROOT)apache-protected-area.conf
|
||||
mv $(DEB_TMP_LM_ROOT)handler/lmH-apache2.conf $(DEB_TMP_LM_ROOT)apache2-protected-area.conf
|
||||
perl -i -pe 's#__DIR__/?#'/var/lib/lemonldap-ng'#g;s#__CONFDIR__/?#'$(LM_ROOT)conf'#g;' \
|
||||
$(DEB_TMP_LM_ROOT)apache*-protected-area.conf
|
||||
#perl -i -pe 's#__DIR__/?#'/var/lib/lemonldap-ng'#g;s#__CONFDIR__/?#'$(LM_ROOT)conf'#g;' \
|
||||
# $(DEB_TMP_LM_ROOT)apache*-protected-area.conf
|
||||
cp debian/handler-apache* $(DEB_TMP_LM_CONF_ROOT)
|
||||
|
||||
# System to use /etc/lemonldap-ng/storage.conf instead of setting
|
||||
# manually the configStorage parameter
|
||||
|
|
@ -78,13 +79,17 @@ install: build
|
|||
$(DEB_TMP_LM_ROOT)portal/scripts/purgeCentralCache
|
||||
|
||||
perl -000 -i -pe 's/(configStorage\s*=>\s*){[^}]+}/$$1\$$Lemonldap::NG::Conf::configStorage/; s#^use#\nrequire "/usr/share/lemonldap-ng/configStorage.pm";\nuse#m;' \
|
||||
$(DEB_TMP_LM_ROOT)handler/MyHandler-Debian.pm \
|
||||
$(DEB_TMP_LM_ROOT)manager/index-Debian.pl \
|
||||
$(DEB_TMP_LM_ROOT)portal/index-Debian.pl \
|
||||
$(DEB_TMP_LM_ROOT)portal/index_skin-Debian.pl \
|
||||
$(DEB_TMP_LM_CONF_ROOT)MyHandler.pm \
|
||||
$(DEB_TMP_LM_ROOT)manager/*.pl \
|
||||
$(DEB_TMP_LM_ROOT)portal/*.pl \
|
||||
$(DEB_TMP_LM_ROOT)liberty-alliance-sp-portal/index-Debian.pl
|
||||
perl -i -pe 's#(applyConfFile\s+=>\s+.*?)/\S*(apply\.conf)#$$1/etc/lemonldap-ng/$$2#' \
|
||||
$(DEB_TMP_LM_ROOT)manager/index-Debian.pl \
|
||||
$(DEB_TMP_LM_ROOT)manager/*.pl \
|
||||
$(DEB_TMP_LM_ROOT)handler/MyHandler-Debian.pm
|
||||
rm -f $(DEB_TMP_LM_ROOT)portal/skins/pastel/jquery.js $(DEB_TMP_LM_ROOT)manager/jquery.js
|
||||
perl -i -pe 's#(["'"'"'])[\w-\./]*jquery.js#$$1/javascript/jquery/jquery.js#' \
|
||||
$(DEB_TMP_LM_ROOT)manager/sessions.pl \
|
||||
$(DEB_TMP_LM_ROOT)portal/skins/pastel/header.tpl
|
||||
# Build architecture-independent files here.
|
||||
binary-indep: build install
|
||||
dh_testdir
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue