On Sun, Sep 06, 2009 at 03:53:36PM -0700, Vagrant Cascadian wrote:
On Tue, Jun 23, 2009 at 11:20:41AM +0200, Jonas Smedegaard wrote:On Mon, Jun 22, 2009 at 04:32:58PM -0700, Vagrant Cascadian wrote: >as requested, i've put together a new upstream tarball.I'll have a look at it later (too busy right now)well, i gave it a go...i attempted to import it into the git repository and update the packaging to prepare for a new release, and the commits seem to have been pushed, but it didn't seem to push the tags, and i'm not quite sure about the upstream/pristine-tar branches that git-import-orig worked with and/or created.
Looks good to me.As I understand it, Git only pushes tags when explicitly told. I use the following (and are careful to not create unofficial branches):
git push --all && git push --tags
i'm not so savvy with git/git-buildpackage, but this is at least giving me some practical application... :)
These are the only commands I usually need (together with the defaults included in debian/gbp.conf):
git-import-orig --fast-import --sign-tags ../properly-named-new-tarball ... git log git log -p git dch --since 60089e3That last one use some leftmost digits of the hash of a git commit - usually the latest entry touching the changelog file.
i'll try and get some clues on how to clean it up and upload after 0.4.0b-5 migrates to testing.i'll also have to figure out how to use the debian/copyright_hints stuff...
Run these commands: DEB_MAINTAINER_MODE=1 fakeroot debian/rules pre-build DEB_MAINTAINER_MODE=1 fakeroot debian/rules clean mv debian/copyright_newhints debian/copyright_hints git diffThat last one is the important one: the very point of the excercise is to check if changes to debian/copyright (which is maintained by hand) is needed.
the clean rule, when done in DEB_MAINTAINER_MODE, might also update debian/control. Make sure to verify that too, and add a note in changelog if things have changed.
I have learned to separate changes to changelog from other commits, to ease eventual reverting of changes and cherry-picking across packages.
The automated changes makes little sense to isolate in own commits, so I usually do those together - e.g. like this after inspecting with "git diff" above:
git commit -m "Update changelog, control and copyright hints." -a or the following to finalize a package: DEB_MAINTAINER_MODE=1 fakeroot debian/rules pre-build DEB_MAINTAINER_MODE=1 fakeroot debian/rules clean git stat mv debian/copyright_newhints debian/copyright_hints (if needed) git diff dch -r git commit -m "Prepare release. Update changelog, control and copyright hints." -a localgitcowdebuild sid --git-tagThat last command is a wrapper for debuild+cowdancer+pbuilder available at my /usr/local/bin repository at git://source.jones.dk/bin - if interested, then the following command bootstraps such environment (provided that the relevant scripts are in PATH, e.g. put in /usr/local/bin):
localcowbuilder-create sid You might want to install approx and adjust /etc/pbuilderrc to use it. Hope that all makes sense, and is of some use :-) - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private
signature.asc
Description: Digital signature