more website changes

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@6836 e39458fd-73e7-0310-bf30-c45bca0a0e42
author: Stefan Fritsch <sf@sfritsch.de> 2007-10-06 18:38:06 +0000
committer: Stefan Fritsch <sf@sfritsch.de> 2007-10-06 18:38:06 +0000
commit: 04add2a35a1a9a3aec21a20e0cadd677d59dd245 (patch)
tree: 77940c3b6e898b7a93627f4b4a08b95687379335
parent: 4a82df071109b4192d687411bb80a4207294076e (diff)
5 files changed, 85 insertions, 10 deletions
diff --git a/doc/how-to-DTSA b/doc/how-to-DTSA
index 3a2b76ba67..a530b9157a 100644
--- a/doc/how-to-DTSA
+++ b/doc/how-to-DTSA
@@ -8,7 +8,7 @@ Upload
 ======
 
 The upload can be done by any DD and is described in
-.../website/index.html.
+.../website/uploading.html.
 
 If the orig.tar.gz is already on security.debian.org (either stable-security
 or testing-security), then DON'T include it. Otherwise a bug in dak will
@@ -23,7 +23,7 @@ Use debdiff, interdiff etc. Use debdiff on the binary packages, too.
 The distribution needs to be "testing-security".
 
 If you append something to the version number currently in testing, use something
-like "+lenny1" or ".1lenny1". A simple "lenny1" is not enough because of binNMUs
+like "+lenny1" or ".0lenny1". A simple "lenny1" is not enough because of binNMUs
 adding "+b1".
 
 dcut does not seem to work on security-master.debian.org, but someone
@@ -81,7 +81,7 @@ dependencies look correct.
 You can install the packages in the security archive with something
 like:
 
-dak new-security-install DTSA-36-1 mydns_1.1.0-7.1lenny1_*.changes
+dak new-security-install DTSA-36-1 mydns_1.1.0-7+lenny1_*.changes
 
 DTSA-36-1 is an identifier that should be the name of the new DTSA.
 However, every identifier can be used only once with dak. So if you
diff --git a/website/helping.html b/website/helping.html
new file mode 100644
index 0000000000..4e615393d6
--- /dev/null
+++ b/website/helping.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+	<html><head><meta http-equiv="Content-Type" content="text/html; charset=iso8859-1">
+	<title>Helping testing security</title>
+	<link type="text/css" rel="stylesheet" href="style.css">
+	<link rel="shortcut icon" href="http://www.debian.org/favicon.ico">
+	</head>
+	<body>
+	<div align="center">
+	<a href="http://www.debian.org/">
+
+     <img src="http://www.debian.org/logos/openlogo-nd-50.png" border="0" hspace="0" vspace="0" alt=""></a>
+	<a href="http://www.debian.org/">
+     <img src="http://www.debian.org/Pics/debian.png" border="0" hspace="0" vspace="0" alt="Debian Project"></a>
+	</div>
+	<br />
+	<table class="reddy" width="100%">
+	<tr>
+	<td class="reddy">
+    <img src="http://www.debian.org/Pics/red-upperleft.png" align="left" border="0" hspace="0" vspace="0"
+     alt="" width="15" height="16"></td>
+
+	<td rowspan="2" class="reddy">Debian testing security team</td>
+	<td class="reddy">
+    <img src="http://www.debian.org/Pics/red-upperright.png" align="right" border="0" hspace="0" vspace="0"
+     alt="" width="16" height="16"></td>
+	</tr>
+	<tr>
+	<td class="reddy">
+    <img src="http://www.debian.org/Pics/red-lowerleft.png" align="left" border="0" hspace="0" vspace="0"
+     alt="" width="16" height="16"></td>
+	<td class="reddy">
+
+    <img src="http://www.debian.org/Pics/red-lowerright.png" align="right" border="0" hspace="0" vspace="0"
+     alt="" width="15" height="16"></td>
+	</tr>
+	</table>
+
+	<h2>As non-Debian Developer</h2>
+	
+	<h2>As Debian package maintainer</h2>
+	
+	<h2>As Debian Developer</h2>
+
+
+	
+
+<hr><p>$Id: index.html 6493 2007-09-04 11:06:04Z nion $</p>
+<a href="http://validator.w3.org/check?uri=referer">
+    <img border="0" src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" height="31" width="88"></a>
+	<a href="http://jigsaw.w3.org/css-validator/check/referer">
+    <img border="0" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"
+     height="31" width="88"></a>
+
+    
+</body></html>	
diff --git a/website/index.html b/website/index.html
index c57de80b1d..d5a08ba756 100644
--- a/website/index.html
+++ b/website/index.html
@@ -129,7 +129,7 @@
 	<ul>
 		<li><a href="uploading.html">Uploading to the testing-security repository</a></li>
 
