[lemonldap-ng] 02/02: Use dpkg-maintscript-helper to manage handler change

[Xavier Guimard]

This is an automated email from the git hooks/post-receive script.

xguimard-guest pushed a commit to branch master
in repository lemonldap-ng.

commit ae25da548ce9ba379c2583c2f750fddef5f39460
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Sat Apr 23 20:44:40 2016 +0200

    Use dpkg-maintscript-helper to manage handler change
---
 debian/changelog                                | 18 ++----------------
 debian/control                                  | 13 ++++++++-----
 debian/liblemonldap-ng-handler-perl.maintscript |  3 +++
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c16d85e..33cd97e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,5 @@
 lemonldap-ng (1.9.1-2) UNRELEASED; urgency=medium
 
-  TODO:
-  - when installing in a clean chroot, I get:
-      Setting up liblemonldap-ng-portal-perl (1.9.1-1) ...
-      Can't locate XML/LibXML.pm in @INC (you may need to install the XML::LibXML module) (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.22.1 /usr/local/share/perl/5.22.1 /usr/lib/x86_64-linux-gnu/perl5/5.22 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.22 /usr/share/perl/5.22 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base .) at /usr/share/perl5/Lemonldap/NG/Common/Notification.pm line 10, <FILE> line 1.
-      BEGIN failed--compilation aborted at /usr/share/perl5/Lemonldap/NG/Common/Notification.pm line 10, <FILE> line 1.
-      Compilation failed in require at /usr/share/perl5/Lemonldap/NG/Portal/Simple.pm line 436, <FILE> line 1.
-  - the split needs more work since files are shuffled around:
-    * the new lemonldap-ng-handler needs some versioned Breaks/Replaces
-      against liblemonldap-ng-handler-perl (<< 1.9.1-2~)
-    * since there are conffiles involved they need special treatment,
-      cf. dpkg-maintscript-helper(1) and dh_installdeb(1)
-    * testing in a chroot shows the problem as expected:
-        Unpacking lemonldap-ng-handler (1.9.1-2) ...
-        dpkg: error processing archive /home/gregoa/src/cowcache/./lemonldap-ng-handler_1.9.1-2_all.deb (--unpack):
-         trying to overwrite '/etc/lemonldap-ng/handler-nginx.conf', which is also in package liblemonldap-ng-handler-perl 1.9.1-1
-
   * Remove keep-angular-files patch since libjs-angularjs >1.4 is now
     available
   * Fix "circular dependency": split liblemonldap-ng-handler-perl into
@@ -23,6 +7,8 @@ lemonldap-ng (1.9.1-2) UNRELEASED; urgency=medium
     - Add a debian/NEWS entry for this
   * Remove liblemonldap-ng-handler-perl.postrm since My::Package isn't
     built since 1.4
+  * Portal: move XML* deps from Recommends to Depends since
+    notifications are enabled by default
 
  -- Xavier Guimard <x.guimard at free.fr>  Sat, 16 Apr 2016 21:36:42 +0200
 
diff --git a/debian/control b/debian/control
index 3d33797..2507741 100644
--- a/debian/control
+++ b/debian/control
@@ -111,9 +111,9 @@ Package: lemonldap-ng-fastcgi-server
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
-         nginx-extras | nginx,
-         liblemonldap-ng-handler-perl,
-         libplack-perl
+         liblemonldap-ng-handler-perl (= ${binary:Version}),
+         libplack-perl,
+         nginx-extras | nginx
 Recommends: libhttp-parser-xs-perl,
 Suggests: nginx-extras
 Section: web
@@ -133,7 +133,10 @@ Description: Lemonldap::NG FastCGI server
 Package: lemonldap-ng-handler
 Architecture: all
 Depends: ${misc:Depends},
-         libapache2-mod-perl2 | lemonldap-ng-fastcgi-server
+         libapache2-mod-perl2 | lemonldap-ng-fastcgi-server (= ${binary:Version}),
+         liblemonldap-ng-handler-perl (= ${binary:Version})
+Breaks: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
+Replaces: liblemonldap-ng-handler-perl (<< 1.9.1-2~)
 Description: Lemonldap::NG Apache handler part
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application Apache servers. It can be used in conjunction with
@@ -240,7 +243,7 @@ Depends: ${misc:Depends},
          libwww-perl
 Recommends: lemonldap-ng-doc (= ${binary:Version}),
             libapache-session-browseable-perl,
-            libapache2-mod-fcgid | libapache2-mod-fastcgi | lemonldap-ng-fastcgi-server,
+            libapache2-mod-fcgid | libapache2-mod-fastcgi | lemonldap-ng-fastcgi-server (= ${binary:Version}),
             libjson-xs-perl,
             libhttp-parser-xs-perl,
             liblwp-protocol-https-perl | libwww-perl (<< 6),
diff --git a/debian/liblemonldap-ng-handler-perl.maintscript b/debian/liblemonldap-ng-handler-perl.maintscript
new file mode 100644
index 0000000..3897320
--- /dev/null
+++ b/debian/liblemonldap-ng-handler-perl.maintscript
@@ -0,0 +1,3 @@
+# Conf files have moved to lemonldap-ng-handler package
+rm_conffile /etc/lemonldap-ng/handler-nginx.conf 1.9.1-2~
+rm_conffile /etc/lemonldap-ng/handler-apache2.X.conf 1.9.1-2~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/lemonldap-ng.git