r13960 - in /trunk/libcarp-clan-perl: Changes MANIFEST META.yml Makefile.PL debian/README.Maintainer debian/changelog debian/control debian/rules lib/Carp/Clan.pm t/04boilerplate.t

tincho-guest at users.alioth.debian.org tincho-guest at users.alioth.debian.org
Fri Feb 1 12:26:41 UTC 2008 

Author: tincho-guest
Date: Fri Feb  1 12:26:41 2008
New Revision: 13960

URL: http://svn.debian.org/wsvn/?sc=1&rev=13960
Log:
- Set DPG as Maintainer and put myself in Uploaders.
- Removed dpatch and cdbs dependency, removed old Replaces, increase DH
  version.
* debian/copyright: new format, updated CP info (although upstream doesn't
* debian/rules: new from scratch.
* New upstream release.

Removed:
    trunk/libcarp-clan-perl/debian/README.Maintainer
    trunk/libcarp-clan-perl/t/04boilerplate.t
Modified:
    trunk/libcarp-clan-perl/Changes
    trunk/libcarp-clan-perl/MANIFEST
    trunk/libcarp-clan-perl/META.yml
    trunk/libcarp-clan-perl/Makefile.PL
    trunk/libcarp-clan-perl/debian/changelog
    trunk/libcarp-clan-perl/debian/control
    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/trunk/libcarp-clan-perl/Changes?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/Changes (original)
+++ trunk/libcarp-clan-perl/Changes Fri Feb  1 12:26:41 2008
@@ -12,6 +12,11 @@
 
 Version history:
 ----------------
+
+Version 5.10  10.01.2008
+ + Removed the circular dependency on Object::Deadly. It was only
+   used for testing and would only succeed if you already had O::D
+   installed.
 
 Version 5.9   04.11.2007
  + Test::Exceptions is mandatory for testing.

Modified: trunk/libcarp-clan-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/MANIFEST?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/MANIFEST (original)
+++ trunk/libcarp-clan-perl/MANIFEST Fri Feb  1 12:26:41 2008
@@ -9,6 +9,5 @@
 README
 t/01pod.t
 t/03yaml.t
-t/04boilerplate.t
 t/10basic.t
 t/11basic.t

Modified: trunk/libcarp-clan-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/META.yml?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/META.yml (original)
+++ trunk/libcarp-clan-perl/META.yml Fri Feb  1 12:26:41 2008
@@ -1,14 +1,14 @@
 --- #YAML:1.0
 name:                Carp-Clan
-version:             5.9
+version:             5.10
 abstract:            Report errors from perspective of caller of a "clan" of modules
 license:             ~
-generated_by:        ExtUtils::MakeMaker version 6.31
+author:              
+    - Joshua ben Jore <jjore at cpan.org>
+generated_by:        ExtUtils::MakeMaker version 6.42
 distribution_type:   module
 requires:     
     Test::Exception:               0
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.2.html
-    version: 1.2
-author:
-    - Joshua ben Jore <jjore at cpan.org>
+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
+    version: 1.3

Modified: trunk/libcarp-clan-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/Makefile.PL?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/Makefile.PL (original)
+++ trunk/libcarp-clan-perl/Makefile.PL Fri Feb  1 12:26:41 2008
@@ -6,17 +6,6 @@
 my %PREREQ_PM = (
 		 'Test::Exception' => 0,
 		);
-
-# Object::Deadly uses Carp::Clan for its runtime. This is a circular
-# dependency and is resolved by installing Carp::Clan without
-# Object::Deadly. Once Object::Deadly is installed, Carp::Clan may use
-# it for testing.
-if (prompt( 'Add Object::Deadly 0.08+ to prerequisites for testing? [Ny]',
-        'no' ) =~ /^y/i
-    )
-{
-    $PREREQ_PM{'Object::Deadly'} = '0.08';
-}
 
 WriteMakefile(
     NAME          => 'Carp::Clan',

Modified: trunk/libcarp-clan-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/debian/changelog?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/changelog (original)
+++ trunk/libcarp-clan-perl/debian/changelog Fri Feb  1 12:26:41 2008
@@ -1,4 +1,4 @@
-libcarp-clan-perl (5.9-3) UNRELEASED; urgency=low
+libcarp-clan-perl (5.10-1) unstable; urgency=low
 
   [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -8,15 +8,18 @@
   [ Martín Ferrari ]
   * debian/watch: use by-dist and discover new upstream author!.
   * debian/control:
-  - Update Maintainer and Uploaders.
+  - Set DPG as Maintainer and put myself in Uploaders.
   - Bump Standards-Version (no changes).
-  - Remove dpatch dependency, increase DH version.
+  - Removed dpatch and cdbs dependency, removed old Replaces, increase DH
+    version.
   * debian/compat: Increase DH compat to 5.
-  * debuan/copyright: new format, updated CP info (although upstream doesn't
+  * debian/copyright: new format, updated CP info (although upstream doesn't
     properly declare it).
+  * debian/rules: new from scratch.
   * Cleaned source mess.
+  * New upstream release.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:27:43 +0200
+ -- Martín Ferrari <martin.ferrari at gmail.com>  Fri, 01 Feb 2008 10:19:00 -0200
 
 libcarp-clan-perl (5.9-2) unstable; urgency=low
 

Modified: trunk/libcarp-clan-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/debian/control?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/control (original)
+++ trunk/libcarp-clan-perl/debian/control Fri Feb  1 12:26:41 2008
@@ -4,10 +4,10 @@
 Standards-Version: 3.7.3
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Martín Ferrari <martin.ferrari at gmail.com>
+Build-Depends: debhelper (>= 5), libtest-exception-perl
 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/wsvn/pkg-perl/trunk/libcarp-clan-perl/
-Build-Depends: debhelper (>= 5), cdbs, libtest-exception-perl
 
 Package: libcarp-clan-perl
 Architecture: all

Modified: trunk/libcarp-clan-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/debian/rules?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/rules (original)
+++ trunk/libcarp-clan-perl/debian/rules Fri Feb  1 12:26:41 2008
@@ -1,5 +1,59 @@
 #!/usr/bin/make -f
 
-# Put perlmodule.mk last to dh_clean temporary files not in MANIFEST
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/perlmodule.mk
+# 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

Modified: trunk/libcarp-clan-perl/lib/Carp/Clan.pm
URL: http://svn.debian.org/wsvn/trunk/libcarp-clan-perl/lib/Carp/Clan.pm?rev=13960&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/lib/Carp/Clan.pm (original)
+++ trunk/libcarp-clan-perl/lib/Carp/Clan.pm Fri Feb  1 12:26:41 2008
@@ -28,7 +28,7 @@
 
 $Verbose = 0;        # If true then make _shortmsg call _longmsg instead.
 
-$VERSION = '5.9';
+$VERSION = '5.10';
 
 # _longmsg() crawls all the way up the stack reporting on all the function
 # calls made. The error string, $error, is originally constructed from the
@@ -102,7 +102,7 @@
                 $sub .= '(' . join( ', ', @parms ) . ')';
             }
             if ( $msg eq '' ) { $msg = "$sub called"; }
-            else { $msg .= "\t$sub called"; }
+            else              { $msg .= "\t$sub called"; }
         }
         else {
             if   ( $sub =~ /::/ ) { $msg = "$sub(): $error"; }

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