-		<li><a href="help.html">Helping the testing security team</a></li>
+		<li><a href="helping.html">Helping the testing security team</a></li>
 
 		<li>There is a <a href="http://svn.debian.org/wsvn/secure-testing">subversion repository</a>
 		holding the data for the <a href="http://security-tracker.debian.net/">Debian
@@ -143,7 +143,16 @@
 		<li><a href="http://www.cve.mitre.org/cve/index.html">Mitre's CVE database</a></li>
 	</ul>
 
+	<h3>Internal information</h3>
+	<ul>
+		<li><a href="http://svn.debian.org/wsvn/secure-testing/doc/narrative_introduction?op=file&rev=0&sc=0">Introduction
+		to our processes</a></li>
+		
+		<li><a href="http://www.sfritsch.de/~stf/secure-testing-buildlogs.html">Buildlog status</a></li>
 
+		<li><a href="http://klecker.debian.org/~jmm/status.html">Queue status on klecker</a></li>
+	</ul>
+		
 
 
 <hr><p>$Id$</p>
diff --git a/website/style.css b/website/style.css
index ec13c9e885..6458b55581 100644
--- a/website/style.css
+++ b/website/style.css
@@ -114,17 +114,17 @@ td {
 
 a:link {
  color: #0000FF;
- text-decoration: none;
+ text-decoration: underline;
 }
 
 a:visited {
  color: #800080;
- text-decoration: none;
+ text-decoration: underline;
 }
 
 a:active {
  color: #FF0000;
- text-decoration: none;
+ text-decoration: underline;
 }
 
 a:hover{
diff --git a/website/uploading.html b/website/uploading.html
index 41cf304955..73f281950c 100644
--- a/website/uploading.html
+++ b/website/uploading.html
@@ -39,16 +39,19 @@
 	To upload a package to the secure-testing repository, any Debian
 	developer may follow this checklist:
 	<ol>
+		<li>Contact the team first to avoid duplicate work.</li>
+		
 		<li>Only upload changes that have already been made in
 		unstable and are blocked by reaching testing by some other
 		issues. This is both to keep things in sync once the
 		new version from unstable reaches testing, and to avoid
 		breaking secure-testing too badly with fixes that have not
 		been tested first in unstable.</li>
+		
 		<li>If the orig.tar.gz is already on security.debian.org
 		(either in stable-security or in testing-security) 
 		don't include it in the upload. If in doubt, ask the team.</li>
-		<li>Contact the team first to avoid duplicate work.</li>
+		
 		<li>Use a version number that is less than the version
 		number of the fix in unstable, but greater than the version
 		number of the fix in testing (including a possible +b1 for binNMUs).
@@ -56,18 +59,22 @@
 		upload version 1.0-1~lenny1 to testing-security. If the current version
 		in testing is 1.2-3 and the fix is backported to this version, upload
 		version 1.2-3+lenny1 to testing-security.</li>
+		
 		<li>Use "testing-security" as the distribution in the
 		changelog.</li>
+		
 		<li>Build the package in a testing chroot using pbuilder
 		so that all the dependencies are ok. Be sure to build with
 		the -sa switch to include source, unless the source is
-		already in the testing-security archive.
-		</li>
+		already in the testing-security archive.</li>
+		
 		<li>Test the package. Diff the package against the version
 		in testing (if backporting fixes). Use debdiff on both
 		source and binary packages.</li>
+		
 		<li>Sign the package. Any Debian developer in the keyring
 		can do so.</li>
+		
 		<li>Upload to <tt>security-master.debian.org</tt>.
 		Here is a dput.cf snippet for that upload queue:
 		<pre>
@@ -82,6 +89,10 @@
 	</ol>
 
 
+	<p>Information about releasing the packages can be found in the
+	<a href="http://svn.debian.org/wsvn/secure-testing/doc/how-to-DTSA?op=file&rev=0&sc=0">howto-DTSA
+	file</a> in the SVN repository.
+	
 
 <hr><p>$Id: index.html 6493 2007-09-04 11:06:04Z nion $</p>
 <a href="http://validator.w3.org/check?uri=referer">
author	Stefan Fritsch <sf@sfritsch.de>	2007-10-06 18:38:06 +0000
committer	Stefan Fritsch <sf@sfritsch.de>	2007-10-06 18:38:06 +0000
commit	04add2a35a1a9a3aec21a20e0cadd677d59dd245 (patch)
tree	77940c3b6e898b7a93627f4b4a08b95687379335
parent	4a82df071109b4192d687411bb80a4207294076e (diff)