r2243 - website

[Julian Mehnle]

Author: jmehnle-guest
Date: 2006-02-27 01:13:54 +0000 (Mon, 27 Feb 2006)
New Revision: 2243

Modified:
   website/subversion.pod
Log:
website/subversion.pod
* Filled in the missing parts and section 6 for upstream upgrades.
* Don't explain implicit tagging using `svn-buildpackage --svn-tag`, as tagging
  is already explained in section 5, "Tagging and Releasing".
* Explain how to make svn-buildpackage lintian-check the built package.


Modified: website/subversion.pod
===================================================================
--- website/subversion.pod	2006-02-27 00:23:52 UTC (rev 2242)
+++ website/subversion.pod	2006-02-27 01:13:54 UTC (rev 2243)
@@ -67,7 +67,9 @@
 
 =item * svn-upgrade -- Used to upgrade a check-out to a new upstream version.
 
-TODO
+When a new version of the package has been released upstream, B<svn-upgrade>
+can be used to bring the SVN repository up to date and prepare a new Debian
+upload easily.
 
 =back
 
@@ -196,13 +198,12 @@
 directory (manually, or using C<apt-get source>).  If you make the first and
 subsequent uploads of an upstream version, you don't have to worry about this.
 
-If you are satisfied with the package, and want to build the final package (the
-one that is going to be uploaded to the archive), use
+To build the package, use:
 
-    svn-buildpackage --svn-tag [-rfakeroot] [-kyourkey] [-uc] [-us]
+    svn-buildpackage -rfakeroot -uc -us [-kyourkey] [--svn-lintian]
 
-to make svn-buildpackage create a tag of this release.  You should hardly ever
-need to tag a release manually.
+The C<--svn-lintian> option can (and should) be used to check the resulting
+package for sanity and for compliance with Debian policy.
 
 =head2 4.2 Building an already tagged release
 
@@ -274,8 +275,36 @@
 
 =head1 6. Upstream upgrade
 
-TODO
+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.
 
+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:
+
+    uscan --no-symlink
+
+This will download the latest upstream tarball to C<../>.  The availability of
+new upstream versions of packages with watch files can be easily checked using
+the Debian Watch Health System (DEHS) at L<http://dehs.alioth.debian.org>.
+
+If the package has no watch file, you have to download the upstream tarball
+manually.  Or you could create a watch file yourself, which is always a good
+idea -- see L<uscan(1)>.
+
+Then use B<svn-upgrade> from within C<trunk/>, passing it the name of the
+upstream tarball you just downloaded.  For example:
+
+    svn-upgrade ../File-Touch-0.04.tar.gz
+
+This will upgrade the upstream package in the SVN repository, automatically
+merge the Debian changes from the last Debian release with it, and place the
+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>.  Then you can build and
+release/tag the package normally as shown in the previous sections.
+
 =head1 7. Hints and Tricks
 
 =over 4