Bug#701140: dh-make-perl: Patch to understand packages named -vX.Y.Z

2013-02-22 Thread Matthew Gabeler-Lee

On 2013-02-22 08:41, gregor herrmann wrote:

On Thu, 21 Feb 2013 20:31:39 -0500, Matthew Gabeler-Lee wrote:

dh-make-perl doesn't seem to understand packages that have a name 
like
Foo-Bar-v1.0.0, only ones named Foo-Bar-1.0.0.  Attached tiny patch 
fixes

this.


Thanks for your bug report and patch.

This sounds all reasonable; what surprises me a bit is that I never
encountered this issue.
Do you happen to remember which CPAN dist and which dh-make-perl
invocation triggered this bug?


Indeed I do: Net-BitTorrent-Protocol-v1.0.0


--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#701140: dh-make-perl: Patch to understand packages named -vX.Y.Z

2013-02-22 Thread Matthew Gabeler-Lee

On 2013-02-22 10:58, gregor herrmann wrote:

Summary:
1) I'm confused :)
2) The errors come from git, and we really seem to have a version
   problem somewhere. Not sure if this is the problem you are facing.
3) Could you please provide the dh-make-perl invocation and output on
   your system, maybe then it gets clearer ...


I was using cpan2deb, but it didn't seem from the man page like it 
should make a difference.  Clearly it does, however.


I have 0.75 from /testing here, I (foolishly?) thought 0.76 wouldn't be 
that much different.


With that version, I get this:

$ cpan2deb Net-BitTorrent-Protocol
Going to read '/usr/src/build/cpan/Metadata'
  Database was generated on Thu, 21 Feb 2013 21:17:02 GMT
Going to read 1 yaml file from /usr/src/build/cpan/build/
CPAN: Time::HiRes loaded ok (v1.972101)
DONE
Restored the state of none (in 0.0987 secs)
Unable to determine the version of Net-BitTorrent-Protocol-v1.0.0

My patch fixes (for me) that error in the last line and let me build a 
.deb.



But, if I use dh-make-perl --cpan instead of cpan2deb, I get output 
equivalent to yours.


If I use dh-make-perl --build --cpan, I get the output with the git 
complaint, but the package does build.


Now I'm confused ;)  Hopefully something here helps you be less 
confused.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#701140: dh-make-perl: Patch to understand packages named -vX.Y.Z

2013-02-22 Thread gregor herrmann
On Thu, 21 Feb 2013 20:31:39 -0500, Matthew Gabeler-Lee wrote:

 dh-make-perl doesn't seem to understand packages that have a name like
 Foo-Bar-v1.0.0, only ones named Foo-Bar-1.0.0.  Attached tiny patch fixes
 this.

Thanks for your bug report and patch.

This sounds all reasonable; what surprises me a bit is that I never
encountered this issue.
Do you happen to remember which CPAN dist and which dh-make-perl
invocation triggered this bug?
 
