From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 14 May 2009 18:25:07 +0000 (-0400)
Subject: Merge branch 'master' into buildsystems
X-Git-Tag: 7.3.0~73
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=692ac0f0d2b7acc570cd6a5f8cac848109daf026;p=debhelper.git

Merge branch 'master' into buildsystems

Conflicts:
	debian/changelog
	dh_auto_configure
---

692ac0f0d2b7acc570cd6a5f8cac848109daf026
diff --cc Debian/Debhelper/Buildsystem/perl_makemaker.pm
index c62041f,0000000..a7bb5cc
mode 100644,000000..100644
--- a/Debian/Debhelper/Buildsystem/perl_makemaker.pm
+++ b/Debian/Debhelper/Buildsystem/perl_makemaker.pm
@@@ -1,53 -1,0 +1,53 @@@
 +# A buildsystem plugin for handling Perl MakeMaker based projects.
 +#
 +# Copyright: © 2008-2009 Joey Hess
 +#            © 2008-2009 Modestas Vainius
 +# License: GPL-2+
 +
 +package Debian::Debhelper::Buildsystem::perl_makemaker;
 +
 +use strict;
 +use Debian::Debhelper::Dh_Lib;
 +use base 'Debian::Debhelper::Buildsystem::makefile';
 +
 +sub DESCRIPTION {
 +	"Perl ExtUtils::MakeMaker (Makefile.PL)"
 +}
 +
 +sub check_auto_buildable {
 +	my $this=shift;
 +	my ($action)=@_;
 +
 +	# Handles configure, install; the rest - next class
 +	if ($action eq "install" || $action eq "configure") {
 +		return -e "Makefile.PL";
 +	}
 +	else {
 +		return 0;
 +	}
 +}
 +
 +sub new {
 +	my $class=shift;
 +	my $this=$class->SUPER::new(@_);
 +	$this->enforce_in_source_building();
 +	return $this;
 +}
 +
 +sub configure {
 +	my $this=shift;
 +	# If set to a true value then MakeMaker's prompt function will
 +	# # always return the default without waiting for user input.
 +	$ENV{PERL_MM_USE_DEFAULT}=1;
 +	doit("perl", "Makefile.PL", "INSTALLDIRS=vendor",
- 		"create_packlist=0", "--skipdeps",
++		"create_packlist=0",
 +		@_);
 +}
 +
 +sub install {
 +	my $this=shift;
 +	my $destdir=shift;
 +	$this->SUPER::install($destdir, "PREFIX=/usr", @_);
 +}
 +
 +1;
diff --cc debian/changelog
index 3a9a9f3,05f0508..8a76e1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,11 +1,28 @@@
 +debhelper (7.3.0) UNRELEASED; urgency=low
 +
 +  * Modular object oriented dh_auto_* buildsystem support,
 +    contributed by Modestas Vainius
 +    - dh_auto_* --builddirectory can now be used to specify a build
 +      directory to use for out of source building, for build systems
 +      that support it. Closes: #480577
 +    - dh_auto_* --buildsystem can now be used to override the autodetected
 +      build system, or force use of a third-party class.
 +    - dh_auto_* --list can be used to list available and selected build
 +      systems.
 +    - Adds support for cmake.
 +    - Historical dh_auto_* behavior should be preserved despite these
 +      large changes..
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 20 Apr 2009 16:26:08 -0400
 +
- debhelper (7.2.11) UNRELEASED; urgency=low
+ debhelper (7.2.12) unstable; urgency=low
+ 
+   * dh_auto_configure: Revert --skipdeps change
+     Closes: #528647, reopens: #528235
+ 
+  -- Joey Hess <joeyh@debian.org>  Thu, 14 May 2009 14:15:26 -0400
+ 
+ debhelper (7.2.11) unstable; urgency=low
  
    * dh: Support --with addon,addon,...
      Closes: #528178