Merge lp://qastaging/~l3on/ubuntu/precise/piuparts/merge+patch into lp://qastaging/ubuntu/precise/piuparts

Proposed by Leo Iannacone
Status: Merged
Merged at revision: 20
Proposed branch: lp://qastaging/~l3on/ubuntu/precise/piuparts/merge+patch
Merge into: lp://qastaging/ubuntu/precise/piuparts
Diff against target: 1399 lines (+423/-221)
13 files modified
Makefile (+4/-2)
README.txt (+25/-0)
TODO (+9/-25)
debian/NEWS (+3/-3)
debian/changelog (+101/-45)
debian/patches/add-existing-chroot-option.patch (+84/-0)
debian/patches/series (+1/-0)
piuparts-analyze.py (+4/-2)
piuparts-report.py (+63/-53)
piuparts-slave.py (+7/-7)
piuparts.1.txt (+10/-4)
piuparts.py (+109/-77)
piupartslib/packagesdb.py (+3/-3)
To merge this branch: bzr merge lp://qastaging/~l3on/ubuntu/precise/piuparts/merge+patch
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Needs Fixing
Ubuntu branches Pending
Review via email: mp+91569@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

There appears to be an issue with your added patch: because it both has the changes inline to the package and the patch applied, this looks as though it's working, but should be fixed:
 - debian/control is missing a build-depends-indep on quilt.
 - debian/rules probably needs some small tasks added to apply patches.

However, previous uploaders have been applying their changes directly, which is fine in the context of a native package like piuparts. You could just drop the patch parts (debian/patches) and have the changes kept for the files directly.

review: Needs Fixing
Revision history for this message
Leo Iannacone (l3on) wrote :

I would prefer maintain patch just to fast see which changes I added.

I mean, if some day the patch will be applied in upstream, it will be very simple remove these ubuntu changes starting from looking at patch_file itself.
The patch file exists just as a simply way to trace changes that can be dropped in the future.

Revision history for this message
Stefano Rivera (stefanor) wrote :

Has the whole Ubuntu delta been forwarded to Debian? Plesae forward any bits that haven't. It'd be nice to get this back in sync some day...

Revision history for this message
Stefano Rivera (stefanor) wrote :

Yeah, we don't generally change patch systems in Ubuntu. Leo is following the approach I'd recommend (assuming the patches are simple enough)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: