Incooperate Debian packaging changes from the Debian team

Authors:
- Alexander Wirt
- Jan Wagner

debian/TODO

@@ -1,5 +1,14 @@
 icinga2 source TODOs
 ====================
 
-* Update doc handling - still WIP
+* Replace embedded tools
-  - publish via webserver / classicui?
+  - doc/ strapdownjs and jquery
+
+* Document embedded sources in tarball
+  - third-party/
+
+* init
+  - configtest
+  - multi instanz
+  - pid file handling testen
+

debian/control

@@ -3,6 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
 Uploaders: Markus Frosch <markus@lazyfrosch.de>,
+           Jan Wagner <waja@cyconet.org>,
            Alexander Wirt <formorer@debian.org>
 Build-Depends: bison,
                cmake (>= 2.8.7),
@@ -30,7 +31,7 @@ Architecture: any
 Depends: icinga2-bin (= ${binary:Version}),
          icinga2-common (= ${source:Version}),
          ${misc:Depends}
-Recommends: icinga2-doc, nagios-plugins-basic
+Recommends: icinga2-doc, monitoring-plugins-basic | nagios-plugins-basic
 Description: host and network monitoring system
  Icinga 2 is a general-purpose monitoring application and the next generation
  after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small
@@ -127,7 +128,7 @@ Description: host and network monitoring system - documentation
 Package: icinga2-classicui
 Architecture: all
 Depends: apache2-utils,
-         icinga-cgi-bin | icinga-cgi (>= 1.11.4~),
+         icinga-cgi-bin (>= 1.11.5~),
          icinga2-common (= ${source:Version}),
          ${misc:Depends}
 Recommends: apache2 | httpd
@@ -142,7 +143,7 @@ Description: host and network monitoring system - classic ui integration
   * All common features of Icinga and Nagios
   * Much faster and more scalable than Icinga 1 and Nagios
   * New configuration format, more intuitive and template based
-  * Monitoring several services by executing checks (see nagios-plugins*)
+  * Monitoring several services by executing checks (see monitoring-plugins*)
     for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port
   * Any small script can be used as a check plugin, when following the Nagios
     plugin API
@@ -158,6 +159,7 @@ Conflicts: icinga2-ido-pgsql
 Depends: dbconfig-common,
          icinga2-bin (= ${binary:Version}),
          icinga2-common (= ${source:Version}),
+         ucf,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: mysql-client
@@ -189,6 +191,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: dbconfig-common,
          icinga2-bin (= ${binary:Version}),
          icinga2-common (= ${source:Version}),
+         ucf,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: postgresql-client
@@ -262,4 +265,3 @@ Description: host and network monitoring system - Python module
   * Native support for Livestatus and Graphite
  .
  This package provides the Python module for Icinga 2.
-

debian/copyright

@@ -108,7 +108,6 @@ Files: third-party/cmake/BoostTestTargets.*
        third-party/cmake/CopyResourcesToBuildTree.cmake
        third-party/cmake/GetForceIncludeDefinitions.cmake
        third-party/cmake/GetGitRevisionDescription.cmake.in
-
 Copyright: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
            2009-2010 Iowa State University
 License: Boost Software License 1.0

debian/icinga2-ido-mysql.install

@@ -1,4 +1,3 @@
-usr/share/icinga2-ido-mysql/schema/*.sql
+components/db_ido_mysql/schema/*.sql usr/share/icinga2-ido-mysql/schema
-usr/share/icinga2-ido-mysql/schema/upgrade/*.sql
 debian/ido-mysql.conf-sample usr/share/icinga2/tmpl
 usr/lib/*/icinga2/libdb_ido_mysql*

debian/icinga2-ido-mysql.postrm

@@ -20,3 +20,5 @@ if [ "$1" = "purge" ]; then
     db_purge
 fi
 
+#DEBHELPER#
+

debian/icinga2-ido-pgsql.install

@@ -1,4 +1,4 @@
-usr/share/icinga2-ido-pgsql/schema/*.sql
+
-usr/share/icinga2-ido-pgsql/schema/upgrade/*.sql
+components/db_ido_pgsql/schema/*.sql usr/share/icinga2-ido-pgsql/schema
 debian/ido-pgsql.conf-sample usr/share/icinga2/tmpl
 usr/lib/*/icinga2/libdb_ido_pgsql*

debian/icinga2-ido-pgsql.postrm

@@ -20,3 +20,5 @@ if [ "$1" = "purge" ]; then
     db_purge
 fi
 
+#DEBHELPER#
+

debian/rules

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 %:
 	dh $@ --with python2
@@ -43,11 +43,10 @@ override_dh_install:
 		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; \
 		cp components/db_ido_$$dbms/schema/$$dbms.sql debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/install/$$dbms ; \
+		for file in components/db_ido_$$dbms/schema/upgrade/* ; do \
+			cp $$file debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/upgrade/$$dbms/`basename $$file .sql`; \
+		done; \
 	done
-	#	for file in components/db_ido_$$dbms/schema/upgrade/* ; do \
-	#		cp $$file debian/icinga2-ido-$$dbms/usr/share/dbconfig-common/data/icinga2-ido-$$dbms/upgrade/$$dbms/`basename $$file .sql`; \
-	#	done; \
-	#done
 
 
 override_dh_installinit: