[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, ubuntu-lucid, updated. debian/1.8.2-1-12-gbe223a2

Alexander Wirt formorer at debian.org
Mon Jan 14 05:18:05 UTC 2013


The following commit has been merged in the ubuntu-lucid branch:
commit 68f4b1320a9d0ba093b150a9b8df175a2717fccc
Merge: 8b35f1c4a5f14b95411448eb9b7d6b6cbb7d5d71 5521a20d4511f5a8de24265fe29c475071c15383
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Nov 4 22:36:22 2012 +0100

    Merge branch 'master' into ubuntu-lucid
    
    Conflicts:
    	debian/control

diff --combined debian/changelog
index 9cc248d,99d8d68..bea6fdf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,76 +1,76 @@@
+ icinga (1.8.1-2) experimental; urgency=low
+ 
+   * [4fb9f91] Fix broker filename in idoutils README.Debian.
+     Thanks to Michael Friedrich catching this error
+ 
+  -- Alexander Wirt <formorer at debian.org>  Sun, 04 Nov 2012 21:57:50 +0100
+ 
+ icinga (1.8.1-1) experimental; urgency=low
+ 
+   * [5947e03] Remove useless echo in do_stop of icingas initscript
+   * [fb9c4cb] Imported Upstream version 1.8.1
+ 
+  -- Alexander Wirt <formorer at debian.org>  Thu, 25 Oct 2012 07:04:55 +0200
+ 
+ icinga (1.8.0-1) experimental; urgency=low
+ 
+   * [5c6b2b6] Remove build-dep on iputils-ping and do a wrap-and-sort
+   * [3e31fec] Even more wrap-and-sort
+   * [0c39b06] Imported Upstream version 1.8.0
+     - Fix Conflicting declarations of variable highlight_table_rows
+       (Closes: #688459)
+     - Remove buggy sql creation script (never used by packages)
+       (Closes: #683320)
+   * [9752230] Remove obsolete patch 80_fix_dbd_handling.dpatch
+   * [74ea069] Remove obsolete patch 99_fix_epn.dpatch
+   * [ebc54b8] jquery was updated
+   * [c3c04db] contexthelp was removed from upstream
+   * [b876c8c] Fix jquery link
+   * [eec91d0] Don't ask question if there is no config (Closes: #689601)
+   * [ce7f089] Fix mainurl
+   * [7c8cb8d] Add indonesian translation (Closes: #677118)
+   * [c0ddb94] Update Polish translation (Closes: #678155)
+   * [7eccc2b] Make apache directory match more strict (Closes: #679476)
+   * [b0d4ee9] Handle /var/run/icinga on our own (Closes: #689551)
+   * [e604f8c] Install update sql files for idoutils
+ 
+  -- Alexander Wirt <alexander.wirt at credativ.de>  Fri, 19 Oct 2012 15:58:46 +0200
+ 
+ icinga (1.7.2-1) experimental; urgency=low
+ 
+   * [4394714] Imported Upstream version 1.7.2
+     - Fix duplicated events (Closes: #686036)
+   * [683ca22] Cherrypick epn fix from git
+ 
+  -- Alexander Wirt <formorer at debian.org>  Wed, 29 Aug 2012 21:54:35 +0200
+ 
+ icinga (1.7.1-2) unstable; urgency=low
+ 
+   [ Alexander Wirt ]
+   * [6dee566] Start after postgresql or mysql
+ 
+   [ Christian Perrier ]
+   * Debconf templates and debian/control reviewed by the debian-l10n-
+     english team as part of the Smith review project. Closes: #674024
+   * [Debconf translation updates]
+   * Debconf templates and debian/control reviewed by the debian-l10n-
+     english team as part of the Smith review project. Closes: #674024
+   * [Debconf translation updates]
+   * Czech (Martin Sin).  Closes: #677033
+   * Swedish (Martin Bagge / brother).  Closes: #677064
+   * Russian (Yuri Kozlov).  Closes: #677178
+   * Slovak (Slavko).  Closes: #677240
+   * Portuguese (Américo Monteiro).  Closes: #677316
+   * Dutch; (Jeroen Schot).  Closes: #677357
+   * Danish (Joe Hansen).  Closes: #677808
+   * Italian (Luca Monducci).  Closes: #677841
+   * German (Holger Wansing).  Closes: #677914
+   * French (Steve Petruzzello).  Closes: #677952
+   * Galician ().  Closes: #678913
+   * Spanish; (Omar Campagne).  Closes: #678944
+ 
+  -- Alexander Wirt <formorer at debian.org>  Fri, 29 Jun 2012 23:02:35 +0200
+ 
  icinga (1.7.1-1) unstable; urgency=low
  
    * [b64d290] Imported Upstream version 1.7.1
@@@ -10,14 -83,6 +83,14 @@@
  
   -- Alexander Wirt <formorer at debian.org>  Thu, 21 Jun 2012 00:09:52 +0200
  
 +icinga (1.7.0-4~ppa1~lucid1) lucid; urgency=low
 +
 +  * [b66eda1] Fix icinga-idoutils.ido2db initscipt
 +    - replace "--status" with "--start --test", "--status" not available on
 +    lucid.
 +
 + -- Alexander Wirt <formorer at debian.org>  Fri, 15 Jun 2012 20:42:03 +0200
 +
  icinga (1.7.0-4) unstable; urgency=low
  
    * [704a3bc] Quote version for dpkg-compare
diff --combined debian/control
index 57bc7fa,b62ec6f..b5ac527
--- a/debian/control
+++ b/debian/control
@@@ -6,13 -6,27 +6,27 @@@ Uploaders: Alexander Wirt <formorer at deb
  Standards-Version: 3.9.3
  Vcs-Browser: http://git.debian.org/?p=pkg-nagios/icinga.git
  Vcs-Git: git://git.debian.org/pkg-nagios/icinga.git
- Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev,
-  libpng-dev | libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping,
-  autotools-dev, dpkg-dev (>= 1.13.19), libdbi-dev | libdbi0-dev
+ Build-Depends: autotools-dev,
+                debhelper (>= 7),
+                dpatch (>= 2.0.10),
+                dpkg-dev (>= 1.13.19),
+                libdbi-dev | libdbi0-dev,
+                libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1),
+                libperl-dev,
+                libpng-dev | libpng12-dev,
+                po-debconf
  
  Package: icinga-common
  Architecture: all
- Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
+ Depends: adduser,
+          bsd-mailx | mailx,
+          coreutils (>= 4.5.3),
 -         dpkg (>= 1.16.1),
++         dpkg,
+          lsb-base (>= 3.0-6),
+          nagios-plugins-basic,
+          ucf (>= 0.28),
+          ${misc:Depends},
+          ${perl:Depends}
  Recommends: nagios-plugins
  Description: host and network monitoring system - support files
   Icinga is a modular monitoring framework for hosts, services, and
@@@ -34,7 -48,15 +48,15 @@@
  
  Package: icinga-cgi
  Architecture: any
- Depends: icinga-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libjs-jquery (>= 1.4.2-2~)
+ Depends: adduser,
+          apache2-utils,
+          coreutils (>= 4.5.3),
+          icinga-common (= ${source:Version}),
+          libjs-jquery (>= 1.4.2-2~),
+          ucf (>= 0.28),
+          ${misc:Depends},
+          ${perl:Depends},
+          ${shlibs:Depends}
  Recommends: apache2 | httpd, nagios-images (>> 0.1)
  Description: host and network monitoring system - CGI scripts
   Icinga is a modular monitoring framework for hosts, services, and
@@@ -56,7 -78,14 +78,14 @@@
  
  Package: icinga-idoutils
  Architecture: any
- Depends: icinga-common (= ${source:Version}), ucf, dbconfig-common, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.0-6), libdbd-mysql | libdbd-pgsql
+ Depends: dbconfig-common,
+          icinga-common (= ${source:Version}),
+          libdbd-mysql | libdbd-pgsql,
+          lsb-base (>= 3.0-6),
+          ucf,
+          ${misc:Depends},
+          ${perl:Depends},
+          ${shlibs:Depends}
  Recommends: mysql-client | postgresql-client
  Description: host and network monitoring system - icinga-dataobjects support
   Icinga is a modular monitoring framework for hosts, services, and
@@@ -79,7 -108,9 +108,9 @@@
  
  Package: icinga
  Architecture: any
- Depends: icinga-core (= ${binary:Version}), icinga-cgi (= ${binary:Version}), ${misc:Depends}
+ Depends: icinga-cgi (= ${binary:Version}),
+          icinga-core (= ${binary:Version}),
+          ${misc:Depends}
  Suggests: nagios-nrpe-plugin
  Description: host and network monitoring system - metapackage
   Icinga is a modular monitoring framework for hosts, services, and
@@@ -102,7 -133,10 +133,10 @@@
  
  Package: icinga-core
  Architecture: any
- Depends: ${shlibs:Depends}, icinga-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends}
+ Depends: icinga-common (= ${source:Version}),
+          ${misc:Depends},
+          ${perl:Depends},
+          ${shlibs:Depends}
  Suggests: nagios-nrpe-plugin
  Replaces: icinga
  Description: host and network monitoring system - core files
@@@ -126,7 -160,7 +160,7 @@@
  Package: icinga-doc
  Architecture: all
  Section: doc
- Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+ Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
  Description: host and network monitoring system - documentation
   Icinga is a modular monitoring framework for hosts, services, and
   networks, based on the Nagios project. It is designed to be easy to
@@@ -149,7 -183,10 +183,10 @@@ Package: icinga-db
  Section: debug
  Priority: extra
  Architecture: any
- Depends: icinga-core (= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+ Depends: icinga-core (= ${binary:Version}),
+          ${misc:Depends},
+          ${perl:Depends},
+          ${shlibs:Depends}
  Description: host and network monitoring system - debug files
   Icinga is a modular monitoring framework for hosts, services, and
   networks, based on the Nagios project. It is designed to be easy to
diff --combined debian/icinga-idoutils.ido2db.init
index 624ef62,36e4bf9..7a1fd25
--- a/debian/icinga-idoutils.ido2db.init
+++ b/debian/icinga-idoutils.ido2db.init
@@@ -1,14 -1,16 +1,16 @@@
  #! /bin/sh
  ### BEGIN INIT INFO
- # Provides:          ido2db 
+ # Provides:          ido2db
  # Required-Start:    $remote_fs $syslog $named $network $time
  # Required-Stop:     $remote_fs $syslog $named $network
  # X-Start-Before:    icinga
  # X-Stop-After:      icinga
+ # Should-Start:      mysql postgresql
+ # Should-Stop:       mysql postgresql
  # Default-Start:     2 3 4 5
  # Default-Stop:      0 1 6
  # Short-Description: ido2db initscript
- # Description:       icinga-databojects daemon
+ # Description:       icinga-dataobjects daemon
  ### END INIT INFO
  
  # Author: Alexander Wirt <formorer at debian.org>
@@@ -45,7 -47,7 +47,7 @@@ f
  
  
  check_started () {
 -	start-stop-daemon --quiet --pidfile $PIDFILE --exec $DAEMON --status > /dev/null 
 +	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null 
  	if [ $? -eq 0 ]
  	then
  		return 1

-- 
debian packaging of icinga(-core)



More information about the Pkg-nagios-changes mailing list