Barry Warsaw has proposed merging lp:~barry/ubuntu-packaging-guide/mergepackage into lp:ubuntu-packaging-guide.
Requested reviews: Daniel Holbach (dholbach) For more details, see: https://code.launchpad.net/~barry/ubuntu-packaging-guide/mergepackage/+merge/62721 Add a note about using --package-merge when building the source package after a Debian merge. -- https://code.launchpad.net/~barry/ubuntu-packaging-guide/mergepackage/+merge/62721 Your team Ubuntu Packaging Guide Team is subscribed to branch lp:ubuntu-packaging-guide.
=== modified file 'udd-merging.rst' --- udd-merging.rst 2011-04-14 20:35:19 +0000 +++ udd-merging.rst 2011-05-27 18:06:36 +0000 @@ -65,6 +65,15 @@ After testing and committing the merge, you will need to seek sponsorship or upload to the archive in the normal way. +If you are going to build the source package from this merged branch, you +would use the ``-S`` option to the ``bd`` command. One other thing you'll +want to consider is also using the ``--package-merge`` option. This will add +the appropriate ``-v`` and ``-sa`` options to the source package so that all +the changelog entries since the last Ubuntu change will be included in your +``_source.changes`` file. For example:: + + $ bzr bd -S --package-merge + Merging a new upstream version ==============================
_______________________________________________ Mailing list: https://launchpad.net/~ubuntu-packaging-guide-team Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-packaging-guide-team More help : https://help.launchpad.net/ListHelp
