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,11 @@ +nagios-statd (3.12-1.1ubuntu1) natty; urgency=low + + * debian/patches/use-python2.5.diff, dropped since Ubuntu not using + python2.5. (LP: #708128) + * debian/contol, change python2.5 -> python2.7. + + -- Mahyuddin Susanto Fri, 28 Jan 2011 23:36:15 +0700 + 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 @@ -1,14 +1,15 @@ Source: nagios-statd Section: net Priority: optional -Maintainer: Jason Thomas +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Jason Thomas 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 +20,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 -