[Pkg-nagios-changes] [pkg-nagios] r1843 - in merlin/trunk/debian: . patches

Hendrik Frenzel hfrenzel-guest at alioth.debian.org
Tue Mar 9 12:13:44 UTC 2010 

tags 558419 pending
tags 573149 pending
thanks

Author: hfrenzel-guest
Date: 2010-03-09 12:13:39 +0000 (Tue, 09 Mar 2010)
New Revision: 1843

Added:
   merlin/trunk/debian/copyright
   merlin/trunk/debian/patches/spelling-error.dpatch
   merlin/trunk/debian/watch
Modified:
   merlin/trunk/debian/README.Debian
   merlin/trunk/debian/README.source
   merlin/trunk/debian/changelog
   merlin/trunk/debian/control
   merlin/trunk/debian/init
   merlin/trunk/debian/patches/00list
   merlin/trunk/debian/patches/config.dpatch
   merlin/trunk/debian/patches/database.dpatch
   merlin/trunk/debian/patches/install-script.dpatch
   merlin/trunk/debian/patches/makefile.dpatch
Log:


Modified: merlin/trunk/debian/README.Debian
===================================================================
--- merlin/trunk/debian/README.Debian	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/README.Debian	2010-03-09 12:13:39 UTC (rev 1843)
@@ -1,6 +1,15 @@
 merlin for Debian
 -----------------
 
-<possible notes regarding this package - if none, delete this file>
+Merlin includes a Nagios event broker module (merlin.so) that exports
+data from the Nagios daemon. You have to enable it after installing the package.
 
+Edit /etc/nagios3/nagios.cfg and change or append the following line:
+
+ broker_module=/usr/lib/merlin/merlin.so /etc/merlin/merlin.conf
+
+ Don't forget to restart Nagios after changing the configuration:
+
+  invoke-rc.d nagios3 restart
+
  -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 05 Mar 2010 13:32:10 +0100

Modified: merlin/trunk/debian/README.source
===================================================================
--- merlin/trunk/debian/README.source	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/README.source	2010-03-09 12:13:39 UTC (rev 1843)
@@ -1,9 +1,6 @@
 merlin 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>
-
 This package uses dpatch to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.  Please see:

