[SCM] Debian packaging of dh-make-perl branch, master, updated. d6e0b24d2aabdc273d191a61b45c0373dbc2c99d

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit d6e0b24d2aabdc273d191a61b45c0373dbc2c99d
Author: Damyan Ivanov <dmn at debian.org>
Date:   Tue Aug 30 08:07:42 2011 +0300

    setup_git_repository: streamline import of upstream sources
    
    Supplying a list of non-debian files to git-add can fail, as some of these
    files may be ignored in upstream's .gitignore. Instead, add everything and then
      git rm --cached -r debian/

diff --git a/debian/changelog b/debian/changelog
index f4e0b67..e1f767a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ dh-make-perl (0.74-1) UNRELEASED; urgency=low
   * fix t/debian-version.t to not plan twice in case debian/changelog does not
     exist (e.g. when testing the CPAN distribution, which lacks debian/ stuff)
     RT#66214
+  * setup_git_repository: streamline import of upstream sources
 
   [ gregor herrmann ]
   * Update created Vcs-Browser URLs for Debian Perl Group repositories.
diff --git a/lib/DhMakePerl/Command/make.pm b/lib/DhMakePerl/Command/make.pm
index 9667894..c664a74 100644
--- a/lib/DhMakePerl/Command/make.pm
+++ b/lib/DhMakePerl/Command/make.pm
@@ -596,14 +596,8 @@ sub setup_git_repository {
 
     my $git = Git->repository( $self->main_dir );
     $git->command( qw(symbolic-ref HEAD refs/heads/upstream) );
-    my @upstream_files;
-    my $dh = IO::Dir->new( $self->main_dir );
-    while ( defined( my $f = $dh->read ) ) {
-        next if $f eq '.' or $f eq '..';
-        next if $f eq 'debian';
-        push @upstream_files, $f;
-    }
-    $git->command( 'add', @upstream_files );
+    $git->command( 'add', $self->main_dir );
+    $git->command( 'rm', '--cached', '-r', $self->debian_dir );
     $git->command( 'commit', '-m',
               "Import original source of "
             . $self->perlname . ' '

-- 
Debian packaging of dh-make-perl