[Pkg-nagios-devel] nagios changelog,1.3,1.4 control,1.3,1.4 rules,1.3,1.4

seanius@haydn.debian.org seanius@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv1708

Modified Files:
	changelog control rules 
Log Message:
- changed my maintainer address to my @debian.org address
- the init script wasn't going into the package:

dpkg-deb: building package `nagios-text' in `../nagios-text_1.2-4_i386.deb'.
dpkg-deb: conffile `/etc/init.d/nagios' does not appear in package
dh_builddeb: command returned error code 512
make: *** [nagios-text] Error 1

  this should be fixed now.

- changed the debhelper depends from 4.2.22 to 4.2.21, since that's what's
  in sarge right now and there isn't anything changed between the versions
  that would affect us.
- added danish and catalan debconf translations (closes some bugs)
- changed pre-depends to depends for adduser and debconf
- made changelog entries for the last two changes



Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	31 Oct 2004 22:00:08 -0000	1.3
+++ changelog	1 Nov 2004 02:51:20 -0000	1.4
@@ -13,6 +13,11 @@
   	  he forgot all the other things where it is mentioned. And var/run fits
       better IMO).
     - Change debian/rules, first half is done, but still needs some work.
+  * Sean Finney:
+    - added danish and catalan debconf translations.  thanks go to 
+      Claus Hindsgaul and Aleix Badia i Bosch respectively.  
+      closes: #248725, #269313.
+    - adduser and debconf are now normal dependencies
 
  -- Joerg Jaspert <joerg@debian.org>  Sun, 31 Oct 2004 22:46:39 +0100
 

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	31 Oct 2004 22:00:08 -0000	1.3
+++ control	1 Nov 2004 02:51:20 -0000	1.4
@@ -2,14 +2,13 @@
 Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
-Uploaders: Joerg Jaspert <joerg@debian.org>, Jeremy T. Bouse" <jbouse@debian.org>, Tony Mancill <tony@mancill.com>, Sean Finney <seanius@seanius.net>, Martin F. Krafft <madduck@debian.org>
+Uploaders: Joerg Jaspert <joerg@debian.org>, Jeremy T. Bouse" <jbouse@debian.org>, Tony Mancill <tony@mancill.com>, Sean Finney <seanius@debian.org>, Martin F. Krafft <madduck@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.2.22), dpatch (>= 2.0.10), libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping, postgresql-dev (>= 7.2), libmysqlclient10-dev
+Build-Depends: debhelper (>= 4.2.21), dpatch (>= 2.0.10), libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping, postgresql-dev (>= 7.2), libmysqlclient10-dev
 
 Package: nagios-text
 Architecture: any
-Pre-Depends: adduser, debconf
-Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), ucf
+Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), ucf, adduser, debconf
 Conflicts: netsaint, nagios
 Replaces: netsaint, nagios
 Provides: nagios
@@ -36,8 +35,7 @@
 
 Package: nagios-pgsql
 Architecture: any
-Pre-Depends: adduser, debconf
-Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, nagios-plugins (>= 1.3.1.0-6), ucf
+Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, nagios-plugins (>= 1.3.1.0-6), ucf, adduser, debconf
 Conflicts: netsaint, nagios
 Replaces: netsaint, nagios
 Provides: nagios
@@ -64,8 +62,7 @@
 
 Package: nagios-mysql
 Architecture: any
-Pre-Depends: adduser, debconf
-Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, nagios-plugins (>= 1.3.1.0-6), ucf
+Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, nagios-plugins (>= 1.3.1.0-6), ucf, adduser, debconf
 Conflicts: netsaint, nagios
 Replaces: netsaint, nagios
 Provides: nagios

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules	31 Oct 2004 22:00:08 -0000	1.3
+++ rules	1 Nov 2004 02:51:20 -0000	1.4
@@ -57,6 +57,7 @@
 	-rm -Rf {cgi,base}/*.mysql {cgi,base}/*.pgsql {cgi,base}/*.text
 	-rm {patch,patch-no-defaults,install,configure,build}-stamp
 	-rm debian/templates.merged
+	-rm debian/nagios-{text,mysql,pgsql}.nagios.init
 
 	dh_clean
 
@@ -127,7 +128,13 @@
 	touch binary-nagios-mysql-stamp
 
 binary-indep: 
-# We have nothing to do by default.
+	# install the same initscript in each package dir
+	for pkg in text pgsql mysql; do \
+		cp debian/init.d debian/nagios-$$pkg.nagios.init; \
+	done    
+	dh_installinit -a --name nagios
+
+		
 
 build: build-stamp
 build-stamp: patch binary-nagios-text binary-nagios-pgsql binary-nagios-mysql
@@ -296,8 +303,8 @@
 # Add stuff for dpatch (2.x way)
 patch: patch-stamp
 patch-stamp:
-	dpatch --with-cpp apply-all
-	dpatch --with-cpp cat-all >patch-stamp
+	dpatch  --with-cpp apply-all
+	dpatch  --with-cpp cat-all >patch-stamp 
 
 unpatch:
 	dpatch --with-cpp deapply-all