r45920 - in /trunk/libcarp-clan-perl: Changes MANIFEST META.yml README debian/changelog debian/compat debian/control debian/copyright debian/rules lib/Carp/Clan.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Oct 17 14:18:59 UTC 2009
Author: jawnsy-guest
Date: Sat Oct 17 14:18:53 2009
New Revision: 45920
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45920
Log:
* New upstream release
* Standards-Version 3.8.3 (no changes)
* Added myself to Uploaders and Copyright
* Refreshed copyright to new machine readable format
* Rewrote control description
* Use new short debhelper rules format
Modified:
trunk/libcarp-clan-perl/Changes
trunk/libcarp-clan-perl/MANIFEST
trunk/libcarp-clan-perl/META.yml
trunk/libcarp-clan-perl/README
trunk/libcarp-clan-perl/debian/changelog
trunk/libcarp-clan-perl/debian/compat
trunk/libcarp-clan-perl/debian/control
trunk/libcarp-clan-perl/debian/copyright
trunk/libcarp-clan-perl/debian/rules
trunk/libcarp-clan-perl/lib/Carp/Clan.pm
Modified: trunk/libcarp-clan-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/Changes?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/Changes (original)
+++ trunk/libcarp-clan-perl/Changes Sat Oct 17 14:18:53 2009
@@ -1,17 +1,22 @@
- ====================================
- Package "Carp::Clan"
- ====================================
+ ============================
+ Package "Carp::Clan"
+ ============================
- Copyright (c) 2006-2008 by Joshua ben Jore
- All rights reserved.
+ Copyright (c) 2006-2009 by Joshua ben Jore
+ All rights reserved.
- Copyright (c) 2001 - 2004 by Steffen Beyer.
- All rights reserved.
-
+ Copyright (c) 2001-2009 by Steffen Beyer
+ All rights reserved.
Version history:
----------------
+
+Version 6.02 17.10.2009
+ + Forgot to fix the bug of duplicated prefixes in _longmsg as well
+
+Version 6.01 16.10.2009
+ + Fixed bug of duplicated prefixes (RT ticket #50560)
Version 6.00 17.02.2008
+ Oops. Fixed version number. '5.10' is less than '5.9'. I thought
Modified: trunk/libcarp-clan-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/MANIFEST?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/MANIFEST (original)
+++ trunk/libcarp-clan-perl/MANIFEST Sat Oct 17 14:18:53 2009
@@ -4,10 +4,10 @@
lib/Carp/Clan.pm
lib/Carp/Clan.pod
Makefile.PL
-MANIFEST This list of files
-META.yml
+MANIFEST
README
t/01pod.t
t/03yaml.t
t/10basic.t
t/11basic.t
+META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libcarp-clan-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/META.yml?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/META.yml (original)
+++ trunk/libcarp-clan-perl/META.yml Sat Oct 17 14:18:53 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Carp-Clan
-version: 6.00
+version: 6.02
abstract: Report errors from perspective of caller of a "clan" of modules
license: ~
author:
Modified: trunk/libcarp-clan-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/README?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/README (original)
+++ trunk/libcarp-clan-perl/README Sat Oct 17 14:18:53 2009
@@ -1,6 +1,13 @@
- ====================================
- Package "Carp::Clan"
- ====================================
+ ============================
+ Package "Carp::Clan"
+ ============================
+
+ Copyright (c) 2006-2009 by Joshua ben Jore
+ All rights reserved.
+
+ Copyright (c) 2001-2009 by Steffen Beyer
+ All rights reserved.
+
Abstract:
---------
@@ -38,7 +45,7 @@
Changes over previous versions:
-------------------------------
-Please refer to the file "CHANGES.txt" in this distribution for a more
+Please refer to the file "Changes" in this distribution for a more
detailed version history log.
@@ -114,19 +121,13 @@
appear as though they were only one.
-Author's note:
---------------
+Contact Authors:
+----------------
-If you have any questions, suggestions or need any assistance, please
-let me know!
+Joshua ben Jore <jjore at cpan.org>
+http://perlmonks.org/?node=diotalevi
-Please do send feedback, this is essential for improving this module
-according to your needs!
+Steffen Beyer <stbey at cpan.org>
+http://www.engelschall.com/u/sb/download/
-I hope you will find this module useful. Enjoy!
-Yours,
---
- Steffen Beyer <sb at engelschall.com> http://www.engelschall.com/u/sb/
- "There is enough for the need of everyone in this world, but not
- for the greed of everyone." - Mohandas Karamchand "Mahatma" Gandhi
Modified: trunk/libcarp-clan-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/debian/changelog?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/changelog (original)
+++ trunk/libcarp-clan-perl/debian/changelog Sat Oct 17 14:18:53 2009
@@ -1,4 +1,12 @@
-libcarp-clan-perl (6.00-2) UNRELEASED; urgency=low
+libcarp-clan-perl (6.02-1) UNRELEASED; urgency=low
+
+ [ Jonathan Yu ]
+ * New upstream release
+ * Standards-Version 3.8.3 (no changes)
+ * Added myself to Uploaders and Copyright
+ * Refreshed copyright to new machine readable format
+ * Rewrote control description
+ * Use new short debhelper rules format
[ MartÃn Ferrari ]
* Updating my email address
@@ -11,7 +19,7 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- MartÃn Ferrari <tincho at debian.org> Fri, 13 Jun 2008 00:04:50 +0000
+ -- Jonathan Yu <jawnsy at cpan.org> Sat, 17 Oct 2009 06:32:42 -0400
libcarp-clan-perl (6.00-1) unstable; urgency=low
Modified: trunk/libcarp-clan-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/debian/compat?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/compat (original)
+++ trunk/libcarp-clan-perl/debian/compat Sat Oct 17 14:18:53 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libcarp-clan-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/debian/control?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/control (original)
+++ trunk/libcarp-clan-perl/debian/control Sat Oct 17 14:18:53 2009
@@ -1,11 +1,11 @@
Source: libcarp-clan-perl
Section: perl
Priority: optional
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: libtest-exception-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: MartÃn Ferrari <tincho at debian.org>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: libtest-exception-perl
+Uploaders: MartÃn Ferrari <tincho at debian.org>, Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/Carp-Clan/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcarp-clan-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libcarp-clan-perl/
@@ -14,12 +14,11 @@
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends}
Description: Perl enhancement to Carp error logging facilities
- This module reports errors from the perspective of the caller of a
- "clan" of modules, similar to "Carp.pm" itself. But instead of giving
- it a number of levels to skip on the calling stack, you give it a
- pattern to characterize the package names of the "clan" of modules
- which shall never be blamed for any error. :-)
+ Carp::Clan is a Perl module designed to report errors from the perspective
+ of the caller of a "clan" of modules, similar to "Carp" itself. Instead of
+ giving it a number of levels to skip on the calling stack, you give it a
+ pattern to characterize the package names of the "clan" of modules which
+ shall never be blamed for any error.
.
- So these modules stick together like a "clan" and any error which
- occurs will be blamed on the "outsider" script or modules not belonging
- to this "clan".
+ These modules stick together like a "clan" and any error which occurs will
+ be blamed on the "outsider" script or modules not belonging to this clan.
Modified: trunk/libcarp-clan-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/debian/copyright?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/copyright (original)
+++ trunk/libcarp-clan-perl/debian/copyright Sat Oct 17 14:18:53 2009
@@ -1,29 +1,35 @@
-The source for this package was downloaded from
-http://search.cpan.org/dist/Carp-Clan/
-
-Upstream Author: Joshua ben Jore, Steffen Beyer.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Steffen Beyer <stbey at cpan.org>
+Upstream-Source: http://search.cpan.org/dist/Carp-Clan/
+Upstream-Name: Carp-Clan
Files: *
-Copyright: © 2006-2008 Joshua ben Jore. All rights reserved.
- © 2001-2004 Steffen Beyer. All rights reserved.
+Copyright: 2006-2009, Joshua ben Jore <jjore at cpan.org>
+ 2001-2009, Steffen Beyer <stbey at cpan.org>
+License-Alias: Perl
License: Artistic | GPL-1+
- This package is free software; you can use, modify and redistribute
- it under the same terms as Perl itself, i.e., under the terms of
- the "Artistic License" or the "GNU General Public License".
- .
- This information has been synthetized from the source code, the README.txt
- file and the Changes file, as there wasn't a complete copyright notice in the
- code.
Files: debian/*
-Copyright: © 2007, 2008 Debian Perl Project
- <pkg-perl-maintainers at lists.alioth.debian.org>
- © 2004-2007 Christian Hammers <ch at debian.org>
+Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+ 2008, Roberto C. Sanchez <roberto at debian.org>
+ 2008, MartÃn Ferrari <martin.ferrari at gmail.com>
+ 2004-2007 Christian Hammers <ch at debian.org>
License: Other
It is assumed that maintainers did choose a license compatible with the
software.
-The complete text of the GNU General Public License can be found in
-/usr/share/common-licenses/GPL and the Artistic License can be found
-in /usr/share/common-licenses/Artistic.
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
+License: GPL-1+
+ 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 1, or (at your option)
+ any later version.
+ 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/libcarp-clan-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/debian/rules?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/rules (original)
+++ trunk/libcarp-clan-perl/debian/rules Sat Oct 17 14:18:53 2009
@@ -1,59 +1,4 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# If set to a true value then MakeMaker's prompt function will
-# always return the default without waiting for user input.
-export PERL_MM_USE_DEFAULT=1
-
-PACKAGE = $(shell dh_listpackages)
-PERL ?= /usr/bin/perl
-TMP = $(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE)
- $(MAKE) test
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- dh_clean build-stamp install-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
- [ ! -d $(TMP)/usr/lib/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents --verbose \
- $(TMP)/usr/lib/perl5
- touch $@
-
-binary-arch:
-# We have nothing to do here for an architecture-independent package
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installchangelogs Changes
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- 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
+%:
+ dh $@
Modified: trunk/libcarp-clan-perl/lib/Carp/Clan.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/lib/Carp/Clan.pm?rev=45920&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/lib/Carp/Clan.pm (original)
+++ trunk/libcarp-clan-perl/lib/Carp/Clan.pm Sat Oct 17 14:18:53 2009
@@ -1,7 +1,7 @@
##
## Based on Carp.pm from Perl 5.005_03.
-## Last modified 12-Jun-2001 by Steffen Beyer.
+## Last modified 17-Oct-2009 by Steffen Beyer.
## Should be reasonably backwards compatible.
##
## This module is free software and can
@@ -28,7 +28,7 @@
$Verbose = 0; # If true then make _shortmsg call _longmsg instead.
-$VERSION = '6.00';
+$VERSION = '6.02';
# _longmsg() crawls all the way up the stack reporting on all the function
# calls made. The error string, $error, is originally constructed from the
@@ -105,8 +105,12 @@
else { $msg .= "\t$sub called"; }
}
else {
- if ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
- else { $msg = "$sub: $error"; }
+ $msg = quotemeta($sub);
+ if ( $error =~ /\b$msg\b/ ) { $msg = $error; }
+ else {
+ if ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
+ else { $msg = "$sub: $error"; }
+ }
}
$msg .= " at $file line $line\n" unless ( $error =~ /\n$/ );
$error = '';
@@ -134,11 +138,16 @@
while ( ( $pack, $file, $line, $sub ) = caller( $i++ ) ) {
next if ( $pack eq 'Carp::Clan' or $pack =~ /$pattern/ );
if ( $error eq '' ) { $msg = "$sub() called"; }
- elsif ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
- else { $msg = "$sub: $error"; }
+ else {
+ $msg = quotemeta($sub);
+ if ( $error =~ /\b$msg\b/ ) { $msg = $error; }
+ else {
+ if ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }
+ else { $msg = "$sub: $error"; }
+ }
+ }
$msg .= " at $file line $line\n" unless ( $error =~ /\n$/ );
- $msg =~ tr/\0//d
- ; # Circumvent die's incorrect handling of NUL characters
+ $msg =~ tr/\0//d; # Circumvent die's incorrect handling of NUL characters
return $msg;
}
goto &_longmsg;
More information about the Pkg-perl-cvs-commits
mailing list