Cheers,
gregor

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT  SPI, fellow of the Free Software Foundation Europe
   `-   NP: Tracy Chapman: Wedding Song


signature.asc
Description: Digital signature


Bug#701140: dh-make-perl: Patch to understand packages named -vX.Y.Z

2013-02-22 Thread gregor herrmann
On Fri, 22 Feb 2013 09:22:08 -0500, Matthew Gabeler-Lee wrote:

 This sounds all reasonable; what surprises me a bit is that I never
 encountered this issue.
 Do you happen to remember which CPAN dist and which dh-make-perl
 invocation triggered this bug?
 Indeed I do: Net-BitTorrent-Protocol-v1.0.0

Thank you!


I tried now with dh-make-perl from testing 
and with my ~/.dh-make-perl/dh-make-perl.conf removed:


1) Take 1, with --cpan:

% dh-make-perl --cpan Net-BitTorrent-Protocol
CPAN: File::HomeDir loaded ok (v0.99)
Going to read '/home/gregoa/.cpan/Metadata'
  Database was generated on Fri, 22 Feb 2013 14:53:02 GMT
CPAN: Time::HiRes loaded ok (v1.972101)
Fetching with LWP:
ftp://cpan.inode.at/authors/id/S/SA/SANKO/Net-BitTorrent-Protocol-v1.0.0.tar.gz
CPAN: Digest::SHA loaded ok (v5.61)
Fetching with LWP:
ftp://cpan.inode.at/authors/id/S/SA/SANKO/CHECKSUMS
Checksum for 
/home/gregoa/.cpan/sources/authors/id/S/SA/SANKO/Net-BitTorrent-Protocol-v1.0.0.tar.gz
 ok
CPAN: Archive::Tar loaded ok (v1.76)
Net-BitTorrent-Protocol-v1.0.0
Net-BitTorrent-Protocol-v1.0.0/Build.PL
Net-BitTorrent-Protocol-v1.0.0/Changes
Net-BitTorrent-Protocol-v1.0.0/MANIFEST
Net-BitTorrent-Protocol-v1.0.0/META.json
Net-BitTorrent-Protocol-v1.0.0/META.yml
Net-BitTorrent-Protocol-v1.0.0/README
Net-BitTorrent-Protocol-v1.0.0/TODO
Net-BitTorrent-Protocol-v1.0.0/lib
Net-BitTorrent-Protocol-v1.0.0/lib/Net
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP03.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP05.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP06.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP07.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP10.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP23.pm
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP03
Net-BitTorrent-Protocol-v1.0.0/lib/Net/BitTorrent/Protocol/BEP03/Bencode.pm
Net-BitTorrent-Protocol-v1.0.0/t
Net-BitTorrent-Protocol-v1.0.0/t/_net_bittorrent_protocol.t
Net-BitTorrent-Protocol-v1.0.0/t/0003_net_bittorrent_protocol_bep03.t
Net-BitTorrent-Protocol-v1.0.0/t/0003_net_bittorrent_protocol_bep03_bencode.t
Net-BitTorrent-Protocol-v1.0.0/t/0006_net_bittorrent_protocol_bep06.t
Net-BitTorrent-Protocol-v1.0.0/t/0007_net_bittorrent_protocol_bep07.t
Net-BitTorrent-Protocol-v1.0.0/t/0010_net_bittorrent_protocol_bep10.t
Net-BitTorrent-Protocol-v1.0.0/t/0023_net_bittorrent_protocol_bep23.t
CPAN: File::Temp loaded ok (v0.22)
Using META.json
Found: Net-BitTorrent-Protocol 1.. (libnet-bittorrent-protocol-perl arch=all)
Using cached Contents from Fri Feb 22 16:31:51 2013
= perl = 5.10.0 is in core
= Digest::SHA = 1 is in core since 1
+ Exporter  found in perl-base
+ Carp  found in perl-base

Needs the following debian packages: perl (= 1), perl-base
+ Test::More  found in perl-modules
= perl = 5.10.0 is in core
+ File::Find  found in perl-modules
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
+ Module::Build = 0.38 found in libmodule-build-perl ( 0.38) | perl-modules ( 
0.38)
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
Use of uninitialized value in concatenation (.) or string at 
/usr/share/perl5/Debian/Dependency.pm line 157.
+ Exporter  found in perl-base
+ Carp  found in perl-base

Needs the following debian packages during building: perl-modules, perl, 
perl-base
Using maintainer: gregor herrmann gre...@debian.org
Found docs: README TODO
Using rules: /home/gregoa/.dh-make-perl/rules.dh7.tiny
Module::Build needs perl
**
Copyright information incomplete!

Upstream copyright information could not be automatically determined.

If you are building this package for your personal use, you might disregard
this information; however, if you intend to upload this package to Debian
(or in general, if you plan on distributing it), you must look into the
complete copyright information.

The causes for this warning are:
Licensing information is present, but cannot be parsed
--- Done
fatal: 'upstream/1..' is not a valid tag name.
tag upstream/1.. upstream: command returned error: 128


2) Take 2, with an unpacked tarball:

% dh-make-perl 

Bug#701140: dh-make-perl: Patch to understand packages named -vX.Y.Z

2013-02-21 Thread Matthew Gabeler-Lee
Package: dh-make-perl
Version: 0.75-1
Severity: important
Tags: patch

dh-make-perl doesn't seem to understand packages that have a name like
Foo-Bar-v1.0.0, only ones named Foo-Bar-1.0.0.  Attached tiny patch fixes
this.

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.7.4 (SMP w/12 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages dh-make-perl depends on:
ii  debhelper   9.20120909
ii  dpkg-dev1.16.9
ii  fakeroot1.18.4-2
ii  libapt-pkg-perl 0.1.26+b1
ii  libarray-unique-perl0.08-1
ii  libclass-accessor-perl  0.34-1
ii  libdpkg-perl1.16.9
ii  libemail-address-perl   1.895-1
ii  libemail-date-format-perl   1.002-1
ii  libfile-which-perl  1.09-1
ii  liblist-moreutils-perl  0.33-1+b1
ii  libmodule-depends-perl  0.16-1
ii  libparse-debcontrol-perl2.005-3
ii  libparse-debianchangelog-perl   1.2.0-1
ii  libsoftware-license-perl0.103004-2
ii  libtie-ixhash-perl  1.21-2
ii  libwww-mechanize-perl   1.71-1
ii  libyaml-perl0.81-1
ii  make3.81-8.2
ii  perl5.14.2-18
ii  perl-modules [libmodule-corelist-perl]  5.14.2-18

Versions of packages dh-make-perl recommends:
ii  apt-file  2.5.1
ii  git   1:1.7.10.4-1+wheezy1
pn  pristine-tar  none

dh-make-perl suggests no packages.

-- no debconf information
diff --git a/lib/DhMakePerl/Command/make.pm b/lib/DhMakePerl/Command/make.pm
index 4ce91d4..68092ba 100644
--- a/lib/DhMakePerl/Command/make.pm
+++ b/lib/DhMakePerl/Command/make.pm
@@ -272,7 +272,7 @@ sub setup_dir {
 }
 elsif ( $dist = find_cpan_distribution( $self-cfg-cpan ) ) {
 my $ver;
-if ( $dist-base_id =~ /-(\d[\d._]*)\./ ) {
+if ( $dist-base_id =~ /-v?(\d[\d._]*)\./ ) {
 $self-mod_cpan_version($1);
 }
 else {