Package: git-buildpackage
Version: 0.5.32
Severity: normal

*** Please type your report below this line ***

In version 0.5.32, git-buildpackage differentiates native packages (i.e., those 
consisting of only a single tarball and a .dsc) from others by looking for a 
'-' in the version number. This appears to be incorrect, at least for some 
packages; e2fsprogs 1.4.12-4stable1 is a native package, but git-buildpackage 
thinks otherwise. This leads to a build failure. git-buildpackage is unable to 
locate the pristine-tar file in my repository because the "-4stable1" suffix is 
incorrectly being stripped from the version number.

I have created a patch to gbp/deb.py to try and correct this problem. It "Works 
For Me" - your mileage may vary. Here is what I did: when parse_changelog is 
called with a filename parameter, I look for a file named "source/format" in 
the same directory as the changelog. If that file does not exist, the package 
is considered native. If that file does exist, and the first line contains the 
string "native" somewhere within it, the package is also considered native. If 
the file exists but does not contain the string "native" then the package is 
considered non-native. I store the result of this test in the changelog 
dictionary with the key "X-Source-Format-Native" for later use by the is_native 
function.

If parse_changelog is called without a filename parameter, or if is_native is 
passed a dict that doesn't contain "X-Source-Format-Native", it falls back on 
the previous heuristic of looking for a "-".

This may be an extremely naive interpretation of "debian/source/format," but it 
seems to be working out for me.

The dsc in question and my patch are attached to this message.

-- System Information:
Debian Release: 6.0.5
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git-buildpackage depends on:
ii  devscripts            2.10.69+squeeze2   scripts to make the life of a Debi
ii  git [git-core]        1:1.7.10-1~bpo60+1 fast, scalable, distributed revisi
ii  python                2.6.6-3+squeeze7   interactive high-level object-orie
ii  python-dateutil       1.4.1-3            powerful extensions to the standar
ii  python2.6             2.6.6-8+b1         An interactive high-level object-o

Versions of packages git-buildpackage recommends:
ii  cowbuilder                    0.62+nmu2  pbuilder running on cowdancer
ii  pristine-tar                  1.03       regenerate pristine tarballs

Versions of packages git-buildpackage suggests:
pn  python-notify                 <none>     (no description available)
ii  unzip                         6.0-4      De-archiver for .zip files

-- no debconf information

Attachment: e2fsprogs_1.41.12-4stable1.dsc
Description: e2fsprogs_1.41.12-4stable1.dsc

Attachment: 0001-try-to-use-debian-source-format-to-identify-native-p.patch
Description: 0001-try-to-use-debian-source-format-to-identify-native-p.patch

Reply via email to