[icinga-checkins] icinga.org: icinga2/next: Debian: smaller cleanups

git at icinga.org git at icinga.org
Fri Jun 13 16:24:52 CEST 2014


Module: icinga2
Branch: next
Commit: 0e27116e20736b9e64cf5359e61a098b46225336
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=0e27116e20736b9e64cf5359e61a098b46225336

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Jun 13 15:58:50 2014 +0200

Debian: smaller cleanups

Refs #5816

---

 debian/README.source |    9 ---------
 debian/TODO          |   13 ++-----------
 debian/control       |   45 ++++++++++++++++++++++++---------------------
 debian/copyright     |    1 +
 4 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 9948994..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,9 +0,0 @@
-icinga2 for Debian
-------------------
-
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
-
-
-
-
diff --git a/debian/TODO b/debian/TODO
index b3bfa98..a77b26f 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,14 +1,5 @@
 icinga2 source TODOs
 ====================
 
-* Replace embedded tools
-  - doc/ strapdownjs and jquery
-
-* Document embedded sources in tarball
-  - third-party/
-
-* init
-  - configtest
-  - multi instanz
-  - pid file handling testen
-
+* Update doc handling - still WIP
+  - publish via webserver / classicui?
diff --git a/debian/control b/debian/control
index 3335a77..4d49ab0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,30 @@ Source: icinga2
 Section: admin
 Priority: extra
 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: cmake (>= 2.8.7),
-               make (>= 3.81),
-               bison,
-               debhelper (>= 9),
-               flex,
-               g++ (>= 1.96),
-               libboost-dev,
-               libboost-program-options-dev,
-               libboost-system-dev,
-               libboost-test-dev,
-               libboost-thread-dev,
-               libboost-regex-dev,
-               libmysqlclient-dev,
-               libpq-dev,
-               libssl-dev,
-               po-debconf,
-               python-dev,
-               pandoc,
-               python-sphinx
-Standards-Version: 3.9.4
+Uploaders:
+    Markus Frosch <markus at lazyfrosch.de>,
+    Alexander Wirt <formorer at debian.org>
+Build-Depends:
+    cmake (>= 2.8.7),
+    make (>= 3.81),
+    bison,
+    debhelper (>= 9),
+    flex,
+    g++ (>= 1.96),
+    libboost-dev,
+    libboost-program-options-dev,
+    libboost-system-dev,
+    libboost-test-dev,
+    libboost-thread-dev,
+    libboost-regex-dev,
+    libmysqlclient-dev,
+    libpq-dev,
+    libssl-dev,
+    po-debconf,
+    python-dev,
+    pandoc,
+    python-sphinx
+Standards-Version: 3.9.5
 Homepage: http://www.icinga.org
 
 Package: icinga2
diff --git a/debian/copyright b/debian/copyright
index ec43103..8c7be85 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,6 +35,7 @@ License: GPL-2+-with-exeception
 Files: debian/*
 Copyright: 2012 Alexander Wirt <formorer at debian.org>
            2013-2014 Markus Frosch <markus at lazyfrosch.de>
+           2014 Icinga Development Team (http://www.icinga.org)
 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



More information about the icinga-checkins mailing list