From dd242a3c5a0ff9480a4ff640bce37378141d0a79 Mon Sep 17 00:00:00 2001 From: Daniel Dehennin Date: Wed, 14 Oct 2020 14:05:51 +0200 Subject: [PATCH] Package for EOLE builders Build 3 packages: - eole-lemonldap-ng: the base dictionary, templates and scripts - eole-lemonldap-ng-scribe: for running LemLDAP::NG on Scribe - eole-lemonldap-ng-pkg: for package dependencies Ref: #30852 --- debian/compat | 1 - debian/control | 59 ++++++++++++++++--------- debian/copyright | 27 +++++------ debian/eole-lemonldap-ng-scribe.install | 2 + debian/eole-lemonldap-ng.install | 6 +++ debian/eole-lemonldap.install | 1 - debian/rules | 3 +- 7 files changed, 59 insertions(+), 40 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/eole-lemonldap-ng-scribe.install create mode 100644 debian/eole-lemonldap-ng.install delete mode 100644 debian/eole-lemonldap.install diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 600bfd1..dfb6a6d 100644 --- a/debian/control +++ b/debian/control @@ -1,30 +1,49 @@ -Source: eole-lemonldap +Source: eole-lemonldap-ng Section: web Priority: optional -Maintainer: Cadoles -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.3 -Homepage: https://forge.cadoles.com/Cadoles/eole-lemonldap -Vcs-Git: https://forge.cadoles.com/Cadoles/eole-lemonldap.git -Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-lemonldap +Maintainer: Équipe EOLE +Build-Depends: debhelper-compat (= 12) +Standards-Version: 4.5.0 +Homepage: https://dev-eole.ac-dijon.fr/projects/sso +Vcs-Git: https://dev-eole.ac-dijon.fr/git/eole-lemonldap-ng.git +Vcs-Browser: https://dev-eole.ac-dijon.fr/projects/sso/repository -Package: eole-lemonldap +Package: eole-lemonldap-ng Architecture: all -Depends: ${misc:Depends}, eole-lemonldap-pkg -Conflicts: eole-sso -Provides: eole-sso -Description: Dictionnaires et templates pour la configuration d'un serveur LemonLDAP::NG, testée uniquement avec eolebase +Depends: eole-lemonldap-pkg, + ${misc:Depends} +Description: Dictionnaires et templates pour la configuration d'un serveur LemonLDAP::NG + Pour toute information complémentaire, veuillez vous rendre sur le + site du projet EOLE. + +Package: eole-lemonldap-ng-scribe +Architecture: all +Depends: eole-scribe, + eole-lemonldap-ng, + ${misc:Depends} +Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe . - Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles. + Pour toute information complémentaire, veuillez vous rendre sur le + site du projet EOLE. -Package: eole-lemonldap-pkg +Package: eole-lemonldap-ng-pkg Architecture: all -Depends: ${misc:Depends}, lemonldap-ng, lemonldap-ng-doc, lemonldap-ng-fastcgi-server, - libxml-libxml-perl, libxml-libxslt-perl, libcgi-emulate-psgi-perl, libauthen-captcha-perl, liblasso-perl, - libxml-simple-perl, libcgi-compile-perl, libmouse-perl, libio-string-perl, libnet-openid-server-perl, - libemail-sender-perl, libgd-securityimage-perl, libimage-magick-perl, libnet-ldap-perl, - libunicode-string-perl, libsoap-lite-perl, libhtml-template-perl, libcache-cache-perl, - libdbi-perl, perl-modules, libwww-perl +Section: metapackages +Depends: lemonldap-ng, + lemonldap-ng-doc, + lemonldap-ng-fastcgi-server, + lemonldap-ng-handler, + liblemonldap-ng-handler-perl, + liblemonldap-ng-manager-perl, + liblemonldap-ng-portal-perl, + libauthen-captcha-perl, + libemail-sender-perl, + libgd-securityimage-perl, + libimage-magick-perl, + libio-string-perl, + liblasso-perl, + libnet-openid-server-perl, + ${misc:Depends} Description: Paquet de dépendances pour eole-lemonldap. . Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles. diff --git a/debian/copyright b/debian/copyright index 655a069..376badc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,22 +1,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: {PROJECT} -Source: {URL} +Upstream-Name: eole-common +Source: http://dev-eole.ac-dijon.fr/projects/eole-common Files: * -Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}> -License: {UPSTREAM LICENSE} +Copyright: 2020 Équipe EOLE +License: CeCILL-C -Files: debian/* -Copyright: 2012 Équipe EOLE -License: CeCILL-2 - -License: {UPSTREAM LICENSE} - {TEXT OF THE LICENSE} - -License: CeCILL-2 - This software is governed by the CeCILL-2 license under French law and +License: CeCILL-C + This software is governed by the CeCILL-C license under French law and abiding by the rules of distribution of free software. You can use, - modify and or redistribute the software under the terms of the CeCILL-2 + modify and or redistribute the software under the terms of the CeCILL-C license as circulated by CEA, CNRS and INRIA at the following URL "http://www.cecill.info";. . @@ -38,7 +31,7 @@ License: CeCILL-2 same conditions as regards security. . The fact that you are presently reading this means that you have had - knowledge of the CeCILL-2 license and that you accept its terms. + knowledge of the CeCILL-C license and that you accept its terms. . - On Eole systems, the complete text of the CeCILL-2 License can be found - in '/usr/share/common-licenses/CeCILL-2-en'. + On Eole systems, the complete text of the CeCILL-C License can be found + in `/usr/share/common-licenses/CeCILL-2'. diff --git a/debian/eole-lemonldap-ng-scribe.install b/debian/eole-lemonldap-ng-scribe.install new file mode 100644 index 0000000..5823ebc --- /dev/null +++ b/debian/eole-lemonldap-ng-scribe.install @@ -0,0 +1,2 @@ +usr/share/eole/creole/dicos/71_lemonldap_ng_scribe.xml +usr/share/eole/postservice/98-lemonldap-ng-scribe-register-hosts diff --git a/debian/eole-lemonldap-ng.install b/debian/eole-lemonldap-ng.install new file mode 100644 index 0000000..f6ab851 --- /dev/null +++ b/debian/eole-lemonldap-ng.install @@ -0,0 +1,6 @@ +usr/share/creole/ +usr/share/eole/creole/dicos/70_lemonldap_ng.xml +usr/share/eole/creole/distrib/ +usr/share/eole/diagnose/ +usr/share/eole/postservice/99-lemonldap-ng +usr/share/eole/posttemplate/ diff --git a/debian/eole-lemonldap.install b/debian/eole-lemonldap.install deleted file mode 100644 index 73752c9..0000000 --- a/debian/eole-lemonldap.install +++ /dev/null @@ -1 +0,0 @@ -usr diff --git a/debian/rules b/debian/rules index 218df65..7862967 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,8 @@ # -*- makefile -*- # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 +export DH_OPTIONS=-v %: dh $@