r26576 - in /trunk/libnagios-object-perl/debian: ./ patches/

ghostbar-guest at users.alioth.debian.org ghostbar-guest at users.alioth.debian.org
Sun Nov 2 18:04:03 UTC 2008


Author: ghostbar-guest
Date: Sun Nov  2 18:03:59 2008
New Revision: 26576

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26576
Log:
* Switched to debhelper v7, updated debian/rules, debian/compat and debhelper
dependency on debian/control to >= 7.
* debian/copyright: Updated formatting.
* Refreshed patches and deleted 
fix-accidental-inclusion-of-wip-code-in-manpage, applied from upstream.
* debian/control: Added me as uploader.
* releasing 0.20-1


Removed:
    trunk/libnagios-object-perl/debian/patches/fix-accidental-inclusion-of-wip-code-in-manpage
Modified:
    trunk/libnagios-object-perl/debian/changelog
    trunk/libnagios-object-perl/debian/compat
    trunk/libnagios-object-perl/debian/control
    trunk/libnagios-object-perl/debian/copyright
    trunk/libnagios-object-perl/debian/patches/add-useful-whatis-entry-for-manpages
    trunk/libnagios-object-perl/debian/patches/mention-version-3-in-man-pages
    trunk/libnagios-object-perl/debian/patches/series
    trunk/libnagios-object-perl/debian/patches/use-correct-path-to-status.dat
    trunk/libnagios-object-perl/debian/patches/work-with-nagios-3
    trunk/libnagios-object-perl/debian/rules
    trunk/libnagios-object-perl/debian/watch

Modified: trunk/libnagios-object-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/changelog?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/changelog (original)
+++ trunk/libnagios-object-perl/debian/changelog Sun Nov  2 18:03:59 2008
@@ -1,8 +1,15 @@
-libnagios-object-perl (0.20-1) UNRELEASED; urgency=low
+libnagios-object-perl (0.20-1) unstable; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
+  * Switched to debhelper v7, updated debian/rules, debian/compat and debhelper
+  dependency on debian/control to >= 7.
+  * debian/copyright: Updated formatting.
+  * Refreshed patches and deleted 
+  fix-accidental-inclusion-of-wip-code-in-manpage, applied from upstream.
+  * debian/control:
+   + Added me as uploader.
 
- -- Jose Luis Rivas <ghostbar38 at gmail.com>  Sun, 02 Nov 2008 12:39:18 -0430
+ -- Jose Luis Rivas <ghostbar38 at gmail.com>  Sun, 02 Nov 2008 13:27:41 -0430
 
 libnagios-object-perl (0.14-2) unstable; urgency=low
 

Modified: trunk/libnagios-object-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/compat?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/compat (original)
+++ trunk/libnagios-object-perl/debian/compat Sun Nov  2 18:03:59 2008
@@ -1,1 +1,1 @@
-5
+7

Modified: trunk/libnagios-object-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/control?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/control (original)
+++ trunk/libnagios-object-perl/debian/control Sun Nov  2 18:03:59 2008
@@ -2,8 +2,9 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Ryan Niebur <ryanryan52 at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, perl (>= 5.8.0-7), libmodule-build-perl
+Uploaders: Ryan Niebur <ryanryan52 at gmail.com>,
+ Jose Luis Rivas <ghostbar38 at gmail.com>
+Build-Depends: debhelper (>= 7), quilt, perl (>= 5.8.0-7), libmodule-build-perl
 Build-Depends-Indep: libtest-exception-perl
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnagios-object-perl/

Modified: trunk/libnagios-object-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/copyright?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/copyright (original)
+++ trunk/libnagios-object-perl/debian/copyright Sun Nov  2 18:03:59 2008
@@ -1,27 +1,31 @@
-This package was debianized by Randrianiriana S. Thierry <randrianiriana at gmail.com> on
-Mon, 25 Sep 2006 11:01:55 +0300.
+Format-Specification: 
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Author: Albert P Tobey <tobeya at cpan.org>
+Upstream-Name: Nagios-Object
+Original-Source-Location: http://search.cpan.org/dist/Nagios-Object/
+Original-Source-Command: uscan --force-download
+Original-Source-Depends: devscripts
 
-It was downloaded from http://search.cpan.org/~tobeya/Nagios-Object/
+Files: *
+Copyright: © 2003-2006 Albert P Tobey <tobeya at cpan.org>
+License: GPL-2+
+ This program 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.
 
