[DRE-commits] r3910 - trunk/website/src

[Lucas Nussbaum]

Author: lucas
Date: 2009-08-08 16:43:08 +0000 (Sat, 08 Aug 2009)
New Revision: 3910

Modified:
   trunk/website/src/30.subversion.en.page
Log:
update doc

Modified: trunk/website/src/30.subversion.en.page
===================================================================
--- trunk/website/src/30.subversion.en.page	2009-08-08 16:36:03 UTC (rev 3909)
+++ trunk/website/src/30.subversion.en.page	2009-08-08 16:43:08 UTC (rev 3910)
@@ -13,30 +13,17 @@
 Our "repository":http://svn.debian.org/wsvn/pkg-ruby-extras/ is structured like this:
 
 <pre><code>pkg-ruby-extras
-+-- packages
++-- trunk
     +-- libfoo-ruby
     +-- libbar-ruby
     +-- ...
-+-- packages-wip
-    +-- libblop-ruby
-    +-- libbaz-ruby
-    +-- ...
-+-- tools
-    +-- ...
-+-- website
-    +-- ...</code></pre>
-
-All our packages will live inside the @packages/@ and @packages-wip/@ directories.  @packages-wip/@ contains packages which have not been uploaded to Debian yet (WIP stands for Work In Progress), and packages are moved to @packages/@ after their first upload. Each package directory will have a structure common to subversion-managed projects:
-
-<pre><code>libfoo-ruby
+    +-- tools
+    +-- website
 +-- branches
-+-- tags
-+-- trunk</code></pre>
++-- tags</code></pre>
 
- at trunk@ is where your current version lives. @tags@ is where you copy snapshots when uploading. So there must be one tagged copy for each uploaded version of a package. @branches@ is were you can make copies to experiment something new without breaking the @trunk at . Those are common-used conventions: you can look with more details in the "SVN Book":http://svnbook.red-bean.com/.
+All our packages will live inside the @trunk/@ directory. When uploaded, the version being uploaded is copied to @tags/@.
 
-h3. Injecting a new package to Subversion
-
 First, you have to build your package outside of the SVN tree. You should get something like that:
 <pre><code>.
 |-- libfeedparser-ruby-0.1/ (build dir)
@@ -49,43 +36,31 @@
 `-- libxfeedparser-ruby_0.1-1_all.deb</code></pre>
 
 Then just do:
-<pre><code>svn-inject -v -o libfeedparser-ruby_0.1-1.dsc \
-       svn+ssh://LOGIN@svn.debian.org/svn/pkg-ruby-extras/packages-wip/</code></pre>
+<pre><code>svn-inject -v -l 2 -o libfeedparser-ruby_0.1-1.dsc \
+       svn+ssh://LOGIN@svn.debian.org/svn/pkg-ruby-extras/</code></pre>
 
 You should not try to import your package manually: this handles a lot of small gory details you do not want to know.
 
 *N.B.* Make sure that you have registered a SSH key, else you will be prompted for your password a good dozen of times.
 
-This script creates a @branches@ directory in svn that we do not use. You should remove this directory after the svn-inject operation. Get first a fresh copy of the package you just injected in svn, then delete the unneeded @branches@ directory.
-<pre><code>$ cd Debian/packages
-$ svn co svn+ssh://svn.debian.org/svn/pkg-ruby-extras/packages-wip/libfoo-ruby
-[...]
-$ cd libfoo-ruby
-$ svn remove branches
-[...]
-$ svn commit -m "Deleted branches directory."</code></pre>
-
 h3. Checking out
 
 You can check a package out by using:
 
-<pre><code>$ svn checkout svn+ssh://svn.debian.org/svn/pkg-ruby-extras/packages-wip/libfoo-ruby</code></pre>
+<pre><code>$ svn checkout svn+ssh://svn.debian.org/svn/pkg-ruby-extras/trunk/libfoo-ruby</code></pre>
 
-Alternatively, you can check out only the package's current version:
-<pre><code>$ svn checkout svn+ssh://svn.debian.org/svn/pkg-ruby-extras/packages-wip/libfoo-ruby/trunk</code></pre>
+Alternatively, you can check out all the current versions of all packages (takes less than 50 MB):
+<pre><code>$ svn checkout svn+ssh://svn.debian.org/svn/pkg-ruby-extras/trunk</code></pre>
 
-Or the whole repository:
-<pre><code>$ svn checkout svn+ssh://svn.debian.org/svn/pkg-ruby-extras</code></pre>
-
 h3. Building with @svn-buildpackage@
 
 First, you must "download upstream sources":ruby-pkg-tools/sources.html.
 
 Then you have to change do the trunk directory:
 
-<pre><code>$ cd libfoo-ruby/trunk</code></pre>
+<pre><code>$ cd libfoo-ruby/</code></pre>
 
-Inside @trunk/@, you can build the package with @svn-buildpackage@:
+Inside @libfoo-ruby/@, you can build the package with @svn-buildpackage@:
 
 <pre><code>$ svn-buildpackage -rfakeroot</code></pre>
 
@@ -93,7 +68,7 @@
 
 After releasing the package, its current state must be tagged to keep the exact source used to build the uploaded package. This can be done from the package directory with (assuming the released version is @0.1-1@):
 
-<pre><code>$ svn copy trunk tags/0.1-1</code></pre>
+<pre><code>$ svn copy trunk/libfoo-ruby tags/libfoo-ruby/0.1-1</code></pre>
 
 Alternatively, you can tell @svn-buildpackage@ to automatically tag the release after building using the option @--svn-tag at . You can also optionally use @debcommit -r@ if you have the devscripts package installed.