merging
|
⇤ ← Revision 1 as of 2008-10-16 21:53:27
Size: 1676
Comment:
|
← Revision 2 as of 2008-10-17 05:30:00 ⇥
Size: 1768
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| Process for merge | ||<tablestyle="float:right; font-size: 0.9em; width:40%; background:#F1F1ED; margin: 0 0 1em 1em;" style="padding:0.5em;"><<TableOfContents>>|| |
| Line 3: | Line 3: |
| 1. Check MoM & DaD for merge • Check nobody is assigned via comment on DaD and LP for open bug (you can check with uploader of package also) 2. Download the package with the corresponding grab-merge.sh script (i prefer MoM as it unpacks) - Check the REPORT file and note the conflicts and also the build flag you should use 3. Change into directory & build the package with debuild -S -sa 4. Create the debdiff by diff debian.dsc ubuntu.dsc • This is important that you say debian first then ubuntu 5. Check the debdiff file - changes with a + (added by ubuntu) - (removed by ubuntu from debian package) 6. Check the debian/changelog to determine what the ubuntu* revisions have put into the debian revision 7. Check if these are still relevant (check the actual file you are patching!) 8. If relevant - include these in the changelog as carried across 9. Check if you are closing any existing LP bugs by this revision 10. debuild -S -v(version from REPORT) 11. debdiff again 12. sudo pbuilder build ubuntu.dsc • check that it builds correctly! (read output carefully as it may fail and you wont notice (ok, maybe ive done that before)) 13. Create a bug on LP for the merge eg. Please merge name new version (universe) from Debian (unstable). • paste your changelog into the bug • submit the bug - record the bug number 14. Edit your debdiff to include the (LP: #bugnumber) to the changelog to automatically close the bug... |
= Process for merge = |
| Line 27: | Line 5: |
| Notes When building for PPA - use debuild -S -sa In this example the "-" means ignore error. -$(MAKE) distclean (its generally better to trap specific error) diff -Nurp when making patches |
1. Check MoM & DaD for merge<<BR>> • Check nobody is assigned via comment on DaD and LP for open bug (you can check with uploader of package also)<<BR>> 2. Download the package with the corresponding grab-merge.sh script (i prefer MoM as it unpacks)<<BR>> - Check the REPORT file and note the conflicts and also the build flag you should use<<BR>> 3. Change into directory & build the package with debuild -S -sa<<BR>> 4. Create the debdiff by diff debian.dsc ubuntu.dsc<<BR>> • This is important that you say debian first then ubuntu<<BR>> 5. Check the debdiff file - changes with a<<BR>> + (added by ubuntu)<<BR>> - (removed by ubuntu from debian package)<<BR>> 6. Check the debian/changelog to determine what the ubuntu* revisions have put into the debian revision<<BR>> 7. Check if these are still relevant (check the actual file you are patching!)<<BR>> 8. If relevant - include these in the changelog as carried across<<BR>> 9. Check if you are closing any existing LP bugs by this revision<<BR>> 10. debuild -S -v(version from REPORT)<<BR>> 11. debdiff again<<BR>> 12. sudo pbuilder build ubuntu.dsc<<BR>> • check that it builds correctly! (read output carefully as it may fail and you wont notice (ok, maybe ive done that before))<<BR>> 13. Create a bug on LP for the merge<<BR>> eg. Please merge name new version (universe) from Debian (unstable).<<BR>> • paste your changelog into the bug<<BR>> • submit the bug - record the bug number<<BR>> 14. Edit your debdiff to include the (LP: #bugnumber) to the changelog to automatically close the bug...<<BR>> |
Contents |
Process for merge
1. Check MoM & DaD for merge
• Check nobody is assigned via comment on DaD and LP for open bug (you can check with uploader of package also)
2. Download the package with the corresponding grab-merge.sh script (i prefer MoM as it unpacks)
- Check the REPORT file and note the conflicts and also the build flag you should use
3. Change into directory & build the package with debuild -S -sa
4. Create the debdiff by diff debian.dsc ubuntu.dsc
• This is important that you say debian first then ubuntu
5. Check the debdiff file - changes with a
+ (added by ubuntu)
- (removed by ubuntu from debian package)
6. Check the debian/changelog to determine what the ubuntu* revisions have put into the debian revision
7. Check if these are still relevant (check the actual file you are patching!)
8. If relevant - include these in the changelog as carried across
9. Check if you are closing any existing LP bugs by this revision
10. debuild -S -v(version from REPORT)
11. debdiff again
12. sudo pbuilder build ubuntu.dsc
• check that it builds correctly! (read output carefully as it may fail and you wont notice (ok, maybe ive done that before))
13. Create a bug on LP for the merge
eg. Please merge name new version (universe) from Debian (unstable).
• paste your changelog into the bug
• submit the bug - record the bug number
14. Edit your debdiff to include the (LP: #bugnumber) to the changelog to automatically close the bug...
stefanlsd/MOTU/merging (last edited 2008-10-17 05:30:00 by 41)