Ubuntu
bzr-builddeb package

merge mode should automatically apply patches for 3.0 (quilt) sources

Bug #616791 reported by Martin Pitt
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-builddeb
Fix Released
Medium
Jelmer Vernooij
bzr-builddeb 2.8.1
bzr-builddeb (Ubuntu)
Fix Released
Medium
Jelmer Vernooij

Bug Description

Binary package hint: bzr-builddeb

A lot of packages still use debian/ only packaging branches in merge mode. Now that the "3.0 (quilt)" source format becomes prevalent, this becomes quite error prone and inconvenient, because operations like "bzr bd" or "bzr bd-do" do not behave like dpkg-source, they do not apply patches automatically.

The smallest example package known to me is sysfsutils:

$ debcheckout sysfsutils
$ cd sysfsutils/
$ cat debian/source/format
3.0 (quilt)
$ bzr bd-do
$ quilt applied
No patches applied

This is even worse if you build binaries with "bzr bd -- -b", since then you get an entire package build without applied patches.

Related branches

lp:~jelmer/bzr-builddeb/auto-apply-quilt
James Westby: Approve
Diff: 640 lines (+409/-52) (has conflicts)
8 files modified
builder.py (+19/-4)
cmds.py (+100/-39)
debian/changelog (+9/-0)
merge_quilt.py (+27/-0)
quilt.py (+154/-0)
tests/test_quilt.py (+90/-0)
tests/test_util.py (+5/-5)
util.py (+5/-4)
lp:bzr-builddeb
lp:debian/bzr-builddeb
lp:ubuntu/precise/bzr-builddeb
Revision history for this message
James Westby (james-w) wrote :

Indeed, good catch.

Thanks,

James

Changed in bzr-builddeb (Ubuntu):
status: New → Triaged
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: New → Triaged
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: Triaged → In Progress
assignee: nobody → Jelmer Vernooij (jelmer)
Changed in bzr-builddeb (Ubuntu):
assignee: nobody → Jelmer Vernooij (jelmer)
status: Triaged → In Progress
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: In Progress → Fix Committed
milestone: none → 2.8.1
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package bzr-builddeb - 2.8.1

---------------
bzr-builddeb (2.8.1) unstable; urgency=low

  * New revision specifier 'upstream:'. LP: #905728
  * Imports are now deferred in command definitions, to speed up
    commands like 'bzr bash-completion'. LP: #903650
  * Provide merge-package functionality as a hook for 'bzr merge'.
    LP: #486075, LP: #910900
  * Add pre-commit hook that warns about applied quilt patches, and can
    automatically unapply/apply all quilt patches. LP: #608670
  * Automatically unapply patches before merge operations.
    LP: #815854
  * Include full changelog paths that were checked in error message.
    LP: #811459
  * Cope with unicode strings being specified to TarfileSource. Based on
    patch by Gediminas Paulauskas. LP: #911262
  * Automatically apply patches for 3.0 (quilt) packages in 'bzr bd-do'
    and 'bzr bd'. LP: #616791
  * Switch to source format '3.0 (native)'.
  * Skip import tests for .tar.xz if not supported by pristine-tar.
    Closes: #655463, LP: #917112

 -- Jelmer Vernooij <email address hidden> Wed, 18 Jan 2012 01:24:21 +0100

Changed in bzr-builddeb (Ubuntu):
status: In Progress → Fix Released
Jelmer Vernooij (jelmer)
Changed in bzr-builddeb:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.