[Pkg-nagios-changes] [pkg-icingaweb2] 01/01: Move setup code into core module

[Markus Frosch]

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

lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.

commit 8a9396a05729b912ca5e187592aef94581d8d246
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Jul 13 10:03:50 2015 +0200

    Move setup code into core module
---
 debian/control                         | 17 +++--------------
 debian/icingaweb2-module-setup.install |  1 -
 debian/icingaweb2.install              |  2 ++
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 07cfe49..cc6e84f 100644
--- a/debian/control
+++ b/debian/control
@@ -30,8 +30,9 @@ Recommends:
  php5-cli (>= 5.3.2),
  php5-ldap,
  icingaweb2-module-monitoring,
- icingaweb2-module-doc,
- icingaweb2-module-setup
+ icingaweb2-module-doc
+Replaces: icingaweb2-module-setup
+Conflicts: icingaweb2-module-setup
 Description: simple and responsive web interface for Icinga
  Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
  monitoring environment.
@@ -67,18 +68,6 @@ Description: simple and responsive web interface for Icinga - documentation modu
  This module adds the documentation viewer of Icinga Web 2, which can also
  display the documentation of other modules.
 
-Package: icingaweb2-module-setup
-Architecture: all
-Depends: icingaweb2 (= ${source:Version}), ${misc:Depends}
-Description: simple and responsive web interface for Icinga - setup module
- Icinga Web 2 is a very modular, fast and simple web interface for your Icinga
- monitoring environment.
- .
- This module provides the setup wizard to bootstrap your Icinga Web 2
- configuration.
- .
- It will be disabled after the initial setup, and may be removed later.
-
 Package: php-icinga
 Section: php
 Architecture: all
diff --git a/debian/icingaweb2-module-setup.install b/debian/icingaweb2-module-setup.install
deleted file mode 100644
index 2b3c7b3..0000000
--- a/debian/icingaweb2-module-setup.install
+++ /dev/null
@@ -1 +0,0 @@
-modules/setup  usr/share/icingaweb2/modules
diff --git a/debian/icingaweb2.install b/debian/icingaweb2.install
index 6870ecb..df75e42 100644
--- a/debian/icingaweb2.install
+++ b/debian/icingaweb2.install
@@ -21,3 +21,5 @@ debian/icingaweb2.conf           etc/apache2/conf-available
 library/vendor/JShrink/*.php     usr/share/icingaweb2/library/vendor/JShrink
 library/vendor/Parsedown/*.php   usr/share/icingaweb2/library/vendor/Parsedown
 library/vendor/lessphp/*.php     usr/share/icingaweb2/library/vendor/lessphp
+
+modules/setup  usr/share/icingaweb2/modules

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git