This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository liberror-perl.
commit 5c2b89c964c15f1fc6ade20e9c742fcdf1f68960
Merge: 8d9d2f2 de406aa
Author: Luk Claes <luk.cl...@ugent.be>
Date: Fri Nov 5 16:56:55 2004 +0100
Imported Debian patch 0.15-6
ChangeLog | 66 +++++++++++++---------
Error.pm | 35 +++++++-----
Error.ppd | 2 +-
README | 55 +++++++++++++++++-
debian/README.Debian | 6 --
debian/changelog | 56 +++++++++++++++++--
debian/compat | 1 +
debian/control | 22 +++++---
debian/copyright | 5 +-
debian/liberror-perl.docs | 1 +
debian/liberror-perl.install | 1 +
debian/rules | 129 +++++++++++++++++--------------------------
debian/watch | 3 +
13 files changed, 246 insertions(+), 136 deletions(-)
diff --cc Error.pm
index 2683332,cc9edbb..dbf3a8b
--- a/Error.pm
+++ b/Error.pm
@@@ -267,6 -269,6 +269,7 @@@ use vars qw(@EXPORT_OK @ISA %EXPORT_TAG
sub run_clauses ($$$\@) {
my($clauses,$err,$wantarray,$result) = @_;
my $code = undef;
++ local $Error::THROWN = undef;
$err = new Error::Simple($err) unless ref($err);
@@@ -483,15 -487,15 +488,15 @@@ Error - Error/exception handling in an
try {
do_some_stuff();
die "error!" if $condition;
-- throw Error::Simple -text => "Oops!" if $other_condition;
++ throw Error::Simple \-text => "Oops!" if $other_condition;
}
catch Error::IO with {
my $E = shift;
-- print STDERR "File ", $E->{'-file'}, " had a problem\n";
++ print STDERR "File ", $E->{'\-file'}, " had a problem\n";
}
except {
my $E = shift;
-- my $general_handler=sub {send_message $E->{-description}};
++ my $general_handler=sub {send_message $E->{\-description}};
return {
UserException1 => $general_handler,
UserException2 => $general_handler
@@@ -588,11 -592,11 +593,11 @@@ with the arguments that are passed to i
that are used by, or are retrievable by the C<Error> class are listed
below, other classes may add to these.
-- -file
-- -line
-- -text
-- -value
-- -object
++ \-file
++ \-line
++ \-text
++ \-value
++ \-object
If C<-file> or C<-line> are not specified in the constructor arguments
then these will be initialized with the file name and line number where
diff --cc debian/changelog
index c21acc6,0000000..ec7a065
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,0 +1,76 @@@
++liberror-perl (0.15-6) unstable; urgency=low
++
++ * debian/watch: added
++ * Error.pm: - as minus sign for manpage
++
++ -- Luk Claes <luk.cl...@ugent.be> Fri, 5 Nov 2004 16:56:55 +0100
++
++liberror-perl (0.15-5) unstable; urgency=low
++
++ * New maintainer (closes: #210217)
++
++ -- Luk Claes <luk.cl...@ugent.be> Wed, 10 Sep 2003 14:43:36 +0200
++
++liberror-perl (0.15-4) unstable; urgency=low
++
++ * debian/rules: overhauled completely
++ * debian/rules: moved debhelper compatibility level setting to
++ 'debian/compat' per latest debhelper best practices
++ * debian/rules: upgraded to debhelper v4
++ * debian/control: overhauled completely
++ * debian/control: changed build dependency on 'debhelper' to '(>= 4.1)'
++ * debian/control: updated sections according to latest archive changes:
++ - 'liberror-perl' from 'interpreters' to 'perl'
++ * debian/control: updated short description and long description
++ * debian/control: upgraded to Debian Policy 3.6.0 (no changes)
++
++ -- Ardo van Rangelrooij <a...@debian.org> Sat, 6 Sep 2003 16:54:47 -0500
++
++liberror-perl (0.15-3) unstable; urgency=low
++
++ * New maintainer
++ (closes: Bug#206881)
++ - no other changes yet
++
++ -- Ardo van Rangelrooij <a...@debian.org> Sun, 24 Aug 2003 19:24:10 -0500
++
++liberror-perl (0.15-2) unstable; urgency=low
++
++ * Include pointer to the perl licenses even if upstream doesn't
++ include them in the source (closes: bug#157579).
++ * Build package in binary-indep (closes: bug#157476).
++ * Included fix for bug in otherwise clause (closes: bug#180784).
++ * Changed section.
++
++ -- Paolo Molaro <lu...@debian.org> Sun, 8 Jun 2003 15:31:26 +0200
++
++liberror-perl (0.15-1) unstable; urgency=low
++
++ * New upstream release (Closes: bug#136365, bug#150105).
++
++ -- Paolo Molaro <lu...@debian.org> Sat, 6 Jul 2002 16:15:06 +0200
++
+liberror-perl (0.13-2) unstable; urgency=low
+
+ * Package cleanup.
+ * Updated to the new perl and debian policy.
+
+ -- Paolo Molaro <lu...@debian.org> Fri, 23 Feb 2001 19:34:20 +0100
+
+liberror-perl (0.13-1) unstable; urgency=low
+
+ * New upstream release (closes: #74890).
+
+ -- Paolo Molaro <lu...@debian.org> Thu, 19 Oct 2000 14:00:24 +0200
+
+liberror-perl (0.12-2) unstable; urgency=low
+
+ * Renamed the source.
+
+ -- Paolo Molaro <lu...@debian.org> Fri, 1 Oct 1999 08:58:11 +0200
+
+error (0.12-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Paolo Molaro <lu...@debian.org> Wed, 22 Sep 1999 14:33:11 +0200
-
- Local variables:
- mode: debian-changelog
- End:
diff --cc debian/compat
index 0000000,0000000..b8626c4
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++4
diff --cc debian/control
index fa9c0be,0000000..6f6f1ea
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,14 -1,0 +1,20 @@@
+Source: liberror-perl
- Section: interpreters
++Section: perl
+Priority: optional
- Build-Depends: debhelper (>= 3.0.5), perl (>= 5.6.0-18)
- Maintainer: Paolo Molaro <lu...@debian.org>
- Standards-Version: 3.5.1
++Maintainer: Luk Claes <luk.cl...@ugent.be>
++Standards-Version: 3.6.1
++Build-Depends-Indep: debhelper (>= 4.1), perl
+
+Package: liberror-perl
++Section: perl
++Priority: optional
+Architecture: all
+Depends: ${perl:Depends}
- Description: Exception module for Perl
- This is a Perl module that allows the use of exceptions
- in perl code with some syntactic sugar.
-
++Description: Perl module for error/exception handling in an OO-ish way
++ This module provides two interfaces. Firstly "Error" provides a
++ procedural interface to exception handling. Secondly "Error" is a
++ base class for errors/exceptions that can either be thrown, for
++ subsequent catch, or can simply be recorded.
++ .
++ Errors in the class "Error" should not be thrown directly, but the
++ user should throw errors from a sub-class of "Error".
diff --cc debian/copyright
index 02a1a99,0000000..de3e0e0
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,18 -1,0 +1,21 @@@
+This package was debianized by Paolo Molaro <lu...@debian.org> on
+Wed, 22 Sep 1999 14:33:11 +0200.
+
+It was downloaded from a CPAN mirror.
+
- Upstream Author(s): Graham Barr <gb...@ti.com> and others.
++Upstream Authors: Graham Barr <gb...@ti.com> and others.
+
+Copyright:
+
+# Copyright (c) 1995 Graham Barr <gb...@ti.com>. All rights reserved.
+# This program is free software; you can redistribute it and/or
+# modify it under the same terms as Perl itself.
+#
+# Based on my original Error.pm, and Exceptions.pm by Peter Seibel
+# <pe...@weblogic.com> and adapted by Jesse Glick <jgl...@sig.bsh.com>.
+#
+# but modified ***significantly***
+
++You can find the distribution terms for perl in /usr/share/doc/perl/copyright
++and the actual licenses in /usr/share/common-licenses/Artistic and
++/usr/share/common-licenses/GPL.
diff --cc debian/liberror-perl.docs
index 0000000,0000000..e845566
new file mode 100644
--- /dev/null
+++ b/debian/liberror-perl.docs
@@@ -1,0 -1,0 +1,1 @@@
++README
diff --cc debian/liberror-perl.install
index 0000000,0000000..dd222db
new file mode 100644
--- /dev/null
+++ b/debian/liberror-perl.install
@@@ -1,0 -1,0 +1,1 @@@
++usr/share
diff --cc debian/rules
index f6cbbcc,0000000..08de792
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,85 -1,0 +1,60 @@@
+#!/usr/bin/make -f
- #-*- makefile -*-
- # Made with the aid of dh_make, by Craig Small
- # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
- # Some lines taken from debmake, by Christoph Lameter.
++## ----------------------------------------------------------------------
++## debian/rules : package script for liberror-perl
++## ----------------------------------------------------------------------
+
- # Uncomment this to turn on verbose mode.
++## ----------------------------------------------------------------------
++## uncomment this to turn on verbose mode
+#export DH_VERBOSE=1
- export DH_COMPAT=3
+
- ifndef PERL
- PERL = /usr/bin/perl
- endif
++## ----------------------------------------------------------------------
++TMP_DIR = debian/tmp
+
- TMP =`pwd`/debian/liberror-perl
-
- build: build-stamp
- build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) CFLAGS="-O2 -g -Wall"
-
- touch build-stamp
++## ----------------------------------------------------------------------
++## targets
+
+clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
- -rm -f Makefile.old
-
- dh_clean
-
- install: install-stamp
- install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
++ dh_testdir
++ dh_testroot
++ [ ! -f Makefile ] || $(MAKE) realclean
++ dh_clean
++ rm -f build-stamp install-stamp
+
- # Add here commands to install the package into debian/tmp.
- #$(MAKE) install DESTDIR=`pwd`/debian/tmp
- $(MAKE) pure_install PREFIX=$(TMP)/usr
-
- touch install-stamp
-
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
-
- # Build architecture-dependent files here.
- binary-arch: build install
- # dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installexamples
- dh_installmenu
- # dh_installemacsen
- # dh_installinit
- dh_installcron
- dh_installmanpages
- # dh_undocumented
- dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- # dh_makeshlibs
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary
++build: build-stamp
++build-stamp:
++ dh_testdir
++ perl Makefile.PL INSTALLDIRS=vendor
++ $(MAKE) OPTIMIZE="-O2 -g -Wall"
++ $(MAKE) test
++ touch build-stamp
++
++install: install-stamp
++install-stamp: build
++ dh_testdir
++ dh_testroot
++ dh_clean -k
++ dh_installdirs
++ $(MAKE) install PREFIX=$(PWD)/$(TMP_DIR)/usr
++ touch install-stamp
++
++binary-indep: build install
++ dh_testdir
++ dh_testroot
++ dh_install --sourcedir=$(TMP_DIR)
++ dh_installdocs
++ dh_installchangelogs ChangeLog
++ dh_compress
++ dh_fixperms
++ dh_installdeb
++ dh_perl
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
++
++binary-arch:
++
++binary: binary-indep binary-arch
++
++.PHONY: clean build install binary-indep binary-arch binary
++
++## ----------------------------------------------------------------------
diff --cc debian/watch
index 0000000,0000000..85ec6cf
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,3 @@@
++version=2
++
++http://cpan.org/modules/by-category/02_Perl_Core_Modules/Error/UARUN/Error-(.*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/liberror-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
