Patch pilot report 2011-07-07

[Didier Roche]

I switch my patch pilot day as I won't be available next week for doing it.


https://code.launchpad.net/~jtaylor/ubuntu/oneiric/qtemu/fix-756221/+merge/67153
approved, ensured that it was sent upstream and to debian, and merged.


https://bugs.launchpad.net/ubuntu/+bug/806923
sync req acked

https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-recordlog/fix-for-756108/+merge/67110
https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-ssh/fix-for-756110/+merge/67112
https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-cpu/fix-for-756128/+merge/67113
https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-pci/fix-for-756050/+merge/67107
https://code.launchpad.net/~scarneiro/ubuntu/oneiric/opendrim-lmp-baseserver/fix-for-756081/+merge/67108
• test built, check it was fwed upstream and uploaded

https://bugs.launchpad.net/ubuntu/+source/libgtk2-perl/+bug/805778
• sponsored

https://code.launchpad.net/~dmitrij.ledkov/ubuntu/oneiric/etckeeper/dhpy2/+merge/65741
  * sponsored. Ask to send the changes to debian


https://code.launchpad.net/~elvisd79/ubuntu/oneiric/compiz-plugins-main/fix-for-772177/+merge/65740
-> had to set the branch as WIP as I couldn't reject it. the branch link 
to a bug where I already rejected the exact same patch with a ful rationale.
I directly copy those explanation on the bug report 
(https://bugs.launchpad.net/hundredpapercuts/+bug/772177/comments/8) 
hoping that people will read it this time. :)

https://code.launchpad.net/~jpickett/ubuntu/oneiric/ubuntu-docs/fix-for-804855-bitesize/+merge/67200
-> lot of conflicts for just a typo change, seems the base branch isn't 
the same. I refused the merge and tell the newcomer to either retry from 
a fresh branch or come on IRC to get some online help.


I took a look at some import branches conflicts, some are interesting:

https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-powermanagement/oneiric-201107070710/+merge/67122
-> the patch and content is in the source package. The thing is, as it 
was the first patch, the debian/patches directory was created in both 
branches, and so the ids don't match, hence the conflict. Any idea how 
to detect (making a traditional diff first?) and not make the 
autoimporter conflicting?
To avoid further conflicts, as I couldn't set the status to rejected but 
still waiting to get the MR off the list, I set the status to WIP. I 
didn't simply deleted it as maybe James wants to do some autogenerated 
branch cleanup.
I filed https://bugs.launchpad.net/udd/+bug/806940

https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-bios/oneiric-201107070710/+merge/67121
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-softwareinventory/oneiric-201107070710/+merge/67120
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-recordlog/oneiric-201107071310/+merge/67184
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-boot/oneiric-201107071348/+merge/67190
https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-pci/oneiric-201107071411/+merge/67198
Same issue than above

https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/banshee/oneiric-201106241409/+merge/65794
Similar issue than above, but with a new file id;

https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/pkg-config/oneiric-201107030008/+merge/66708
Real issue between the changelog description (and what has been supposed 
to change) and the upload done. Clarified in a comment the situaton and 
suscribe slangasek. Removed from the sponsor queue.

https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/gnome-desktop3/oneiric-201107061510/+merge/67055
known conflict with generated debian/control, reject the merge as not 
relevant.
Set it as WIP and add a comment about it as couldn't delete it.

https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/dbus/oneiric-201107071212/+merge/67176
There was a staging change (explanation added by Clint) which wasn't 
taken into account in the last upload. Those staging changes are really 
easy to miss.
The change didn't worth a dbus upload, I just readded it to the udd vcs 
hoping that next upload will take it :)
-> this come back to the discussion about should lp:ubuntu/package 
should reflect what is in the development release or can we stage some 
pending change there? If so, how can we check easily with everyone's 
different workflow for uploading that we don't miss something?

21 less elements in the queue! ;)

Cheers,
Didier