r33681 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl/Config.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue Apr 21 19:49:29 2009
New Revision: 33681

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33681
Log:
Revert "* if --pkg-perl is given, and --dist is not, set dist = sid"

This partially reverts r32246

empty --dist works just fine, defaulting it to 'sid' creates problems to
people using 'unstable' or 'testing' in their sources.list

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl/Config.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=33681&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Apr 21 19:49:29 2009
@@ -11,6 +11,7 @@
   * rules, control, compat: migrate to DH7
     + install links via debian/links, README via debian/docs
     + this gives support to 'nocheck' in DEB_BUILD_OPTIONS (Closes: #523560)
+  * revert defaulting --dist to 'sid' when --pkg-perl is given
 
   [ Ryan Niebur ]
   * add myself to the AUTHOR section

Modified: trunk/dh-make-perl/lib/DhMakePerl/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Config.pm?rev=33681&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Config.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Config.pm Tue Apr 21 19:49:29 2009
@@ -95,8 +95,6 @@
     my %opts;
     GetOptions( \%opts, $self->options, )
         or die "Error parsing command-line options\n";
-
-    $opts{dist} = "sid" if(!defined($opts{dist}) && defined($opts{"pkg-perl"}));
 
     # Make CPAN happy, make the user happy: Be more tolerant!
     # Accept names to be specified with double-colon, dash or slash