Differences between revisions 4 and 5
⇤ ← Revision 4 as of 2012-02-22 12:07:28 →
Size: 1449
Editor: FabrizioRegalli
Comment:
← Revision 5 as of 2012-02-22 12:10:02 → ⇥
Size: 1521
Editor: FabrizioRegalli
Comment:
Deletions are marked like this. Additions are marked like this.
Line 9: Line 9:
cd adblock-plus {{{ cd adblock-plus }}}
Line 13: Line 13:
git fetch origin pristine-tar:pristine-tar upstream:upstream {{{ git fetch origin pristine-tar:pristine-tar upstream:upstream }}}
Line 17: Line 17:
uscan --debug --repack {{{ uscan --debug --repack }}}
Line 23: Line 23:
git-import-orig --pristine-tar ../<new_pack>.orig.tar.{gz,bz2} {{{ git-import-orig --pristine-tar ../<new_pack>.orig.tar.{gz,bz2} }}}
Line 27: Line 27:
git push --all {{{ git push --all }}}
Line 31: Line 31:
git push --tags {{{ git push --tags }}}
Line 37: Line 37:
{{{
Line 40: Line 41:
}}}
Line 45: Line 46:
{{{
Line 48: Line 50:
}}}
Line 51: Line 53:
alias debcommit='{ quilt pop -a || [ $? = 2 ]; } && debcommit' {{{ alias debcommit='{ quilt pop -a || [ $? = 2 ]; } && debcommit' }}}

In this guide we consider adblock-plus package as example.

- Clone the git repository:

 git clone git+ssh://git.debian.org/git/pkg-mozext/adblock-plus.git 

- Go inside new adblock-plus directory created

 cd adblock-plus 

- Fetch the pristine-tar and upstream branches

 git fetch origin pristine-tar:pristine-tar upstream:upstream 

- uscan to get the new upstream release

 uscan --debug --repack 

Please USE the repack option (check for it in d/watch and if does not exist, add it)

- upgrade

 git-import-orig --pristine-tar ../<new_pack>.orig.tar.{gz,bz2} 

- push

 git push --all 

- tag

 git push --tags 

From now we can start with all required modification. Tips:

Add these rows to~/.gbp.conf: 

 [git-import-orig]
 # run hook after the import:
 postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH

(it automatically creates a new changelog entry with snapshot)

If using the 3.0 (quilt) source format may also be handy to add the .pc directory to the .gitignore file. To do this globally, you may use the following: 

 git config --global --add core.excludesfile ~/.gitignore
 echo '/.pc/' >> ~/.gitignore
(If you have a Git repository in your home, you may want to change ~/.gitignore above).

If you use 'debcommit' instead of 'git commit' here's a useful alias:

 alias debcommit='{ quilt pop -a || [ $? = 2 ]; } && debcommit' 

(it removes all patches before commit)