[Pkg-nagios-changes] [pkg-icinga2] 17/17: Adapt debian packaging for current development of Icinga2
Markus Frosch
lazyfrosch-guest at alioth.debian.org
Wed Oct 9 20:19:02 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga2.
commit 8901a1df98fe6fa633b7b02c4c9a6c589ab26c64
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Wed Oct 9 22:16:39 2013 +0200
Adapt debian packaging for current development of Icinga2
---
debian/.gitignore | 9 ++++
debian/changelog | 5 +-
debian/control | 56 ++++++++++++--------
debian/copyright | 23 +++-----
debian/docs | 1 +
debian/icinga2-common.dirs | 8 +++
.../{icinga2.init => icinga2-common.icinga.init} | 2 +-
debian/icinga2-common.install | 4 ++
debian/icinga2-core.install | 3 ++
debian/icinga2.dirs | 2 -
debian/icinga2.install | 1 -
debian/rules | 38 ++++++++++---
debian/source/format | 2 +-
13 files changed, 103 insertions(+), 51 deletions(-)
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..a6cf5dd
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,9 @@
+files
+*.debhelper
+*.debhelper.log
+*.substvars
+
+icinga2/
+icinga2-*/
+tmp/
+
diff --git a/debian/changelog b/debian/changelog
index 2910f61..8e48f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-icinga2 (2.0) unstable; urgency=low
+icinga2 (0.0.3~dev+0-1) UNRELEASED; urgency=low
* Experimental Build
+ * Initial Debian packaging for the Icinga 2 alphas and betas
- -- Alexander Wirt <formorer at debian.org> Tue, 25 Sep 2012 22:09:24 +0200
+ -- Markus Frosch <markus at lazyfrosch.de> Thu, 03 Oct 2013 11:30:14 +0200
diff --git a/debian/control b/debian/control
index 7aa44fa..c63ecef 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,16 @@
Source: icinga2
Section: admin
Priority: extra
-Maintainer: Alexander Wirt <formorer at debian.org>
-Build-Depends: asciidoc,
- automake,
+Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
+Uploaders: Alexander Wirt <formorer at debian.org>, Markus Frosch <markus at lazyfrosch.de>
+Build-Depends: automake,
autoconf,
autotools-dev,
bison,
debhelper (>= 9),
doxygen,
flex,
- g++,
- help2man,
+ g++ (>= 1.96),
libboost-dev,
libboost-program-options-dev,
libboost-signals-dev,
@@ -22,24 +21,39 @@ Build-Depends: asciidoc,
libssl-dev,
libtool,
python-dev
-Standards-Version: 3.9.3
-Homepage: <insert the upstream URL, if relevant>
+Standards-Version: 3.9.4
+Homepage: http://www.icinga.org
Package: icinga2
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: icinga2-core (= ${binary:Version}),
+ icinga2-common (= ${source:Version}),
+ ${misc:Depends}
Description: host and network monitoring system
- Icinga is a modular monitoring framework for hosts, services, and
- networks, based on the Nagios project. It is designed to be easy to
- understand and modify to fit any need.
+ Icinga 2 is still in development and not ready for production use!
.
- Features include:
- * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
- TCP port;
- * plugin interface to allow for user-developed service checks
- * contact notifications when problems occur and get resolved (via
- email, pager, or user-defined method)
- * support for proactive problem resolution (handlers can be defined to
- be run during service or host events)
- * web output: current status, notifications, problem history, log
- file, etc.
+ Better description to come.
+ .
+ This is the metapackage to install all Icinga 2 features.
+
+Package: icinga2-common
+Architecture: all
+Depends: ${misc:Depends}
+Description: host and network monitoring system - common files
+ Icinga 2 is still in development and not ready for production use!
+ .
+ Better description to come.
+ .
+ This package provides configuration and some basic helper scripts.
+
+Package: icinga2-core
+Architecture: any
+Depends: icinga2-common (= ${source:Version}),
+ ${misc:Depends}, ${shlibs:Depends}
+Description: host and network monitoring system - daemon
+ Icinga 2 is still in development and not ready for production use!
+ .
+ Better description to come.
+ .
+ This package provides the Icinga 2 daemon.
+
diff --git a/debian/copyright b/debian/copyright
index 2ec5382..2629360 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,16 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: icinga2
-Source: <url://example.com>
+Upstream-Name: Icinga 2
+Source: http://www.icinga.org
Files: *
-Copyright: <years> <put author's name and email here>
- <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: 2012-2013 Icinga Development Team (http://www.icinga.org/)
+License: GPL-2+
-# If you want to use GPL v2 or later for the /debian/* files use
-# the following clauses, or change it to suit. Delete these two lines
Files: debian/*
Copyright: 2012 Alexander Wirt <formorer at debian.org>
+ 2013 Markus Frosch <markus at lazyfrosch.de
+License: GPL-2+
+
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -32,7 +28,4 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
+
diff --git a/debian/docs b/debian/docs
index 50bd824..6f83607 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
NEWS
README
diff --git a/debian/icinga2-common.dirs b/debian/icinga2-common.dirs
new file mode 100644
index 0000000..083d2f1
--- /dev/null
+++ b/debian/icinga2-common.dirs
@@ -0,0 +1,8 @@
+var/cache/icinga2
+var/lib/icinga2
+var/lib/icinga2/cluster/config
+var/lib/icinga2/cluster/log
+var/log/icinga2
+var/log/icinga2/compat/archives
+var/spool/icinga2
+var/spool/icinga2/perfdata
diff --git a/debian/icinga2.init b/debian/icinga2-common.icinga.init
similarity index 99%
rename from debian/icinga2.init
rename to debian/icinga2-common.icinga.init
index 6f44ca1..32c7bf9 100644
--- a/debian/icinga2.init
+++ b/debian/icinga2-common.icinga.init
@@ -15,7 +15,7 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="icinga2 monitoring daemon"
NAME=icinga2
-DAEMON=/usr/sbin/icinga2
+DAEMON=/usr/bin/icinga2
DAEMON_ARGS="-c /etc/icinga2/icinga2.conf -d"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
new file mode 100644
index 0000000..c83d76a
--- /dev/null
+++ b/debian/icinga2-common.install
@@ -0,0 +1,4 @@
+debian/tmp/etc/icinga2
+usr/sbin/i2*feature
+usr/share/doc/icinga2
+usr/share/icinga2
diff --git a/debian/icinga2-core.install b/debian/icinga2-core.install
new file mode 100644
index 0000000..f99b38d
--- /dev/null
+++ b/debian/icinga2-core.install
@@ -0,0 +1,3 @@
+usr/share/man/man8/icinga2.8
+usr/bin/icinga2 usr/sbin
+usr/lib/*/icinga2
diff --git a/debian/icinga2.dirs b/debian/icinga2.dirs
deleted file mode 100644
index f835359..0000000
--- a/debian/icinga2.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-var/log/icinga2
-var/lib/icinga2
diff --git a/debian/icinga2.install b/debian/icinga2.install
deleted file mode 100644
index 08065de..0000000
--- a/debian/icinga2.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/etc/icinga2.conf etc/icinga2
diff --git a/debian/rules b/debian/rules
index 24d5d26..9c31559 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,39 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# this disables configure to be run by autogen.sh
+export NOCONFIGURE=1
+
%:
dh $@ --with autotools-dev
+override_dh_auto_clean:
+ dh_auto_clean
+ # delete all Makefiles
+ find -type f -name Makefile.in -delete
+ # ltdl externals
+ rm -rf third-party/ltdl/config/
+ rm -rf third-party/ltdl/libltdl/
+ rm -rf third-party/ltdl/loaders/
+ rm -rf third-party/ltdl/m4/
+ find third-party/ltdl -type f ! -name README.icinga -delete
+ # cleanup config_parser
+ rm -f lib/config/config_lexer.cc
+ rm -f lib/config/config_parser.cc lib/config/config_parser.hh \
+ lib/config/config_parser.h
+ # m4 data
+ find m4/ -type l -delete
+ rm -f m4/libtool.m4 m4/argz.m4 m4/lt*.m4 m4/lt*.sh
+ # other files in root
+ rm -f config.log config.h.in aclocal.m4 configure
+
override_dh_auto_configure:
sh autogen.sh
- dh_auto_configure -- --enable-python
+ dh_auto_configure -- --enable-python \
+ --with-icinga-user=root \
+ --with-icinga-group=bin \
+ --with-icingacmd-user=root \
+ --with-icingacmd-group=bin
+
+# vi: noexpandtab :
diff --git a/debian/source/format b/debian/source/format
index 89ae9db..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list