r6142 - /website/subversion.pod

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

Author: gregoa-guest
Date: Mon Jul 30 18:13:33 2007
New Revision: 6142

URL: http://svn.debian.org/wsvn/?sc=1&rev=6142
Log:
minor additions to subversion.pod

Modified:
    website/subversion.pod

Modified: website/subversion.pod
URL: http://svn.debian.org/wsvn/website/subversion.pod?rev=6142&op=diff
==============================================================================
--- website/subversion.pod (original)
+++ website/subversion.pod Mon Jul 30 18:13:33 2007
@@ -75,15 +75,15 @@
 
     trunk/libfile-touch-perl/
     tags/libfile-touch-perl/
-    branches/libfile-touch-perl/
+    branches/upstream/libfile-touch-perl/
     trunk/libperl6-export-perl/
     tags/libperl6-export-perl/
-    branches/libperl6-export-perl/
-
-Currently, C<branches/> is where the upstream code resides.  Various tools use
-this branch to download original tarballs to generate C<.diff.gz> files when
-building.  This is also the only branch we will be using for now, but time will
-tell.
+    branches/upstream/libperl6-export-perl/
+
+Currently, C<branches/upstream/> is where the upstream code resides. 
+Various tools use this branch to download original tarballs to generate
+C<.diff.gz> files when building. -- Only few packages have other branches,
+e.g. for backports.
 
 In C<tags/>, we tag all of our releases like we do in CVS, like so:
 
@@ -102,6 +102,9 @@
         libfile-touch-perl_0.04-1.dsc \
         svn+ssh://user@svn.debian.org/svn/pkg-perl/
 
+Other useful options might be "-c 0" (don't check out anything) and "-t
+trunk/tarballs" (put .orig.tar.gz in directory trunk/tarballs).
+
 You might want to upload your public DSA key to the SVN server before starting
 this procedure, see L</"7. Hints and Tricks">.
 
@@ -126,7 +129,7 @@
 as long as "our" releases are tagged properly.
 
     svn copy \
-        svn+ssh://user@svn.debian.org/svn/pkg-perl/trunk/packages/libfile-touch-perl/ \
+        svn+ssh://user@svn.debian.org/svn/pkg-perl/trunk/libfile-touch-perl/ \
         svn+ssh://user@svn.debian.org/svn/pkg-perl/tags/libfile-touch-perl/0.04-1
 
 More about tagging later.
@@ -270,8 +273,9 @@
     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>.
+new upstream versions of packages with watch files can be easily checked by using
+the Debian Watch Health System (DEHS) at L<http://dehs.alioth.debian.org> or by going to
+L<http://pkg-perl.alioth.debian.org/qa/versions.html>.
 
 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
@@ -287,8 +291,9 @@
 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.
+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.
 
 =head1 7. Hints and Tricks
 
@@ -340,9 +345,19 @@
 
 =back
 
+=head1 Contributors
+
+=over
+
+=item * Gregor Herrmann
+
+=item * Joey Hess
+
+=back
+
 =head1 License
 
-Copyright (c) 2004-2006 Debian Perl Group.  All rights reserved. This document
+Copyright (c) 2004-2007 Debian Perl Group.  All rights reserved. This document
 is free software; you may redistribute it and/or modify it under the same terms
 as Perl itself