r20818 - in /trunk/libcarp-assert-perl: Makefile.PL debian/changelog debian/control debian/rules
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 7 14:13:04 UTC 2008
Author: gregoa
Date: Sat Jun 7 14:13:03 2008
New Revision: 20818
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=20818
Log:
* Revert changes to upstream Makefile.PL.
* Refresh debian/rules, no functional changes.
* Move perl from Build-Depends to Build-Depends-Indep.
Modified:
trunk/libcarp-assert-perl/Makefile.PL
trunk/libcarp-assert-perl/debian/changelog
trunk/libcarp-assert-perl/debian/control
trunk/libcarp-assert-perl/debian/rules
Modified: trunk/libcarp-assert-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-assert-perl/Makefile.PL?rev=20818&op=diff
==============================================================================
--- trunk/libcarp-assert-perl/Makefile.PL (original)
+++ trunk/libcarp-assert-perl/Makefile.PL Sat Jun 7 14:13:03 2008
@@ -15,70 +15,70 @@
},
);
-#{
-# package MY;
-# sub top_targets {
-# my($self) = @_;
-#
-# return $self->SUPER::top_targets(@_) unless
-# eval { require Pod::Tests; 1 };
-#
-# my $out = "POD2TEST_EXE = pod2test\n";
-#
-# $out .= $self->SUPER::top_targets(@_);
-# $out =~ s/^(pure_all\b.*)/$1 testifypods/m;
-#
-# foreach my $pod (keys %{$self->{MAN1PODS}},
-# keys %{$self->{MAN3PODS}})
-# {
-# (my $test = $pod) =~ s/\.(pm|pod)$//;
-# $test =~ s/^lib\W//;
-# $test =~ s/\W/-/;
-# $test = "t/embedded-$test.t";
-#
-# $pod2test{$pod} = $test;
-# }
-#
-# $out .= <<"END_OF_MAKE";
-#
-#testifypods : @{[ join " ", values %pod2test ]}
-#\t\$(NOECHO) \$(NOOP)
-#
-#END_OF_MAKE
-#
-# for my $pod (keys %pod2test) {
-# my $test = $pod2test{$pod};
-#
-# $out .= <<"END_OF_MAKE";
-#$test : $pod
-#\t\$(NOECHO) \$(ECHO) Testifying $pod to $test
-#\t\$(NOECHO) \$(POD2TEST_EXE) $pod $test
-#
-#END_OF_MAKE
-# }
-#
-# return $out;
-# }
-#
-#
-# sub test_via_harness {
-# my($self, $orig_perl, $tests) = @_;
-#
-# my @perls = ($orig_perl);
-# push @perls, qw(bleadperl
-# perl5.6.1
-# perl5.005_03
-# perl5.004_05
-# perl5.004_04
-# perl5.004
-# )
-# if $ENV{PERL_TEST_ALL};
-#
-# my $out;
-# foreach my $perl (@perls) {
-# $out .= $self->SUPER::test_via_harness($perl, $tests);
-# }
-#
-# return $out;
-# }
-#}
+{
+ package MY;
+ sub top_targets {
+ my($self) = @_;
+
+ return $self->SUPER::top_targets(@_) unless
+ eval { require Pod::Tests; 1 };
+
+ my $out = "POD2TEST_EXE = pod2test\n";
+
+ $out .= $self->SUPER::top_targets(@_);
+ $out =~ s/^(pure_all\b.*)/$1 testifypods/m;
+
+ foreach my $pod (keys %{$self->{MAN1PODS}},
+ keys %{$self->{MAN3PODS}})
+ {
+ (my $test = $pod) =~ s/\.(pm|pod)$//;
+ $test =~ s/^lib\W//;
+ $test =~ s/\W/-/;
+ $test = "t/embedded-$test.t";
+
+ $pod2test{$pod} = $test;
+ }
+
+ $out .= <<"END_OF_MAKE";
+
+testifypods : @{[ join " ", values %pod2test ]}
+\t\$(NOECHO) \$(NOOP)
+
+END_OF_MAKE
+
+ for my $pod (keys %pod2test) {
+ my $test = $pod2test{$pod};
+
+ $out .= <<"END_OF_MAKE";
+$test : $pod
+\t\$(NOECHO) \$(ECHO) Testifying $pod to $test
+\t\$(NOECHO) \$(POD2TEST_EXE) $pod $test
+
+END_OF_MAKE
+ }
+
+ return $out;
+ }
+
+
+ sub test_via_harness {
+ my($self, $orig_perl, $tests) = @_;
+
+ my @perls = ($orig_perl);
+ push @perls, qw(bleadperl
+ perl5.6.1
+ perl5.005_03
+ perl5.004_05
+ perl5.004_04
+ perl5.004
+ )
+ if $ENV{PERL_TEST_ALL};
+
+ my $out;
+ foreach my $perl (@perls) {
+ $out .= $self->SUPER::test_via_harness($perl, $tests);
+ }
+
+ return $out;
+ }
+}
Modified: trunk/libcarp-assert-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-assert-perl/debian/changelog?rev=20818&op=diff
==============================================================================
--- trunk/libcarp-assert-perl/debian/changelog (original)
+++ trunk/libcarp-assert-perl/debian/changelog Sat Jun 7 14:13:03 2008
@@ -1,3 +1,11 @@
+libcarp-assert-perl (0.20-3) UNRELEASED; urgency=low
+
+ * Revert changes to upstream Makefile.PL.
+ * Refresh debian/rules, no functional changes.
+ * Move perl from Build-Depends to Build-Depends-Indep.
+
+ -- gregor herrmann <gregoa at debian.org> Sat, 07 Jun 2008 16:07:06 +0200
+
libcarp-assert-perl (0.20-2) unstable; urgency=low
[ gregor herrmann ]
Modified: trunk/libcarp-assert-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-assert-perl/debian/control?rev=20818&op=diff
==============================================================================
--- trunk/libcarp-assert-perl/debian/control (original)
+++ trunk/libcarp-assert-perl/debian/control Sat Jun 7 14:13:03 2008
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jay Bonci <jaybonci at debian.org>, Gunnar Wolf <gwolf at debian.org>
-Build-Depends: debhelper (>= 6), perl (>= 5.6.0-16)
+Build-Depends: debhelper (>= 6)
+Build-Depends-Indep: perl (>= 5.6.0-16)
Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/Carp-Assert/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcarp-assert-perl/
Modified: trunk/libcarp-assert-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-assert-perl/debian/rules?rev=20818&op=diff
==============================================================================
--- trunk/libcarp-assert-perl/debian/rules (original)
+++ trunk/libcarp-assert-perl/debian/rules Sat Jun 7 14:13:03 2008
@@ -1,53 +1,60 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-# export DH_COMPAT=4
+# 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=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE)
+ $(MAKE) test
+ touch $@
-build:
- dh_testdir
- # Add here commands to compile the package.
- perl Makefile.PL verbose INSTALLDIRS=vendor
clean:
dh_testdir
dh_testroot
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f Makefile.old
- dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
- $(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
- [ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+binary-arch:
+# We have nothing to do here for an architecture-independent package
-binary-arch:;
binary-indep: build install
dh_testdir
dh_testroot
dh_installdocs
- dh_installman
dh_installchangelogs Changes
- dh_link
- dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-perl-cvs-commits
mailing list