[Pkg-octave-commit] rev 861 - www
Rafael Laboissiere
rafael at alioth.debian.org
Thu Mar 8 15:28:56 CET 2007
Author: rafael
Date: 2007-03-08 14:28:56 +0000 (Thu, 08 Mar 2007)
New Revision: 861
Modified:
www/DOG-Guidelines.txt
www/Makefile
www/guidelines.css
Log:
* www/guidelines.css: Nicer looking verbatim text
* www/DOG-Guidelines.txt:
- Instructions for adding XS-Vcs-Svn and XS-Vcs-Browser fields to
debian/control
- Updated for new layout of SVN repository
* www/Makefile: Use option --link-stylesheet when calling rst2html, such
that an external file guidelines.css will be used as the CSS file
Modified: www/DOG-Guidelines.txt
===================================================================
--- www/DOG-Guidelines.txt 2007-03-07 09:32:38 UTC (rev 860)
+++ www/DOG-Guidelines.txt 2007-03-08 14:28:56 UTC (rev 861)
@@ -71,7 +71,14 @@
debian/control. By doing this, your uploads will not be considered as NMUs
(non-maintainer uploads).
+URLs of the SVN repository can be added to the Source section of the
+debian/control file, which will appear in the Package Tracking System
+(http://packages.qa.debian.org). They should read like this::
+ XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/<source-package>/
+ XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/<source-package>/
+
+
3. SVN repository
-----------------
@@ -84,37 +91,38 @@
more information, please visit
http://lists.alioth.debian.org/mailman/listinfo/pkg-octave-commit
-The repository is organized as follows::
+The repository is organized in a svn-buildpackage-friendly way, as follows::
svn://svn.debian.org/svn/pkg-octave/
- trunk/
- packages/
- octave2.1/
+ octave/
+ trunk/
debian/
- octave-forge/
- debian/
- [...]
- tags/
- packages/
- octave2.1/
+ octave2.1/
+ tags/
2.1.64-3/
2.1.64-4/
[...]
- octave-forge/
+ branches/
+ [...]
+ octave-forge/
+ trunk/
+ debian/
+ tags/
2004.11.16-3/
2004.11.16-4/
[...]
- [...]
+ branches/
+ [...]
+ [...]
-
Notice that only the debian files are put under Subversion control. No
upstream files, please.
As regards tag conventions, use the following path::
- svn://svn.debian.org/svn/pkg-octave/tags/packages/<package>/<version>
+ svn://svn.debian.org/svn/pkg-octave/<package>/tags/<version>/
-Only create a tag in tags/packages after the Debian version is actually
+Only create a tag in <package>/tags/ after the Debian version is actually
released. This avoids having to issue extra svn copy commands if the tag is
created too early.
@@ -122,8 +130,8 @@
be done with a command like the following::
svn diff \
- svn+ssh://svn.debian.org/svn/pkg-octave/tags/packages/octave-cool/1.2.3-3 \
- svn+ssh://svn.debian.org/svn/pkg-octave/tags/packages/octave-cool/1.2.3-4
+ 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:
@@ -149,8 +157,8 @@
* Create the directory for the new package in trunk and tags::
- mkdir pkg-octave/trunk/packages/octave-cool
- mkdir pkg-octave/tags/packages/octave-cool
+ mkdir pkg-octave/octave-cool/trunk
+ mkdir pkg-octave/octave-cool/tags
* Get the latest released version of the package::
@@ -158,25 +166,25 @@
* Copy the debian directory to trunk::
- cp -a octave-cool-1.2.3/debian pkg-octave/trunk/packages/octave-cool
+ cp -a octave-cool-1.2.3/debian pkg-octave/octave-cool/trunk
* Add the Debian-related files to the repository::
cd pkg-octave
- svn add trunk/packages/octave-cool
- svn add tags/packages/octave-cool
+ 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 trunk/packages/octave-cool tags/packages/octave-cool/1.2.3-4
- svn commit tags/packages/octave-cool --message 'Debian release 1.2.3-4'
+ svn copy octave-cool/trunk octave-cool/tags/1.2.3-4
+ svn commit octave-cool/tags --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/trunk/packages/octave-cool/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
@@ -192,7 +200,7 @@
* The sources of a specific package::
- svn co svn://anonymous@svn.debian.org/svn/pkg-octave/trunk/packages/<pkg>
+ svn co svn://anonymous@svn.debian.org/svn/pkg-octave/<pkg>/trunk/
When committing changes that do not result in a Debian release, keep
debian/changelog in a clearly broken state, such that the other developers
@@ -283,7 +291,7 @@
automatically generated from the sources maintained in the SVN repository
at::
- svn://svn.debian.org/svn/pkg-octave/trunk/www/
+ svn://svn.debian.org/svn/pkg-octave/www/
Maintainers manipulating the files in the web area by hand should be
carefull to keep access rights to the pkg-octave group.
@@ -300,7 +308,7 @@
| `(view source)`_ `(view history)`_
.. _(view source): DOG-Guidelines.txt
-.. _(view history): http://svn.debian.org/wsvn/pkg-octave/trunk/www/DOG-Guidelines.txt?op=log&rev=0&sc=0&isdir=0
+.. _(view history): http://svn.debian.org/wsvn/pkg-octave/www/DOG-Guidelines.txt?op=log&rev=0&sc=0&isdir=0
.. Local variables:
Modified: www/Makefile
===================================================================
--- www/Makefile 2007-03-07 09:32:38 UTC (rev 860)
+++ www/Makefile 2007-03-08 14:28:56 UTC (rev 861)
@@ -20,8 +20,9 @@
%.html: %.html.in
eperl $< > $@
-%.html: %.txt
- rst2html --no-toc-backlinks --stylesheet=guidelines.css $< $@
+%.html: %.txt guidelines.css
+ rst2html --no-toc-backlinks --stylesheet=guidelines.css \
+ --link-stylesheet $< $@
svn-ci:
svn ci
Modified: www/guidelines.css
===================================================================
--- www/guidelines.css 2007-03-07 09:32:38 UTC (rev 860)
+++ www/guidelines.css 2007-03-08 14:28:56 UTC (rev 861)
@@ -225,7 +225,9 @@
pre.literal-block, pre.doctest-block {
margin-left: 2em ;
margin-right: 2em ;
- background-color: #eeeeee }
+ padding: 3px;
+ border: 1px dashed #aaa;
+ background-color: #eee }
span.classifier {
font-family: sans-serif ;
More information about the Pkg-octave-commit
mailing list