Modified: merlin/trunk/debian/changelog
===================================================================
--- merlin/trunk/debian/changelog	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/changelog	2010-03-09 12:13:39 UTC (rev 1843)
@@ -1,5 +1,6 @@
-merlin (0.6.7~b1-1) unstable; urgency=low
+merlin (0.6.7~b1-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * NOT RELEASED YET
+  * Initial release (Closes: #558419, #573149)
 
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Fri, 05 Mar 2010 13:32:10 +0100
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Tue, 09 Mar 2010 12:30:21 +0100

Modified: merlin/trunk/debian/control
===================================================================
--- merlin/trunk/debian/control	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/control	2010-03-09 12:13:39 UTC (rev 1843)
@@ -11,7 +11,8 @@
 
 Package: merlin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: nagios3
+Depends: ${shlibs:Depends}, ${misc:Depends}, ucf, libdbd-mysql, php5-cli
 Description: Module for Effortless Redundancy and Loadbalancing In Nagios
  The Merlin project, or Module for Effortless Redundancy and Loadbalancing In
  Nagios, for setting up distributed Nagios installations and allowing Nagios

Added: merlin/trunk/debian/copyright
===================================================================
--- merlin/trunk/debian/copyright	                        (rev 0)
+++ merlin/trunk/debian/copyright	2010-03-09 12:13:39 UTC (rev 1843)
@@ -0,0 +1,36 @@
+This package was debianized by Hendrik Frenzel <hfrenzel at scunc.net>
+and updated by Wolfgang Barth <wob at swobspace@net>
+
+Files: *
+Copyright:
+ © 2008 op5 AB
+License:
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the Artistic License can be found in
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: nagios/*
+Copyright: © 1999-2007 Ethan Galstad >egalstad at nagios.org>
+License: GPL-2
+
+Files: debian/*
+Copyright: © 2007-2008 Hendrik Frenzel <hfrenzel at scunc.net>
+License: GPL-2+
+ The Debian packaging information is under the GPL, version 2 or later.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.
+

Modified: merlin/trunk/debian/init
===================================================================
--- merlin/trunk/debian/init	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/init	2010-03-09 12:13:39 UTC (rev 1843)
@@ -24,16 +24,13 @@
 #
 ### BEGIN INIT INFO
 # Provides:          merlin
-# Required-Start:    $network $local_fs
-# Required-Stop:
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $remote_fs
 # Should-Start:      $named
 # Should-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: <Enter a short description of the sortware>
-# Description:       <Enter a long description of the software>
-#                    <...>
-#                    <...>
+# Short-Description: Start merlind at boottime
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin

Modified: merlin/trunk/debian/patches/00list
===================================================================
--- merlin/trunk/debian/patches/00list	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/patches/00list	2010-03-09 12:13:39 UTC (rev 1843)
@@ -2,3 +2,4 @@
 install-script
 config
 database
+spelling-error

Modified: merlin/trunk/debian/patches/config.dpatch
===================================================================
--- merlin/trunk/debian/patches/config.dpatch	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/patches/config.dpatch	2010-03-09 12:13:39 UTC (rev 1843)
@@ -2,12 +2,12 @@
 ## config.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: set correct path names
 
 @DPATCH@
 diff -urNad merlin-0.6.7~b1~/example.conf merlin-0.6.7~b1/example.conf
 --- merlin-0.6.7~b1~/example.conf	2010-02-24 13:40:34.000000000 +0100
-+++ merlin-0.6.7~b1/example.conf	2010-03-08 17:01:54.000000000 +0100
++++ merlin-0.6.7~b1/example.conf	2010-03-09 13:01:14.000000000 +0100
 @@ -3,7 +3,7 @@
  #
  # Default options have been commented out
@@ -41,7 +41,7 @@
  	# The database parameters are taken from "database" section if such
  	# a section exists.
 -	import_program = php @@DESTDIR@@/import.php;
-+	import_program = php /usr/share/merlin/import.php;
++	import_program = php /usr/lib/merlin/import.php;
  
  	# port to listen to. 15551 is default. This is a daemon
  	# specific config setting, as the module never listens to

Modified: merlin/trunk/debian/patches/database.dpatch
===================================================================
--- merlin/trunk/debian/patches/database.dpatch	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/patches/database.dpatch	2010-03-09 12:13:39 UTC (rev 1843)
@@ -2,7 +2,7 @@
 ## database.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: removes drop table statements
 
 @DPATCH@
 diff -urNad merlin-0.6.7~b1~/db.sql merlin-0.6.7~b1/db.sql

Modified: merlin/trunk/debian/patches/install-script.dpatch
===================================================================
--- merlin/trunk/debian/patches/install-script.dpatch	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/patches/install-script.dpatch	2010-03-09 12:13:39 UTC (rev 1843)
@@ -2,13 +2,13 @@
 ## install-script.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: installes into the right directories
 
 @DPATCH@
 diff -urNad merlin-0.6.7~b1~/install-merlin.sh merlin-0.6.7~b1/install-merlin.sh
 --- merlin-0.6.7~b1~/install-merlin.sh	2010-02-24 13:40:34.000000000 +0100
-+++ merlin-0.6.7~b1/install-merlin.sh	2010-03-08 16:12:24.000000000 +0100
-@@ -142,21 +142,33 @@
++++ merlin-0.6.7~b1/install-merlin.sh	2010-03-09 13:07:32.000000000 +0100
+@@ -142,21 +142,34 @@
  	done
  	test "$missing" && abort "Essential files are missing. Perhaps you need to run 'make'?"
  
@@ -46,8 +46,9 @@
 +	#macro_subst "$src_dir/import.php" > "$root_path/$dest_dir/import.php"
 +	#macro_subst "$src_dir/object_importer.inc.php" > "$root_path/$dest_dir/object_importer.inc.php"
 +	macro_subst "$src_dir/example.conf" > "$root_path/usr/share/merlin/dpkg/merlin.conf"
-+	macro_subst "$src_dir/import.php" > "$root_path/usr/share/merlin/import.php"
-+	macro_subst "$src_dir/object_importer.inc.php" > "$root_path/usr/share/merlin/object_importer.inc.php"
++	macro_subst "$src_dir/import.php" > "$root_path/usr/lib/merlin/import.php"
++	chmod 755 "$root_path/usr/lib/merlin/import.php"
++	macro_subst "$src_dir/object_importer.inc.php" > "$root_path/usr/lib/merlin/object_importer.inc.php"
 +	#for f in merlind import.php install-merlin.sh init.sh; do
 +	#	chmod 755 "$root_path/$dest_dir/$f"
 +	#done

Modified: merlin/trunk/debian/patches/makefile.dpatch
===================================================================
--- merlin/trunk/debian/patches/makefile.dpatch	2010-03-08 18:08:49 UTC (rev 1842)
+++ merlin/trunk/debian/patches/makefile.dpatch	2010-03-09 12:13:39 UTC (rev 1843)
@@ -2,7 +2,7 @@
 ## makefile.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: changes install target script arguments
 
 @DPATCH@
 diff -urNad merlin-0.6.7~b1~/Makefile merlin-0.6.7~b1/Makefile

Added: merlin/trunk/debian/patches/spelling-error.dpatch
===================================================================
--- merlin/trunk/debian/patches/spelling-error.dpatch	                        (rev 0)
+++ merlin/trunk/debian/patches/spelling-error.dpatch	2010-03-09 12:13:39 UTC (rev 1843)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## spelling-error.dpatch by Hendrik Frenzel <hfrenzel at scunc.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fixed spelling error
+
+ at DPATCH@
+diff -urNad merlin-0.6.7~b1~/daemon.c merlin-0.6.7~b1/daemon.c
+--- merlin-0.6.7~b1~/daemon.c	2010-02-24 13:40:34.000000000 +0100
++++ merlin-0.6.7~b1/daemon.c	2010-03-09 12:56:06.000000000 +0100
+@@ -515,7 +515,7 @@
+ 
+ 	result = ipc_init();
+ 	if (result < 0) {
+-		printf("Failed to initalize ipc socket: %s\n", strerror(errno));
++		printf("Failed to initialize ipc socket: %s\n", strerror(errno));
+ 		return 1;
+ 	}
+ 	if (net_init() < 0) {


Property changes on: merlin/trunk/debian/patches/spelling-error.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Added: merlin/trunk/debian/watch
===================================================================
--- merlin/trunk/debian/watch	                        (rev 0)
+++ merlin/trunk/debian/watch	2010-03-09 12:13:39 UTC (rev 1843)
@@ -0,0 +1,10 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+#http://www.op5.org/community/projects/merlin merlin-(.*)\.tar\.gz
+

More information about the Pkg-nagios-changes mailing list