From 9c967b27edb00b0af97340a1580ba56f7d35976f Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Wed, 9 Dec 2020 09:42:51 +0100
Subject: [PATCH] Merge packaging from upstream

---
 debian/compat                 |  1 -
 debian/control                | 14 +++++++-------
 debian/copyright              | 27 ++++++++++-----------------
 debian/eole-lemonldap.install |  1 -
 debian/rules                  |  3 ++-
 5 files changed, 19 insertions(+), 27 deletions(-)
 delete mode 100644 debian/compat
 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 0cb37a4..0c4d856 100644
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
-Source: eole-lemonldap
+Source: eole-lemonldap-ng
 Section: web
 Priority: optional
 Maintainer: Équipe EOLE <eole@ac-dijon.fr>
 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.git
+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: eole-lemonldap-pkg,
+Depends: eole-lemonldap-ng-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-scribe
+Package: eole-lemonldap-ng-scribe
 Architecture: all
 Depends: eole-scribe,
-         eole-lemonldap,
+         eole-lemonldap-ng,
 	 libapache2-mod-perl2,
          ${misc:Depends}
 Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
@@ -27,7 +27,7 @@ Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
  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
 Section: metapackages
 Depends: lemonldap-ng,
diff --git a/debian/copyright b/debian/copyright
index 655a069..ed50958 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-lemonldap-ng
+Source: http://dev-eole.ac-dijon.fr/projects/sso
 
 Files: *
-Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
-License: {UPSTREAM LICENSE}
+Copyright: 2020 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-C
 
-Files: debian/*
-Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
-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.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 $@