Use new gbp <command> syntax

2 files changed, 15 insertions, 16 deletions

diff --git a/projects/git-buildpackage.mdwn b/projects/git-buildpackage.mdwn
index db8d8e4..53e0b3c 100644
--- a/projects/git-buildpackage.mdwn
+++ b/projects/git-buildpackage.mdwn
@@ -5,19 +5,19 @@ Suite to help with maintaining [Debian](http://www.debian.org) packages in [Git]
 ### Tools
 GBP ships the following tools:
 
-* *git-import-{dsc,dscs}*: import existing Debian source packages into a git repository
-* *git-import-orig*: import a new upstream version into the git repository
-* *git-buildpackage*: build a package out of a git repository, check for local modifications and tag appropriately
-* *git-dch*: generate Debian changelog entries from Git commit messages
-* *gbp-pq*: maintain *debian/patches* on a patch queue branch
-* *gbp-clone*: clone a remote repository and make it ready for *git-buildpackage*
-* *gbp-pull*: pull from a remote repository and update the necessary branches
-* *gbp-create-remote-repo*: mirror your git repository to a remote side
+* *gbp import-{dsc,dscs}*: import existing Debian source packages into a git repository
+* *gbp import-orig*: import a new upstream version into the git repository
+* *gbp buildpackage*: build a package out of a git repository, check for local modifications and tag appropriately
+* *gbp dch*: generate Debian changelog entries from Git commit messages
+* *gbp pq*: maintain *debian/patches* on a patch queue branch
+* *gbp clone*: clone a remote repository and make it ready for *gbp buildpackage*
+* *gbp pull*: pull from a remote repository and update the necessary branches
+* *gbp create-remote-repo*: mirror your git repository to a remote side
 
 There are some helpers in */usr/share/doc/git-buildpackage/examples/*:
 
-* *gbp-posttag-push*: posttag hook for *git-buildpackage* to push out the necessary changes to a remote repository after a release
-* *gbp-add-patch*: Commits a patch to the current branch and uses the Path Header for the commit message, useful after *gbp-pq* *export*.
+* *gbp-posttag-push*: posttag hook for *gbp buildpackage* to push out the necessary changes to a remote repository after a release
+* *gbp-add-patch*: Commits a patch to the current branch and uses the Path Header for the commit message, useful after *gbp pq export*.
 
 [[!template  id=flattr thing="48091" name="Git-buildpackage"]]
 
@@ -32,7 +32,7 @@ The source code is available via git (of course):
     
     git clone http://honk.sigxcpu.org/git/git-buildpackage.git
 
-You can browse the source code online via [git.debian.org](http://git.debian.org/?p=users/agx/git-buildpackage.git;a=summary).
+You can browse the source code online via [git.debian.org](http://git.debian.org/?p=users/agx/git-buildpackage.git;a=summary). There's also a clone on [github](https://github.com/agx/git-buildpackage).
 
 ### Debian packages
 Debian packages of git-buildpackage can be downloaded from the [[!debpkg git-buildpackage desc="Debian Archive"]]. Git snapshots are available [here](http://honk.sigxcpu.org:8001/job/git-buildpackage/).
@@ -48,8 +48,7 @@ Here's my current [[gbp.conf]].
 * [Chef Cookbook for gbp][1]
 
 ### Todo
-* use git-fast-import in git-import-dsc(s) ([[!debbug 506211]])
-* templating for git-dch ([[!debbug 536719]]. [[!debbug 529332]])
+* templating for gbp dch ([[!debbug 536719]]. [[!debbug 529332]])
 * translate the manual
 * [[!debbug git-buildpackage desc="bugs"]] filed in the Debian bugtracking system
 
diff --git a/projects/git-buildpackage/gbp.conf b/projects/git-buildpackage/gbp.conf
index 3065548..7da678d 100644
--- a/projects/git-buildpackage/gbp.conf
+++ b/projects/git-buildpackage/gbp.conf
@@ -5,7 +5,7 @@ keyid = 0x3f3e6426
 # use pristine tar by defaul
 pristine-tar = True
 
-[git-dch]
+[dch]
 # Parse meta tags like Closes: from commit messages
 meta = True
 # Add seven digits of the commits sha1 to the commit message
@@ -17,7 +17,7 @@ full = True
 # Ignore these in commit messages
 ignore-regex = (Signed-off|Acked)-by:
 
-[git-buildpackage]
+[buildpackage]
 # Automatically push to remote repo after tagging a new release
 posttag = /usr/share/doc/git-buildpackage/examples/gbp-posttag-push
 # Run Lintian after a succesful build
@@ -27,6 +27,6 @@ builder = dpkg-buildpackage -i -I -uc -us
 # Clean command
 cleaner = /bin/true
 
-[git-import-orig]
+[import-orig]
 # Automatically forward the changelog after importing a new upstream version
 postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH