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

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Jun 24 07:49:15 2011
New Revision: 76440

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76440
Log:
Add --vcs option, guiding VCS-* headers' creation in --pkg-perl mode

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/dh-make-perl
    trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm
    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=76440&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Jun 24 07:49:15 2011
@@ -16,6 +16,9 @@
 
   [ Nicholas Bamber ]
   * Updated authorship notice
+
+  [ Damyan Ivanov ]
+  * Add --vcs option, guiding VCS-* headers' creation in --pkg-perl mode
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 25 May 2011 16:04:40 +0200
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=76440&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Fri Jun 24 07:49:15 2011
@@ -351,6 +351,11 @@
 
 Default: apt's default.
 
+=item B<--vcs> I<VCS>
+
+In B<--pkg-perl> mode, use the specified version control system in the
+generated I<Vcs-*> fields. The default is C<svn> (still).
+
 =item B<--verbose> | B<--no-verbose>
 
 Print additional information while processing.

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm?rev=76440&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm Fri Jun 24 07:49:15 2011
@@ -161,14 +161,30 @@
     $src->Standards_Version( $self->debstdversion );
     $src->Homepage( $self->upsurl );
     if ( $self->cfg->pkg_perl ) {
-        $self->control->source->Vcs_Svn(
-            sprintf( "svn://svn.debian.org/pkg-perl/trunk/%s/",
-                $self->pkgname )
-        );
-        $self->control->source->Vcs_Browser(
-            sprintf( "http://svn.debian.org/viewsvn/pkg-perl/trunk/%s/",
-                $self->pkgname )
-        );
+        my $vcs = lc( $self->cfg->vcs );
+        if ( $vcs eq 'svn' ) {
+            $self->control->source->Vcs_Svn(
+                sprintf( "svn://svn.debian.org/pkg-perl/trunk/%s/",
+                    $self->pkgname )
+            );
+            $self->control->source->Vcs_Browser(
+                sprintf( "http://svn.debian.org/viewsvn/pkg-perl/trunk/%s/",
+                    $self->pkgname )
+            );
+        }
+        elsif ( $vcs eq 'git' ) {
+            $self->control->source->Vcs_Git(
+                sprintf( "git://git.debian.org/git/pkg-perl/packages/%s.git",
+                    $self->pkgname )
+            );
+            $self->control->source->Vcs_Browser(
+                sprintf( "http://git.debian.org/git/pkg-perl/packages/%s.git",
+                    $self->pkgname )
+            );
+        }
+        else {
+            warn "Version control system '$vcs' not known. Please submit a patch :)\n";
+        }
     }
     $self->control->write( $self->debian_file('control') );
 

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=76440&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Config.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Config.pm Fri Jun 24 07:49:15 2011
@@ -33,7 +33,7 @@
     'packagename|p=s', 'pkg-perl!',
     'recursive!',
     'requiredeps',     'sources-list=s',
-    'source-format=s',
+    'source-format=s', 'vcs=s',
     'verbose!',        'version=s',
 );
 
@@ -72,6 +72,7 @@
     network       => 1,
     only          => [ 'control', 'copyright', 'docs', 'examples', 'rules' ],
     source_format => '1.0',
+    vcs           => 'svn',
     verbose       => 1,
 };