jessie: Ensure being up2date with current changes

jessie/debian/control

@@ -2,10 +2,6 @@ Source: icinga2
 Section: admin
 Priority: extra
 Maintainer: Icinga Development Team <info@icinga.com>
-#Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
-#Uploaders: Markus Frosch <lazyfrosch@debian.org>,
-#           Jan Wagner <waja@cyconet.org>,
-#           Alexander Wirt <formorer@debian.org>
 Build-Depends: bash-completion,
                bison,
                cmake (>= 2.8.7),
@@ -92,9 +88,10 @@ Package: icinga2-bin
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: icinga2-common (= ${source:Version}),
-         libicinga2 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: libicinga2 (<< 2.9.0)
+Replaces: libicinga2 (<< 2.9.0)
 Description: host and network monitoring system - daemon
  Icinga 2 is a general-purpose monitoring application to fit the needs of
  any size of network. Icinga 1.x was a Nagios fork; this new generation
@@ -137,34 +134,6 @@ Description: host and network monitoring system - documentation
  .
  This package provides the Icinga 2 documentation.
 
-Package: icinga2-classicui
-Architecture: all
-Pre-Depends: dpkg (>= 1.15.7.2)
-Depends: apache2-utils,
-         icinga-cgi-bin (>= 1.11.5~),
-         icinga2-bin (>= 2.2.0~),
-         icinga2-common (= ${source:Version}),
-         ${misc:Depends}
-Recommends: apache2 | httpd
-Description: host and network monitoring system - classic UI
- Icinga 2 is a general-purpose monitoring application to fit the needs of
- any size of network. Icinga 1.x was a Nagios fork; this new generation
- has been rewritten from scratch in C++, with multi-threading and cluster
- support.
- .
- Features:
-  * all standard features of Icinga and Nagios;
-  * much faster and more scalable than Icinga 1 and Nagios;
-  * new, more intuitive, template-based configuration format;
-  * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
-    SMTP, etc.) by executing checks (see monitoring-plugins*);
-  * any small script following the Nagios plugin API can be used as a
-    check plugin;
-  * notifications about alerts for any custom script (with examples);
-  * native support for Livestatus and Graphite.
- .
- This package provides support for the Icinga Classic User Interface.
-
 Package: icinga2-ido-mysql
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -229,7 +198,6 @@ Package: icinga2-dbg
 Architecture: any
 Section: debug
 Depends: icinga2-bin (= ${binary:Version}),
-         libicinga2 (= ${binary:Version}),
          ${misc:Depends}
 Description: host and network monitoring system - debug symbols
  Icinga 2 is a general-purpose monitoring application to fit the needs of
@@ -250,32 +218,6 @@ Description: host and network monitoring system - debug symbols
  .
  This package provides debug symbols for Icinga 2.
 
-Package: libicinga2
-Architecture: any
-Section: libs
-Breaks: icinga2-bin (<< 2.4.0-1~)
-Replaces: icinga2-bin (<< 2.4.0-1~)
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Description: host and network monitoring system - internal libraries
- Icinga 2 is a general-purpose monitoring application to fit the needs of
- any size of network. Icinga 1.x was a Nagios fork; this new generation
- has been rewritten from scratch in C++, with multi-threading and cluster
- support.
- .
- Features:
-  * all standard features of Icinga and Nagios;
-  * much faster and more scalable than Icinga 1 and Nagios;
-  * new, more intuitive, template-based configuration format;
-  * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
-    SMTP, etc.) by executing checks (see monitoring-plugins*);
-  * any small script following the Nagios plugin API can be used as a
-    check plugin;
-  * notifications about alerts for any custom script (with examples);
-  * native support for Livestatus and Graphite.
- .
- This package provides internal libraries for the daemon.
-
 Package: vim-icinga2
 Architecture: all
 Depends: ${misc:Depends}

jessie/debian/icinga2-common.install

@@ -3,6 +3,5 @@ debian/tmp/etc/icinga2
 debian/tmp/etc/logrotate.d
 tools/syntax/nano/icinga2.nanorc usr/share/nano
 usr/share/icinga2
-etc/sysconfig/icinga2 usr/lib/icinga2
 usr/lib/icinga2/prepare-dirs
 usr/lib/icinga2/safe-reload

jessie/debian/libicinga2.install

-usr/lib/*/icinga2/*.so.*

jessie/debian/rules

@@ -48,7 +48,6 @@ override_dh_auto_configure:
 		-DICINGA2_COMMAND_GROUP=www-data \
 		-DICINGA2_GIT_VERSION_INFO=false \
 		-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
-		-DICINGA2_WITH_STUDIO=true \
 		$(UNITY_BUILD) \
 		$(LTO_BUILD)
 
@@ -64,7 +63,6 @@ override_dh_install-indep:
 
 override_dh_install-arch:
 	dh_install -a
-	rm debian/libicinga2/usr/lib/*/icinga2/lib*_shim*
 	for dbms in mysql pgsql; do \
 		mkdir -p debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/install ; \
 		mkdir -p debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/upgrade/$$dbms; \