r36340 - in /trunk/dh-make-perl: TODO dh-make-perl lib/DhMakePerl.pm lib/DhMakePerl/Config.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun May 24 20:09:55 2009
New Revision: 36340

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36340
Log:
add --[no-]backups option, on by default.

creates backups of control/rules before overwritting them on --refresh

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

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=36340&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Sun May 24 20:09:55 2009
@@ -1,6 +1,3 @@
-* --refresh: add --[no-]backups option (on by default)
-  used for controlling creation of backup files of things that are rewritten
-
 * --refresh and core dependencies
   when a dependency module is in the core, do not blindly copy the version
   dependend on to perl-modules dependency, but use the first perl release the

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=36340&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Sun May 24 20:09:55 2009
@@ -125,6 +125,11 @@
 isn't used, B<dh-make-perl> uses a relatively good-working algorithms to
 decide this alone.
 
+=item B<--backups> | B<--no-backups>
+
+In L</--refresh> mode, create backups of F<debian/copyright> and
+F<debian/rules> before overwritting them. On by default.
+
 =item B<--basepkgs>
 
 Explicitly gives a comma-separated list of packages to consider "base"

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=36340&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Sun May 24 20:09:55 2009
@@ -177,7 +177,8 @@
             if defined $changelog and $self->cfg->verbose;
         print "Found docs: @docs\n" if $self->cfg->verbose;
         print "Found examples: @examples\n" if @examples and $self->cfg->verbose;
-        copy( "$debiandir/rules", "$debiandir/rules.bak" );
+        copy( "$debiandir/rules", "$debiandir/rules.bak" )
+            if $self->cfg->backups;
         $self->create_rules("$debiandir/rules");
         if (! -f "$debiandir/compat" or $self->cfg->dh == 7) {
             $self->create_compat("$debiandir/compat");
@@ -185,7 +186,8 @@
         $self->fix_rules( "$debiandir/rules",
             ( defined $changelog ? $changelog : '' ),
             \@docs, \@examples, );
-        copy( "$debiandir/copyright", "$debiandir/copyright.bak" );
+        copy( "$debiandir/copyright", "$debiandir/copyright.bak" )
+            if $self->cfg->backups;
         $self->create_copyright("$debiandir/copyright");
 
         my $control = Debian::Control::FromCPAN->new;

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=36340&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Config.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Config.pm Sun May 24 20:09:55 2009
@@ -7,7 +7,8 @@
 use Dpkg::Source::Package;
 
 use constant options => (
-    'arch=s',          'basepkgs=s',
+    'arch=s',          'backups!',
+    'basepkgs=s',
     'bdepends=s',      'bdependsi=s',
     'build!',          'closes=i',
     'config-file=s',   'core-ok',
@@ -48,6 +49,7 @@
 use YAML        ();
 
 use constant DEFAULTS => {
+    backups      => 1,
     data_dir     => '/usr/share/dh-make-perl',
     dbflags      => ( $> == 0 ? "" : "-rfakeroot" ),
     dh           => 7,