-Upstream Author: Albert P Tobey <tobeya at cpan.org>
+ This program 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.
 
-Copyright (C) 2003-2006 by Albert P Tobey.
+ 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.
 
-License:
+Files: debian/*
+Copyright: © 2006, Randrianiriana S. Thierry <randrianiriana at gmail.com>
+License: GPL-2+
 
-  This program 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 program 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.
-
-The Debian packaging is (C) 2006, Randrianiriana S. Thierry <randrianiriana at gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.

Modified: trunk/libnagios-object-perl/debian/patches/add-useful-whatis-entry-for-manpages
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/patches/add-useful-whatis-entry-for-manpages?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/patches/add-useful-whatis-entry-for-manpages (original)
+++ trunk/libnagios-object-perl/debian/patches/add-useful-whatis-entry-for-manpages Sun Nov  2 18:03:59 2008
@@ -1,6 +1,6 @@
 --- a/lib/Nagios/Config.pm
 +++ b/lib/Nagios/Config.pm
-@@ -29,7 +29,7 @@
+@@ -31,7 +31,7 @@
  
  =head1 NAME
  
@@ -11,7 +11,7 @@
  
 --- a/lib/Nagios/Object.pm
 +++ b/lib/Nagios/Object.pm
-@@ -309,7 +309,7 @@
+@@ -303,7 +303,7 @@
  
  =head1 NAME
  
@@ -22,7 +22,7 @@
  
 --- a/lib/Nagios/Object/Config.pm
 +++ b/lib/Nagios/Object/Config.pm
-@@ -26,7 +26,7 @@
+@@ -28,7 +28,7 @@
  
  =head1 NAME
  
@@ -33,7 +33,7 @@
  
 --- a/lib/Nagios/StatusLog.pm
 +++ b/lib/Nagios/StatusLog.pm
-@@ -84,7 +84,7 @@
+@@ -86,7 +86,7 @@
  
  =head1 NAME
  

Modified: trunk/libnagios-object-perl/debian/patches/mention-version-3-in-man-pages
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/patches/mention-version-3-in-man-pages?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/patches/mention-version-3-in-man-pages (original)
+++ trunk/libnagios-object-perl/debian/patches/mention-version-3-in-man-pages Sun Nov  2 18:03:59 2008
@@ -1,6 +1,6 @@
 --- a/lib/Nagios/Config.pm
 +++ b/lib/Nagios/Config.pm
-@@ -58,6 +58,7 @@
+@@ -60,6 +60,7 @@
   my $cf = Nagios::Config->new( Filename => $configfile );
   my $cf = Nagios::Config->new( Filename => $configfile, Version => 1 );
   my $cf = Nagios::Config->new( Filename => $configfile, Version => 2 );
@@ -10,7 +10,7 @@
  
 --- a/lib/Nagios/Object/Config.pm
 +++ b/lib/Nagios/Object/Config.pm
-@@ -41,6 +41,7 @@
+@@ -43,6 +43,7 @@
  Create a new configuration object.  If Version is not specified, the already weak
  validation will be weakened further to allow mixing of Nagios 1.0 and 2.0 configurations.
  For now, the minor numbers of Version are ignored.  Do not specify any letters as in '2.0a1'.

Modified: trunk/libnagios-object-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/patches/series?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/patches/series (original)
+++ trunk/libnagios-object-perl/debian/patches/series Sun Nov  2 18:03:59 2008
@@ -2,4 +2,3 @@
 work-with-nagios-3
 use-correct-path-to-status.dat
 add-useful-whatis-entry-for-manpages
-fix-accidental-inclusion-of-wip-code-in-manpage

Modified: trunk/libnagios-object-perl/debian/patches/use-correct-path-to-status.dat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/patches/use-correct-path-to-status.dat?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/patches/use-correct-path-to-status.dat (original)
+++ trunk/libnagios-object-perl/debian/patches/use-correct-path-to-status.dat Sun Nov  2 18:03:59 2008
@@ -1,6 +1,6 @@
 --- a/lib/Nagios/StatusLog.pm
 +++ b/lib/Nagios/StatusLog.pm
-@@ -94,7 +94,7 @@
+@@ -96,7 +96,7 @@
  Version => 3.0 parameter to new() for Nagios version 3.x logs.
  
   my $log = Nagios::StatusLog->new(
@@ -9,7 +9,7 @@
                  Version  => 1.0
             );
   $localhost = $log->host( "localhost" );
-@@ -104,13 +104,13 @@
+@@ -106,13 +106,13 @@
  
   # for Nagios v2.0
   my $log = Nagios::StatusLog->new(

Modified: trunk/libnagios-object-perl/debian/patches/work-with-nagios-3
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/patches/work-with-nagios-3?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/patches/work-with-nagios-3 (original)
+++ trunk/libnagios-object-perl/debian/patches/work-with-nagios-3 Sun Nov  2 18:03:59 2008
@@ -1,6 +1,6 @@
 --- a/lib/Nagios/StatusLog.pm
 +++ b/lib/Nagios/StatusLog.pm
-@@ -28,18 +28,36 @@
+@@ -30,18 +30,36 @@
          Service => [qw(
              host_name description status current_attempt state_type last_check next_check check_type checks_enabled accept_passive_service_checks event_handler_enabled last_state_change problem_has_been_acknowledged last_hard_state time_ok time_unknown time_warning time_critical last_notification current_notification_number notifications_enabled latency execution_time flap_detection_enabled is_flapping percent_state_change scheduled_downtime_depth failure_prediction_enabled process_performance_data obsess_over_service plugin_output
              service_description modified_attributes check_command event_handler has_been_checked should_be_scheduled check_execution_time check_latency current_state max_attempts last_hard_state_change last_time_ok last_time_warning last_time_unknown last_time_critical performance_data next_notification no_more_notifications active_checks_enabled passive_checks_enabled acknowledgement_type last_update 
@@ -38,7 +38,7 @@
      );
  
      GENESIS: {
-@@ -72,7 +90,8 @@
+@@ -74,7 +92,8 @@
  
  Reads the Nagios status log and returns ::Status objects that can
  be used to get status information about a host.   For Nagios version 2.x logs,
@@ -48,7 +48,7 @@
  
   my $log = Nagios::StatusLog->new(
                  Filename => "/var/opt/nagios/status.log",
-@@ -89,6 +108,12 @@
+@@ -91,6 +110,12 @@
                  Version  => 2.0
             );
  
@@ -61,7 +61,7 @@
  =head1 METHODS
  
  =over 4
-@@ -123,12 +148,17 @@
+@@ -125,12 +150,17 @@
      }
  
      my $self = bless( {
@@ -85,7 +85,7 @@
      }, $type );
  
      $self->update();
-@@ -144,7 +174,9 @@
+@@ -146,7 +176,9 @@
  
  sub update {
      my $self = shift;
@@ -96,7 +96,7 @@
          return $self->update_v2( @_ );
      }
      return $self->update_v1( @_ );
-@@ -298,6 +330,97 @@
+@@ -300,6 +332,97 @@
      1;
  }
  

Modified: trunk/libnagios-object-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/rules?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/rules (original)
+++ trunk/libnagios-object-perl/debian/rules Sun Nov  2 18:03:59 2008
@@ -1,71 +1,25 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 include /usr/share/quilt/quilt.make
 
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP     =`pwd`/debian/$(PACKAGE)
-
-configure: configure-stamp
-
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-	$(PERL) Build.PL --installdirs vendor destdir=$(TMP) --install_path script=temp --install_path bin=temp --install_path bindoc=temp
-	touch configure-stamp
-
 build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	./Build
-	./Build test
-
+build-stamp: $(QUILT_STAMPFN)
+	dh build
 	touch $@
 
 clean: unpatch
-	dh_testdir
-	dh_testroot
-	[ ! -f Build ] || ./Build distclean
-	rm -rf build-stamp Build _build blib
-	dh_clean configure-stamp build-stamp
+	dh $@
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+install: install-stamp
+install-stamp: build-stamp
+	dh install
+	touch $@
 
-	./Build install PREFIX=$(TMP)/usr
-	rm -fr $(TMP)/temp
+binary-arch:
 
-# Build architecture-dependent files here.
-binary-arch:;
+binary-indep: install
+	dh $@
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb --destdir=$(DESTDIR)
+binary: binary-arch binary-indep
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: binary binary-arch binary-indep install clean build

Modified: trunk/libnagios-object-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/watch?rev=26576&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/watch (original)
+++ trunk/libnagios-object-perl/debian/watch Sun Nov  2 18:03:59 2008
@@ -1,3 +1,2 @@
 version=3
-
 http://search.cpan.org/dist/Nagios-Object/   .*/Nagios-Object-v?(\d[\d_.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)




More information about the Pkg-perl-cvs-commits mailing list