r61776 - /website/subversion.pod

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Aug 20 00:08:49 2010
New Revision: 61776

URL: http://svn.debian.org/wsvn/?sc=1&rev=61776
Log:
* mention svn-upgrade --uscan
* minor additions (uscan --report, svn diff)

Modified:
    website/subversion.pod

Modified: website/subversion.pod
URL: http://svn.debian.org/wsvn/website/subversion.pod?rev=61776&op=diff
==============================================================================
--- website/subversion.pod (original)
+++ website/subversion.pod Fri Aug 20 00:08:49 2010
@@ -284,6 +284,8 @@
 When a new version of a package has been released upstream, the SVN repository
 should be brought up to date and a new Debian upload should be made.
 
+=head2 6.1 Classical version
+
 If the Debian package has a C<debian/watch> file, you can use the B<uscan>
 utility from within the C<trunk/> directory to check for and fetch the latest
 upstream release:
@@ -316,9 +318,18 @@
 result into C<trunk/>.  You can then review and fine-tune the result, and
 adjust the C<debian/changelog>, manually or using B<debchange>.
 
-Finally, commit your changes to SVN using B<svn ci> or B<debcommit>.  Then
-you can build and release/tag the package normally as shown in the previous
-sections.
+=head2 6.2 Easier version
+
+Since version 0.6.25 B<svn-upgrade> has a C<--uscan> switch, so the previous
+two steps can be combined as
+
+    svn-upgrade --uscan
+
+(maybe after checking for newer versions with B<uscan --report --verbose>.)
+
+Finally, for both versions, check the diff with B<svn diff> and commit your
+changes to SVN using B<svn ci> or B<debcommit>. Then you can build and
+release/tag the package normally as shown in the previous sections.
 
 =head1 7. Maintaining debian/changelog
 
@@ -439,7 +450,7 @@
 
 =head1 License
 
-Copyright (c) 2004-2007 by the individual authors and contributors noted
+Copyright (c) 2004-2010 by the individual authors and contributors noted
 above.  All rights reserved. This document is free software; you may
 redistribute it and/or modify it under the same terms as Perl itself