r16758 - in /trunk/dh-make-perl: debian/changelog dh-make-perl rules.MakeMaker.noxs rules.MakeMaker.xs rules.Module-Build.noxs rules.Module-Build.xs
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Fri Mar 7 21:53:17 UTC 2008
Author: gregoa-guest
Date: Fri Mar 7 21:53:16 2008
New Revision: 16758
URL: http://svn.debian.org/wsvn/?sc=1&rev=16758
Log:
* Fix small error in output of create_copyright().
* Automatically find examples/samples/sample directories for
dh_installexamples; otherwise remove empty dh_installexamples line from
debian/rules.
Modified:
trunk/dh-make-perl/debian/changelog
trunk/dh-make-perl/dh-make-perl
trunk/dh-make-perl/rules.MakeMaker.noxs
trunk/dh-make-perl/rules.MakeMaker.xs
trunk/dh-make-perl/rules.Module-Build.noxs
trunk/dh-make-perl/rules.Module-Build.xs
Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/debian/changelog?rev=16758&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Mar 7 21:53:16 2008
@@ -5,11 +5,15 @@
to 6
* Add comment and additional spaces to the created watch files to make the
pattern easier to read and understand.
+ * Fix small error in output of create_copyright().
+ * Automatically find examples/samples/sample directories for
+ dh_installexamples; otherwise remove empty dh_installexamples line from
+ debian/rules.
[ Damyan Ivanov ]
* rules.* templates: add "install" to phony targets list
- -- Damyan Ivanov <dmn at debian.org> Fri, 07 Mar 2008 09:49:38 +0200
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Fri, 07 Mar 2008 22:47:31 +0100
dh-make-perl (0.38) unstable; urgency=low
Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/dh-make-perl?rev=16758&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Fri Mar 7 21:53:16 2008
@@ -113,7 +113,7 @@
$pkgversion,
$desc, $longdesc, $copyright, $author, $upsurl);
my ($extrasfields, $extrapfields);
-my (@docs, $changelog, @args);
+my (@docs, @examples, $changelog, @args);
my %opts;
@@ -171,6 +171,7 @@
my $module_build = (-f "$maindir/Build.PL") ? "Module-Build" : "MakeMaker";
extract_changelog($maindir);
extract_docs($maindir);
+extract_examples($maindir);
if (defined $opts{bdepends}) {
$bdepends = $opts{bdepends};
@@ -197,6 +198,7 @@
print "Using maintainer: $maintainer\n";
print "Found changelog: $changelog\n" if defined $changelog;
print "Found docs: @docs\n";
+print "Found examples: @examples\n";
-d $debiandir && die "The directory $debiandir is already present and I won't overwrite it: remove it yourself.\n";
# start writing out the data
mkdir ($debiandir, 0755) || die "Cannot create $debiandir dir: $!\n";
@@ -212,7 +214,7 @@
create_watch("$debiandir/watch", $opts{cpan}) if ($opts{cpan});
#create_readme("$debiandir/README.Debian");
create_copyright("$debiandir/copyright");
-fix_rules("$debiandir/rules", (defined $changelog ? $changelog : ''), @docs);
+fix_rules("$debiandir/rules", (defined $changelog ? $changelog : ''), \@docs, \@examples);
apply_final_overrides();
build_package($maindir) if $opts{build} or $opts{install};
install_package($debiandir) if $opts{install};
@@ -654,6 +656,15 @@
}, $dir);
}
+sub extract_examples {
+ my ($dir) = shift;
+ $dir .= '/' unless $dir =~ m(/$);
+ find(sub {
+ push (@examples, substr($File::Find::name, length($dir)) . '/*')
+ if (/^(examples|samples?)$/i && (! $opts{exclude} || ! $File::Find::name =~ /$opts{exclude}/)) ;
+ }, $dir);
+}
+
sub run_depends {
my ($depends_module, $dir) = @_;
@@ -848,8 +859,8 @@
}
sub fix_rules {
- my ($rules_file, $changelog_file, @docs, $test_line, $fh, @content);
- ($rules_file, $changelog_file, @docs) = @_;
+ my ($rules_file, $changelog_file, $docs, $examples, $test_line, $fh, @content);
+ ($rules_file, $changelog_file, $docs, $examples) = @_;
$test_line = ($module_build eq 'Module-Build') ?
'$(PERL) Build test' : '$(MAKE) test';
@@ -862,6 +873,8 @@
$fh->truncate(0)|| die "Can't truncate $rules_file: $!";
for (@content) {
s/#CHANGES#/$changelog_file/g;
+ s/#EXAMPLES#/join " ", @examples/eg;
+ s/\s+dh_installexamples\s+$//g; # no need for empty dh_installexamples
s/#DOCS#/join " ", @docs/eg;
s/#TEST#/$test_line/g;
$fh->print($_);
@@ -960,7 +973,7 @@
$fh->print(
"This copyright info was automatically extracted from the perl module.
It may not be accurate, so you better check the module sources
-if don\'t want to get into legal troubles.
+if you don\'t want to get into legal troubles.
");
if (defined $author) {
Modified: trunk/dh-make-perl/rules.MakeMaker.noxs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.MakeMaker.noxs?rev=16758&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.noxs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.noxs Fri Mar 7 21:53:16 2008
@@ -58,7 +58,7 @@
binary-indep: build install
dh_testdir
dh_testroot
- dh_installexamples
+ dh_installexamples #EXAMPLES#
dh_installdocs #DOCS#
dh_installchangelogs #CHANGES#
dh_perl
Modified: trunk/dh-make-perl/rules.MakeMaker.xs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.MakeMaker.xs?rev=16758&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.MakeMaker.xs (original)
+++ trunk/dh-make-perl/rules.MakeMaker.xs Fri Mar 7 21:53:16 2008
@@ -69,7 +69,7 @@
binary-arch: build install
dh_testdir
dh_testroot
- dh_installexamples
+ dh_installexamples #EXAMPLES#
dh_installdocs #DOCS#
dh_installchangelogs #CHANGES#
dh_shlibdeps
Modified: trunk/dh-make-perl/rules.Module-Build.noxs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.Module-Build.noxs?rev=16758&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.Module-Build.noxs (original)
+++ trunk/dh-make-perl/rules.Module-Build.noxs Fri Mar 7 21:53:16 2008
@@ -60,7 +60,7 @@
dh_testdir
dh_testroot
dh_installdocs #DOCS#
- dh_installexamples
+ dh_installexamples #EXAMPLES#
dh_installchangelogs #CHANGES#
dh_perl
dh_compress
Modified: trunk/dh-make-perl/rules.Module-Build.xs
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/rules.Module-Build.xs?rev=16758&op=diff
==============================================================================
--- trunk/dh-make-perl/rules.Module-Build.xs (original)
+++ trunk/dh-make-perl/rules.Module-Build.xs Fri Mar 7 21:53:16 2008
@@ -68,7 +68,7 @@
dh_testdir
dh_testroot
dh_installdocs #DOCS#
- dh_installexamples
+ dh_installexamples #EXAMPLES#
dh_installchangelogs #CHANGES#
dh_shlibdeps
dh_strip
More information about the Pkg-perl-cvs-commits
mailing list