[Pkg-octave-commit] r1161 - www

[Rafael Laboissiere]

Author: rafael
Date: 2008-01-11 10:37:43 +0000 (Fri, 11 Jan 2008)
New Revision: 1161

Modified:
   www/DOG-Guidelines.txt
Log:
* In the cookbook for putting a new pacakge under SVN control, use 
  "svn mkdir" and "svn import" commands, instead of messing around with
  mkdir and cp commands.
* Mention the svn-import-pkg script

Modified: www/DOG-Guidelines.txt
===================================================================
--- www/DOG-Guidelines.txt	2008-01-11 10:30:51 UTC (rev 1160)
+++ www/DOG-Guidelines.txt	2008-01-11 10:37:43 UTC (rev 1161)
@@ -119,11 +119,17 @@
     svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/tags/1.2.3-3 \
     svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/tags/1.2.3-4
 
-Here is the cookbook to put a new package under Subversion control:
+To put a new package under Subversion control, use the `svn-import-pkg`_
+script or follow this cookbook:
 
-* Import the pkg-octave repository::
+* Create the directory for the new package, as well as the subdirectories
+  trunk and tags::
 
-      svn co svn+ssh://svn.debian.org/svn/pkg-octave
+     svn mkdir svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool        \
+       svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/trunk          \
+       svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/trunk/debian   \
+       svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/tags           \
+       --message 'Created directory structure for octave-cool package'
 
   :note: This only works if your user name in the system you are working is
          the same as your user name in Alioth.  If this is not the case, you
@@ -131,47 +137,33 @@
 
              export SVN_SSH="ssh -l my-alioth-username"
 
-	 Otherwise, you can add your Alioth user name directly in the URL::
+         Otherwise, you can add your Alioth user name directly in the URL::
 
-	     svn co svn+ssh://my-alioth-username@svn.debian.org/svn/pkg-octave
+   	     svn co svn+ssh://my-alioth-username@svn.debian.org/svn/pkg-octave
 
-	 Yet another solution, probably the best one, is adding to your
+   	 Yet another solution, probably the best one, is adding to your
          personal configuration file ~/.ssh/config something like::
 
-	     Host svn.debian.org
-	     User my-alioth-username
+   	     Host svn.debian.org
+   	     User my-alioth-username
 
-* Create the directory for the new package in trunk and tags::
 
-    mkdir pkg-octave/octave-cool/trunk
-    mkdir pkg-octave/octave-cool/tags
-
 * Get the latest released version of the package::
 
-    apt-get source octave-cool
+     apt-get source octave-cool
 
-* Copy the debian directory to trunk::
+* Import the Debian-related files into the repository::
 
-    cp -a octave-cool-1.2.3/debian pkg-octave/octave-cool/trunk
+     svn import octave-cool-1.2.3/debian                             \
+       svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/trunk/debian \
+       --message 'Initial import of package octave-cool'
 
-* Add the Debian-related files to the repository::
-
-    cd pkg-octave
-    svn add octave-cool/trunk
-    svn add octave-cool/tags
-    svn commit --message 'Initial import of package octave-cool'
-
 * Tag its current version::
 
-    svn copy octave-cool/trunk octave-cool/tags/1.2.3-4
-    svn commit octave-cool/tags --message 'Debian release 1.2.3-4'
+     svn copy svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/trunk \
+       svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/tags/1.2.3-4 \
+       --message 'Debian release 1.2.3-4'           \
 
-* Now you can go back to the package sources and do::
-
-    cd ../octave-cool-1.2.3-4
-    rm -rf debian
-    svn co svn+ssh://svn.debian.org/svn/pkg-octave/octave-cool/trunk/debian
-
   :note: At this point you will have a debian/ directory containing .svn/
          directories.  In order to avoid this directories to sneaking into
          the .diff.gz file (and making Lintian unhappy), use the -i option
@@ -296,8 +288,8 @@
 
 .. _(view source): DOG-Guidelines.txt
 .. _(view history): http://svn.debian.org/wsvn/pkg-octave/www/DOG-Guidelines.txt?op=log&rev=0&sc=0&isdir=0
+.. _svn-import-pkg: http://svn.debian.org/wsvn/pkg-octave/utils/svn-import-pkg?op=file&rev=0&sc=0
 
-
 .. Local variables:
 .. mode: rst
 .. End: