[Pkg-nagios-changes] [pkg-nagios] r957 - in nagios2/trunk/debian: . patches

[Marc Haber]

Author: zugschlus
Date: 2006-06-26 14:01:29 +0000 (Mon, 26 Jun 2006)
New Revision: 957

Added:
   nagios2/trunk/debian/patches/10_p1_pl_shebang.dpatch
Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/control
   nagios2/trunk/debian/patches/00list
   nagios2/trunk/debian/rules
Log:
  * Add dh_perl invocation to debian/rules
  * Add #!/usr/bin/perl to p1.pl to properly generate perl dependency.



Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-06-13 22:27:56 UTC (rev 956)
+++ nagios2/trunk/debian/changelog	2006-06-26 14:01:29 UTC (rev 957)
@@ -6,8 +6,10 @@
     symlinks fixing the issue mentioned by Herbert Straub. Closes: #358922.
   * remove _ from Default: false in boolean template.
     Thanks to Christian Perrier. (mh) Closes: #371200
+  * Add dh_perl invocation to debian/rules
+  * Add #!/usr/bin/perl to p1.pl to properly generate perl dependency.
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Wed,  7 Jun 2006 22:35:07 +0200
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Mon, 26 Jun 2006 14:00:16 +0000
 
 nagios2 (2.4-1) unstable; urgency=low
 

Modified: nagios2/trunk/debian/control
===================================================================
--- nagios2/trunk/debian/control	2006-06-13 22:27:56 UTC (rev 956)
+++ nagios2/trunk/debian/control	2006-06-26 14:01:29 UTC (rev 957)
@@ -8,7 +8,7 @@
 
 Package: nagios2-common
 Architecture: all
-Depends: nagios-plugins-basic, nagios2-doc, coreutils (>= 4.5.3), apache2 | httpd, mailx, adduser, lsb-base (>= 3.0-3), ucf, ${misc:Depends}
+Depends: nagios-plugins-basic, nagios2-doc, coreutils (>= 4.5.3), apache2 | httpd, mailx, adduser, lsb-base (>= 3.0-3), ucf, ${misc:Depends}, ${perl:Depends}
 Recommends: nagios-plugins, nagios-images (>> 0.1)
 Description: support files for nagios2
  Nagios is a monitoring and management system for hosts, services and
@@ -37,7 +37,7 @@
 
 Package: nagios2
 Architecture: any
-Depends: ${shlibs:Depends}, nagios2-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, nagios2-common (= ${Source-Version}), ${perl:Depends}
 Suggests: nagios-nrpe-plugin
 Description: A host/service/network monitoring and management system
  Nagios is a monitoring and management system for hosts, services and
@@ -68,7 +68,7 @@
 Package: nagios2-doc
 Section: doc
 Architecture: all
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${perl:Depends}
 Description: documentation for nagios2
  Nagios is a monitoring and management system for hosts, services and
  networks.
@@ -98,7 +98,7 @@
 Package: nagios2-dbg
 Section: extra
 Architecture: any
-Depends: nagios2 (= ${Source-Version})
+Depends: nagios2 (= ${Source-Version}), ${perl:Depends}
 Description: debugging symbols for nagios2
  Nagios is a monitoring and management system for hosts, services and
  networks.

Modified: nagios2/trunk/debian/patches/00list
===================================================================
--- nagios2/trunk/debian/patches/00list	2006-06-13 22:27:56 UTC (rev 956)
+++ nagios2/trunk/debian/patches/00list	2006-06-26 14:01:29 UTC (rev 957)
@@ -0,0 +1 @@
+10_p1_pl_shebang.dpatch

Added: nagios2/trunk/debian/patches/10_p1_pl_shebang.dpatch
===================================================================
--- nagios2/trunk/debian/patches/10_p1_pl_shebang.dpatch	2006-06-13 22:27:56 UTC (rev 956)
+++ nagios2/trunk/debian/patches/10_p1_pl_shebang.dpatch	2006-06-26 14:01:29 UTC (rev 957)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_p1_pl_shebang.dpatch by Marc Haber <mh+debian-packages at zugschlus.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/p1.pl trunk/p1.pl
+--- trunk~/p1.pl	2006-03-21 23:32:46.000000000 +0000
++++ trunk/p1.pl	2006-06-26 13:55:35.000000000 +0000
+@@ -1,3 +1,5 @@
++#!/usr/bin/perl
++
+  package Embed::Persistent;
+ 
+ # p1.pl for Nagios 2.0


Property changes on: nagios2/trunk/debian/patches/10_p1_pl_shebang.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-06-13 22:27:56 UTC (rev 956)
+++ nagios2/trunk/debian/rules	2006-06-26 14:01:29 UTC (rev 957)
@@ -172,6 +172,7 @@
 	dh_compress          -a
 	dh_fixperms          -a -X/var/cache/nagios2
 	dh_installdeb        -a
+	dh_perl		     -a
 	dh_shlibdeps         -a
 	dh_gencontrol        -a
 	dh_makeshlibs        -a -V
@@ -185,6 +186,7 @@
 	dh_compress          -i
 	dh_fixperms          -i -Xnagios2/resource.cfg
 	dh_installdebconf    -i
+	dh_perl		     -i
 	dh_installdeb        -i
 	dh_gencontrol        -i
 	dh_md5sums           -i