r65991 - /website/git.pod

[ghedo-guest at users.alioth.debian.org]

Author: ghedo-guest
Date: Sun Dec 19 14:47:08 2010
New Revision: 65991

URL: http://svn.debian.org/wsvn/?sc=1&rev=65991
Log:
add uscan steps to upstream upgrade walkthrough

Modified:
    website/git.pod

Modified: website/git.pod
URL: http://svn.debian.org/wsvn/website/git.pod?rev=65991&op=diff
==============================================================================
--- website/git.pod (original)
+++ website/git.pod Sun Dec 19 14:47:08 2010
@@ -116,13 +116,31 @@
 =head2 * upgrading to a new upstream release
 
 First make sure that the local repository is up to date, for example using
-L<gbp-pull(1)>. Then import the new upstream release:
+L<gbp-pull(1)>.
+
+If the Debian package has a debian/watch file you can use the L<uscan(1)>
+tool to check for the latest upstream release and download it:
+
+ $ uscan
+
+This will download the latest tarball in ../ and symlink it to the proper
+.orig.tar.gz (you can use the C<--rename> options of uscan to directly
+rename the tarball without symlinking). If the watch file is not present
+you have to download the tarball manually.
+
+Then import the new upstream release in the git repository:
 
  $ git-import-orig --pritine-tar ../libfoo-bar-perl_2.00_orig.tar.gz
 
 This will import the new sources in the C<upstream> branch, update tarball info
 in the C<pristine-tar> branch, tag the upstream release and finally merge that
 tag in the C<master> branch. It would also update debian/changelog.
+
+B<git-import-orig> has also a C<--uscan> option:
+
+ $ git-import-orig --uscan --pristine-tar
+
+This combines the previous two steps in a single command.
 
  $ debcommit -a -m'new upsream release 2.00'