tags 629792 patch
thanks
Hi,
Now python2.5 is obsolete and use 2.7 is good.
Just replace s/2.5/2.7/ seems to be enough, and Bug#605784 is not reproducible
in my test environment.
Anyway, please check attached patch, thanks.
--
Regards,
Hideki Yamane henrich @ debian.or.jp/org
http://wiki.debian.org/HidekiYamane
diff -u nagios-statd-3.12/debian/changelog nagios-statd-3.12/debian/changelog
--- nagios-statd-3.12/debian/changelog
+++ nagios-statd-3.12/debian/changelog
@@ -1,3 +1,14 @@
+nagios-statd (3.12-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control
+ - Build-Depends: python2.7 (Closes: #629792)
+ - Depends: python2.7
+ * debian/patches
+ - convert use-python2.5.diff to use-python2.7.diff
+
+ -- Hideki Yamane <henr...@debian.org> Fri, 30 Dec 2011 12:37:04 +0900
+
nagios-statd (3.12-1.1) unstable; urgency=high
* Non-maintainer upload.
diff -u nagios-statd-3.12/debian/control nagios-statd-3.12/debian/control
--- nagios-statd-3.12/debian/control
+++ nagios-statd-3.12/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Jason Thomas <ja...@debian.org>
Build-Depends: debhelper (>= 4.0.0), cdbs
-Build-Depends-Indep: python2.5, help2man
+Build-Depends-Indep: python2.7, help2man
Standards-Version: 3.7.3.0
Package: nagios-statd-server
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python2.5
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.7
Conflicts: netsaint-statd-server
Replaces: netsaint-statd-server
Description: Nagios server for monitoring remote system information
@@ -19,7 +19,7 @@
Package: nagios-statd-client
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python2.5
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.7
Conflicts: netsaint-statd-plugins
Replaces: netsaint-statd-plugins
Suggests: nagios-statd-server
reverted:
--- nagios-statd-3.12/debian/patches/use-python2.5.diff
+++ nagios-statd-3.12.orig/debian/patches/use-python2.5.diff
@@ -1,18 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' nagios-statd-3.12//bin/nagios-stat nagios-statd-3.12.new//bin/nagios-stat
---- nagios-statd-3.12//bin/nagios-stat 2010-12-26 16:17:05.000000000 +0000
-+++ nagios-statd-3.12.new//bin/nagios-stat 2010-12-26 16:17:05.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.5
-
- import getopt, re, socket, sys
-
-diff -Nur -x '*.orig' -x '*~' nagios-statd-3.12//sbin/nagios-statd nagios-statd-3.12.new//sbin/nagios-statd
---- nagios-statd-3.12//sbin/nagios-statd 2010-12-26 16:17:05.000000000 +0000
-+++ nagios-statd-3.12.new//sbin/nagios-statd 2010-12-26 16:17:05.000000000 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2.5
-
- import getopt, os, sys, signal, socket, SocketServer
-
only in patch2:
unchanged:
--- nagios-statd-3.12.orig/debian/patches/use-python2.7.diff
+++ nagios-statd-3.12/debian/patches/use-python2.7.diff
@@ -0,0 +1,18 @@
+diff -Nur -x '*.orig' -x '*~' nagios-statd-3.12//bin/nagios-stat nagios-statd-3.12.new//bin/nagios-stat
+--- nagios-statd-3.12//bin/nagios-stat 2010-12-26 16:17:05.000000000 +0000
++++ nagios-statd-3.12.new//bin/nagios-stat 2010-12-26 16:17:05.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.7
+
+ import getopt, re, socket, sys
+
+diff -Nur -x '*.orig' -x '*~' nagios-statd-3.12//sbin/nagios-statd nagios-statd-3.12.new//sbin/nagios-statd
+--- nagios-statd-3.12//sbin/nagios-statd 2010-12-26 16:17:05.000000000 +0000
++++ nagios-statd-3.12.new//sbin/nagios-statd 2010-12-26 16:17:05.000000000 +0000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.7
+
+ import getopt, os, sys, signal, socket, SocketServer
+
