Merge commit 'ftpmaster/master'

Conflicts:
	daklib/dbconn.py

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/clean_queues.py b/dak/clean_queues.py
index a5b154279e6597094f040113d2dc9d87a710abe5..f30d7f12d7bb030239e2e9c8e80da20758ac1c2b 100755 (executable)
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -83,10 +83,10 @@ def init (cnf):
     os.chdir(incoming)
 
 # Remove a file to the morgue
-def remove (f):
+def remove (from_dir, f):
     fname = os.path.basename(f)
     if os.access(f, os.R_OK):
-        Logger.log(["move file to morgue", fname, del_dir])
+        Logger.log(["move file to morgue", from_dir, fname, del_dir])
         if Options["Verbose"]:
             print "Removing '%s' (to '%s')."  % (fname, del_dir)
         if Options["No-Action"]:
@@ -106,11 +106,11 @@ def remove (f):
 # [Used for Incoming/REJECT]
 #
 def flush_old ():
-    Logger.log(["check Incoming/REJECT for old files"])
+    Logger.log(["check Incoming/REJECT for old files", os.getcwd()])
     for f in os.listdir('.'):
         if os.path.isfile(f):
             if os.stat(f)[stat.ST_MTIME] < delete_date:
-                remove(f)
+                remove('Incoming/REJECT', f)
             else:
                 if Options["Verbose"]:
                     print "Skipping, too new, '%s'." % (os.path.basename(f))
@@ -122,7 +122,7 @@ def flush_orphans ():
     all_files = {}
     changes_files = []
 
-    Logger.log(["check Incoming for old orphaned files"])
+    Logger.log(["check Incoming for old orphaned files", os.getcwd()])
     # Build up the list of all files in the directory
     for i in os.listdir('.'):
         if os.path.isfile(i):
@@ -163,7 +163,7 @@ def flush_orphans ():
     # a .dsc) and should be deleted if old enough.
     for f in all_files.keys():
         if os.stat(f)[stat.ST_MTIME] < delete_date:
-            remove(f)
+            remove('Incoming', f)
         else:
             if Options["Verbose"]:
                 print "Skipping, too new, '%s'." % (os.path.basename(f))

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 0f4d4ede271627e21d8536e2296d9741eb1255d8..5b30fce99612469c74991d42fe3fbc5871ff532e 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2635,7 +2635,6 @@ class DBConn(Singleton):
                                  source_files = relation(ChangePendingFile,
                                                          secondary=self.tbl_changes_pending_source_files,
                                                          backref="pending_sources")))
-
         mapper(KeyringACLMap, self.tbl_keyring_acl_map,
                properties = dict(keyring_acl_map_id = self.tbl_keyring_acl_map.c.id,
                                  keyring = relation(Keyring, backref="keyring_acl_map"),

diff --git a/docs/NEWS b/docs/NEWS
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/docs/README.new-incoming b/docs/README.new-incoming
deleted file mode 100644 (file)
index 8ebd0e2..0000000
--- a/docs/README.new-incoming
+++ /dev/null
@@ -1,123 +0,0 @@
-[An updated version of the proposal sent to debian-devel-announce@l.d.o.  
- Debian-specific, but useful as a general overview of New Incoming.]
-
-                     New Incoming System
-                    ===================
-
-This document outlines the new system for handling Incoming
-directories on ftp-master and non-US.
-
-The old system:
----------------
-
-  o incoming was a world writable directory
-
-  o incoming was available to everyone through http://incoming.debian.org/
-
-  o incoming was processed once a day by dinstall
-
-  o uploads in incoming had to have been there > 24 hours before they
-    were REJECTed.  If they were processed before that and had
-    problems they were SKIPped (with no notification to the maintainer
-    and/or uploader).
-
-The new system:
----------------
-
-  o There's 4 incoming directories:
-
-     @ "unchecked"  - where uploads from Queue Daemons and maintainers
-                     initially go.
-
-     @ "accepted"   - where accepted packages stay until the daily
-                      dinstall run.
-
-     @ "new"       - where NEW packages (and their dependents[1]) requiring
-                     human processing go after being automatically
-                     checked by dinstall.
-
-     @ "byhand"            - where BYHAND packages (and their dependents[1])
-                      requiring human intervention go after being
-                      automatically checked by dinstall.
-
-    In addition there's 3 support directories:
-
-     @ "reject"            - where rejected uploads go
-
-     @ "done"      - where the .changes files for packages that have been
-                     installed go.
-
-     @ "holding"    - a temporary working area for dinstall to hold
-                     packages while checking them.
-
-  o Packages in 'unchecked' are automatically checked every 15 minutes
-    and are either: REJECT, ACCEPT, NEW or BYHAND.
-
-  o Only 'unchecked' is locally world-writeable.  The others are all,
-    of course, locally world-readable but only 'accepted' and 'byhand'
-    are publicly visible on http://incoming.debian.org/
-
-  o 'accepted' and 'byhand' are made available to the auto-builders so
-     they can build out of them.
-
-  o 'accepted' is processed once a day as before.
-
-  o Maintainer/uploader & list notification and bug closures are
-    changed to be done for ACCEPTs, not INSTALLs. 
-    [Rationale: this reduces the load both on our list server and our
-     BTS server; it also gives people better notice of uploads to
-     avoid duplication of work especially, for example, in the case of
-     NMUs.]
-    [NB: see [3] for clarifications of when mails are sent.]
-
-Why:
-----
-
-  o Security (no more replaceable file races)
-  o Integrity (new http://i.d.o contains only signed (+installable) uploads[2])
-  o Needed for crypto-in-main integration
-  o Allows safe auto-building out of accepted
-  o Allows previously-prohibitively-expensive checks to be added to dinstall
-  o Much faster feedback on packages; no more 48 hour waits before
-    finding out your package has been REJECTed.
-
-What breaks:
-------------
-
-  o people who upload packages but then want to retract or replace the
-    upload.
-
-    * solution: mostly "Don't do that then"; i.e. test your uploads
-      properly.  Uploads can still be replaced, simply by uploading a
-      higher versioned replacement.  Total retraction is harder but
-      usually only relevant for NEW packages.
-
-================================================================================
-
-[1] For versions of dependents meaning: binaries compiled from the
-    source of BYHAND or NEW uploads.  Due to dak's fascist
-    source-must-exist checking, these binaries must be held back until
-    the BYHAND/NEW uploads are processed.
-
-[2] When this mail was initially written there was still at least one
-    upload queue which will accept unsigned uploads from any
-    source. [I've since discovered it's been deactivated, but not,
-    AFAIK because it allowed unsigned uploads.]
-
-[3]
-             --> reject
-            /
-           /
-unchecked  -----------------------------[*]------> accepted ---------------> pool
-           \               ^   ^
-            |             /   /
-            |-->   new  --   /
-            |       |[4]    /
-            |       V      /
-            |--> byhand --/
-
-[4] This is a corner case, included for completeness, ignore
-    it. [Boring details: NEW trumps BYHAND, so it's possible for a
-    upload with both BYHAND and NEW components to go from 'unchecked'
-    -> 'new' -> 'byhand' -> 'accepted']
-

diff --git a/docs/manpages/Makefile b/docs/manpages/Makefile
deleted file mode 100644 (file)
index 75cf3cc..0000000
--- a/docs/manpages/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/make -f
-
-SGMLMANPAGES   = check-overrides.1.sgml clean-suites.1.sgml control-overrides.1.sgml control-suite.1.sgml import-users-from-passwd.1.sgml ls.1.sgml make-maintainers.1.sgml override.1.sgml poolize.1.sgml process-accepted.1.sgml process-new.1.sgml rm.1.sgml
-
-MANPAGES       = $(patsubst %.sgml, dak_%, $(SGMLMANPAGES))
-
-
-all: $(MANPAGES)
-
-dak_%: %.sgml
-       docbook2man $< > /dev/null
-
-clean:
-       rm -f $(MANPAGES) manpage.links manpage.log manpage.refs

diff --git a/docs/manpages/check-overrides.1.sgml b/docs/manpages/check-overrides.1.sgml
deleted file mode 100644 (file)
index a4a7c14..0000000
--- a/docs/manpages/check-overrides.1.sgml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_check-overrides</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak check-overrides</>
-    <refpurpose>Utility to alter or display the contents of a suite</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak check-overrides</>
-      <arg><option><replaceable>options</replaceable></></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak check-overrides</command> is a cruft checker for overrides.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Notes</>
-
-  <Para>dak check-overrides is not a good idea with New Incoming as it doesn't take into account queue/accepted.  You can minimize the impact of this by running it immediately after 'dak process-accepted' but that's still racy because 'dak process-new' doesn't lock with 'dak process-accepted'.  A better long term fix is the evil plan for accepted to be in the DB.</>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak check-overrides</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/clean-suites.1.sgml b/docs/manpages/clean-suites.1.sgml
deleted file mode 100644 (file)
index 621bbc3..0000000
--- a/docs/manpages/clean-suites.1.sgml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_clean-suites</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak clean-suites</>
-    <refpurpose>Utility to clean out old packages</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak clean-suites</>
-      <arg><option><replaceable>options</replaceable></></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak clean-suites</command> is a utility to clean out old packages. It will clean out any binary packages not referenced by a suite and any source packages not referenced by a suite and not referenced by any binary packages.  Cleaning is not actual deletion, but rather, removal of packages from the pool to a 'morgue' directory.  The 'morgue' directory is split into dated sub-directories to keep things sane in big archives.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <variablelist>
-      <VarListEntry><term><option>-n/--no-action</option></>
-       <ListItem>
-         <Para>Don't actually clean any packages.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <refsect1>
-    <title>Configuration</title>
-    <para><command>dak clean-suites</command> uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  Apart from being able to alter the defaults for command line options, the following configuration items are used:</para>
-    <variablelist>
-      <varlistentry>
-       <term>Clean-Suites::StayOfExecution</term>
-       <listitem>
-         <para>This is the number of seconds unreferenced packages are left before being cleaned.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>Clean-Suites::MorgueSubDir</term>
-       <listitem>
-         <para>If not blank, this is the subdirectory in the morgue used to hold removed packages.</para>
-       </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak clean-suites</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/control-overrides.1.sgml b/docs/manpages/control-overrides.1.sgml
deleted file mode 100644 (file)
index 26440ad..0000000
--- a/docs/manpages/control-overrides.1.sgml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_control-overrides</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak control-overrides</>
-    <refpurpose>Utility to manipulate the packages overrides</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak control-overrides</>
-      <arg><option><replaceable>options</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak control-overrides</command> is the command line tool to handle override files.  Override files can be listed or updated.
-    </para>
-  </refsect1>
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-      <varlistentry>
-       <term><option>-a/--add</option></term>
-       <listitem>
-         <para>Add entries to the override DB.  Changes and deletions are ignored.</para>
-       </listitem>
-      </varlistentry>
-
-      <VarListEntry><term><option>-c/--component=<replaceable>component</replaceable></option></>
-       <ListItem><Para>Uses the override DB for the component listed.</para>
-       </listitem>
-      </VarListEntry>
-
-      <varlistentry>
-       <term><option>-h/--help</option></term>
-       <listitem>
-         <para>Display usage help and then exit.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-l/--list</option></term>
-       <listitem>
-         <para>Lists the override DB to stdout.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-q/--quiet</option></term>
-       <listitem>
-         <para>Be less verbose about what has been done.</para>
-       </listitem>
-      </varlistentry>
-
-      <VarListEntry><term><option>-s/--suite=<replaceable>suite</replaceable></option></>
-       <ListItem><Para>Uses the override DB for the suite listed.</para></listitem>
-      </varlistentry>
-
-      <VarListEntry><term><option>-S/--set</option></term>
-       <ListItem><Para>Set the override DB to the provided input.</PARA></LISTITEM>
-      </VarListEntry>
-
-      <varlistentry>
-       <term><option>-t/--type=<replaceable>type</replaceable></option></term>
-       <listitem>
-         <para>Uses the override DB for the type listed.  Possible values are: <literal>deb</literal>, <literal>udeb</literal> and <literal>dsc</literal>.</para>
-       </listitem>
-      </varlistentry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak control-overrides</command> returns zero on normal operation, non-zero on error.
-    </para>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/control-suite.1.sgml b/docs/manpages/control-suite.1.sgml
deleted file mode 100644 (file)
index 12c89c5..0000000
--- a/docs/manpages/control-suite.1.sgml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_control-suite</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak control-suite</>
-    <refpurpose>Utility to alter or display the contents of a suite</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak control-suite</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>file...</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak control-suite</command> is a utility to alter or display the contents of a suite.  Input for alterations is taken either from filename(s) supplied or stdin.  The format for both input and output is lines each with a whitespace separated list of: <literal>package</literal>, <literal>version</literal> and <literal>architecture</literal>.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-      <VarListEntry><term><option>-a/--add=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>Add to the suite.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-l/--list=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>List the contents of the suite.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-r/--remove=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>Remove from the suite.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-s/--set=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>Set the suite to exactly the input.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak control-suite</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/dak.ent b/docs/manpages/dak.ent
deleted file mode 100644 (file)
index 1860e8e..0000000
--- a/docs/manpages/dak.ent
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-
-<!-- Boiler plate docinfo section -->
-<!ENTITY dak-docinfo "
- <docinfo>
-   <address><email>james@nocrew.org</email></address>
-   <author><firstname>James</firstname> <surname>Troup</surname></author>
-   <copyright><year>2000-2001</year> <holder>James Troup</holder></copyright>
-   <date>15 January 2001</date>
- </docinfo>
-"> 
-
-<!-- Boiler plate Author section -->
-<!ENTITY manauthor "
- <RefSect1><Title>Author</title>
-   <para>
-   dak was written by James Troup <email>james@nocrew.org</email>.
-   </para>
- </RefSect1>
-">

diff --git a/docs/manpages/import-users-from-passwd.1.sgml b/docs/manpages/import-users-from-passwd.1.sgml
deleted file mode 100644 (file)
index 0fd4851..0000000
--- a/docs/manpages/import-users-from-passwd.1.sgml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_import-users-from-passwd</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak import-users-from-passwd</>
-    <refpurpose>Utility to sync PostgreSQL users with system users</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak import-users-from-passwd</>
-      <arg><option><replaceable>options</replaceable></></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak import-users-from-passwd</command> is a utility to sync PostgreSQL's user database with the system's users.  It is designed to allow the use of 'peer sameuser' authentication.  It simply adds any users in the password file into PostgreSQL's pg_user table if they are already not there.  It will also warn you about users who are in the pg_user table but not in the password file.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-      <VarListEntry><term><option>-n/--no-action<replaceable></replaceable></option></>
-       <ListItem>
-         <Para>Don't actually do anything.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-q/--quiet<replaceable></replaceable></option></>
-       <ListItem>
-         <Para>Be quiet, i.e. display as little output as possible.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-v/--verbose</option></>
-       <ListItem>
-         <Para>Be verbose, i.e. display more output than normal.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <refsect1>
-    <title>Configuration</title>
-    <para><command>dak import-users-from-passwd</command> uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  Apart from being able to alter the defaults for command line options, the following configuration items are used:</para>
-    <variablelist>
-      <varlistentry>
-       <term>Import-Users-From-Passwd::ValidGID</term>
-       <listitem>
-         <para>Each user's primary GID is compared with this, if it's not blank.  If they match, the user will be processed, if they don't, the user will be skipped.</para>
-       </listitem>
-      </varlistentry>
-      <varlistentry>
-       <term>Import-Users-From-Passwd::KnownPostgresUsers</term>
-       <listitem>
-         <para>This is a comma-separated list of users who are in PostgreSQL's pg_user table but are not in the password file.</para>
-       </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak import-users-from-passwd</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/ls.1.sgml b/docs/manpages/ls.1.sgml
deleted file mode 100644 (file)
index c7c4f29..0000000
--- a/docs/manpages/ls.1.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_ls</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak ls</>
-    <refpurpose>Utility to display information about packages</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak ls</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>package</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak ls</command> is a utility to display information about packages, specificaly what suites they are in and for which architectures.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-      <VarListEntry><term><option>-a/--architecture=<replaceable>architecture</replaceable></option></>
-       <ListItem>
-         <Para>Only list package information for the listed architecture(s).</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-b/--binary-type=<replaceable>binary type</replaceable></option></>
-       <ListItem>
-         <Para>Only show package information for the binary type ('deb' or 'udeb').</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <varlistentry><term><option>-c/--component=<replaceable>component</replaceable></option></term>
-       <listitem>
-         <para>Only list package information for the listed component(s).</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-g/--greaterorequal</option></term>
-       <term><option>-G/--greaterthan</option></term>
-       <listitem>
-         <para>Determine the highest version of each package in the target suite (which is forced to just unstable if one was not specificed) and, in addition to the normal output, also print a line suitable for sending in a reply to a buildd as a 'dep-wait' command.  For <option>-g/--greaterorequal</option>, the versioned dependency is a >= one, e.g. <literallayout>dep-retry libgdbm-dev (>= 1.8.3-2)</literallayout></para>
-         <para>And for <option>-G/--greaterthan</option>, the versioned dependency is a >> one, e.g. <literallayout>dep-retry libflac-dev (>> 1.1.0-10)</literallayout></para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-r/--regex</option></term>
-       <listitem>
-         <para>Treat the <replaceable>package</replaceable> argument as a regex, rather than doing an exact search.</para>
-       </listitem>
-      </varlistentry>
-
-      <VarListEntry><term><option>-s/--suite=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>Only list package information for the suite(s) listed.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-S/--source-and-binary</option></>
-       <ListItem>
-         <Para>For each package which is a source package, also show information about the binary packages it produces.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak ls</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/make-maintainers.1.sgml b/docs/manpages/make-maintainers.1.sgml
deleted file mode 100644 (file)
index 8cc324c..0000000
--- a/docs/manpages/make-maintainers.1.sgml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_make-maintainers</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak make-maintainers</>
-    <refpurpose>Utility to generate an index of package's maintainers</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak make-maintainers</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>extra file...</replaceable></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak make-maintainers</command> is a utility to generate an index of package's maintainers.  The output format is:
-<literallayout>package~version maintainer</literallayout>
-      The input format of extra files can either be in this form or in the old style which is similar, but lacking the version number, i.e.:
-<literallayout>package maintainer</literallayout>
-      dak Make-Maintainers will auto-detect the type of layout of the extra file.  If the extra file is in the old style format the records in it are assumed to supersed any that were seen earlier (i.e. either from earlier extra files or generated from the SQL).
-    </Para>
-    <para>
-      dak Make-Maintainers determines the maintainer of a package by comparing suite priority (see 'Configuration') and then version number.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <variablelist>
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <refsect1>
-    <title>Configuration</title>
-    <para><command>dak make-maintainers</command> uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  Apart from being able to alter the defaults for command line options, the following configuration items are used:</para>
-    <variablelist>
-      <varlistentry>
-       <term>Suite::&lt;SUITE&gt;::Priority</term>
-       <listitem>
-         <para>Suite priority overrides the version checks dak make-maintainers does.  A package in higher priority suite overrides versions in lower priority suites even if the version number in the higher priority suite is older.</para>
-       </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>New versus Old output format</title>
-    <para>Converting the new output format to the old output format is easy with some simple sed + awk, e.g.
-<literallayout>sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}'</literallayout>
-</para>
-  </refsect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak make-maintainers</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/override.1.sgml b/docs/manpages/override.1.sgml
deleted file mode 100644 (file)
index 12afac5..0000000
--- a/docs/manpages/override.1.sgml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!-- -*- mode: sgml -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_override</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak override</>
-    <refpurpose>Make micromodifications or queries to the overrides table</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak override</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>package</replaceable></arg>
-      <arg><option><replaceable>section</replaceable></></arg>
-      <arg><option><replaceable>priority</replaceable></></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak override</command> makes micromodifications and queries the overrides.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-      <VarListEntry><term><option>-h/--help</option></>
-       <ListItem>
-         <Para>Show help and then exit.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-      <VarListEntry><term><option>-d/--done=<replaceable>BUG#</replaceable></option></>
-       <ListItem>
-         <Para>Close the listed bugs as part of adjusting the overrides</PARA>
-       </LISTITEM>
-      </VarListEntry>
-      <VarListEntry><term><option>-n/--no-action</option></>
-       <ListItem>
-         <Para>Show what dak override would do but make no changes</PARA>
-       </LISTITEM>
-      </VarListEntry>
-      <VarListEntry><term><option>-s/--suite=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>Affect the overrides in suite listed.  The default is <literal>unstable</literal></PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Common use</>
-    <para>
-      <command>dak override</command> when invoked with only a package name will tell you what section and priority the given package has.
-    </PARA>
-    <para>
-      <command>dak override</command> when invoked with a package and one or two other values will set the section and/or priority to the values given. You may use a single period ('.') to represent "do not change" or you can ommit the value you do not want to change.
-    </PARA>
-  </RefSect1>
-  <RefSect1><Title>Notes</>
-
-  <Para><command>dak override</command> essentially lets you do what <command>dak control-overrides</command> does only on the microscopic scale rather than the macroscopic scale of <command>dak control-overrides</command>. Use with care.</>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak override</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/process-accepted.1.sgml b/docs/manpages/process-accepted.1.sgml
deleted file mode 100644 (file)
index 1f3cf4e..0000000
--- a/docs/manpages/process-accepted.1.sgml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_process-accepted</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak process-accepted</>
-    <refpurpose>Installs packages from accepted</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak process-accepted</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>changes_file</replaceable></arg>
-      <arg><option><replaceable>...</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak process-accepted</command> is the program which installs packages from the accepted directory into the distribution.
-    </PARA></REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-
-      <varlistentry>
-       <term><option>-a/--automatic</option></term>
-       <listitem>
-         <para>Run automatically; i.e. perform the default action if it's possible to do so without user interaction.  Intend for use in cron jobs and the like.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-h/--help</option></term>
-       <listitem>
-         <para>Display usage help and then exit.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-m/--manual-reject=<replaceable>message</replaceable></option></term>
-       <listitem>
-         <para>Perform a manual rejection of the package.  The <replaceable>message</replaceable> is included in the rejection notice sent to the uploader.  If no <replaceable>message</replaceable> is given, an editor will be spawned so one can be added to the rejection notice.
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-n/--no-action</option></term>
-       <listitem>
-         <para>Don't actually install anything; just show what would be done.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-p/--no-lock</option></term>
-       <listitem>
-         <para>Don't check the lockfile.  Obviously dangerous and should only be used for cron jobs (if at all).</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-v/--version</option></term>
-       <listitem>
-         <para>Display the version number and then exit.</para>
-       </listitem>
-      </varlistentry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak process-accepted</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  <refsect1>
-    <title>Acknowledgements</title>
-    <para>dak process-accepted is based very heavily on dinstall, written by Guy Maor <email>maor@debian.org</email>; in fact it started out life as a dinstall clone.</para>
-  </refsect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/process-new.1.sgml b/docs/manpages/process-new.1.sgml
deleted file mode 100644 (file)
index f99c6cf..0000000
--- a/docs/manpages/process-new.1.sgml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-
-  <refmeta>
-    <refentrytitle>dak_process-new</>
-    <manvolnum>1</>
-  </refmeta>
-
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak process-new</>
-    <refpurpose>Processes BYHAND and NEW packages</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak process-new</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>changes_file</replaceable></arg>
-      <arg><option><replaceable>...</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <RefSect1><Title>Description</>
-    <para>
-      <command>dak process-new</command> is the program which installs packages from the accepted directory into the distribution.
-    </PARA></REFSECT1>
-
-  <RefSect1><Title>Options</>
-
-    <VariableList>
-
-      <varlistentry>
-       <term><option>-a/--automatic</option></term>
-       <listitem>
-         <para>Run automatically; i.e. perform the default action if it's possible to do so without user interaction.  Intend for use in cron jobs and the like.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-h/--help</option></term>
-       <listitem>
-         <para>Display usage help and then exit.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-m/--manual-reject=<replaceable>message</replaceable></option></term>
-       <listitem>
-         <para>Perform a manual rejection of the package.  The <replaceable>message</replaceable> is included in the rejection notice sent to the uploader.  If no <replaceable>message</replaceable> is given, an editor will be spawned so one can be added to the rejection notice.
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-n/--no-action</option></term>
-       <listitem>
-         <para>Don't actually install anything; just show what would be done.</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-p/--no-lock</option></term>
-       <listitem>
-         <para>Don't check the lockfile.  Obviously dangerous and should only be used for cron jobs (if at all).</para>
-       </listitem>
-      </varlistentry>
-
-      <varlistentry>
-       <term><option>-v/--version</option></term>
-       <listitem>
-         <para>Display the version number and then exit.</para>
-       </listitem>
-      </varlistentry>
-
-    </VariableList>
-  </RefSect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak process-new</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-
-</refentry>

diff --git a/docs/manpages/rm.1.sgml b/docs/manpages/rm.1.sgml
deleted file mode 100644 (file)
index 5b2eaf9..0000000
--- a/docs/manpages/rm.1.sgml
+++ /dev/null
@@ -1,215 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % dakent SYSTEM "dak.ent">
-%dakent;
-
-]>
-
-<refentry>
-  &dak-docinfo;
-  
-  <refmeta>
-    <refentrytitle>dak_rm</>
-    <manvolnum>1</>
-  </refmeta>
-  
-  <!-- Man page title -->
-  <refnamediv>
-    <refname>dak rm</>
-    <refpurpose>Utility to remove/add packages from suites</>
-  </refnamediv>
-
-  <!-- Arguments -->
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>dak rm</>
-      <arg><option><replaceable>options</replaceable></></arg>
-      <arg choice="plain"><replaceable>package</replaceable></arg>
-      <arg><option><replaceable>...</replaceable></option></arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  
-  <RefSect1><Title>Description</>
-    <para>   
-      <command>dak rm</command> is the command line tool to add and remove package sets from suites with enforced logging, optional bug closing and override updates.
-    </PARA>
-  </REFSECT1>
-
-  <RefSect1><Title>Options</>
-    
-    <VariableList>
-      <VarListEntry><term><option>-a/--architecture=<replaceable>architecture</replaceable></option></>
-       <ListItem>
-         <Para>Restrict the packages being considered to the architecture(s) listed.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-b/--binary</option></>
-       <ListItem>
-         <Para>Only look at binary packages.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-c/--component=<replaceable>component</replaceable></option></>
-       <ListItem>
-         <Para>Restrict the packages being considered to those found in the component(s) listed.  The default is <literal>main</literal>.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-C/--carbon-copy=<replaceable>[ bug number | 'package' | email address ]</replaceable></option></>
-       <ListItem>
-         <Para>Carbon copy the bug closing mail to the address(es) given.  If the removal was not requested by the maintainer, this option should always be used to inform the maintainer of the package's removal.  3 types of address are accepted.</PARA>
-           <itemizedlist>
-             <listitem>
-               <para>number - assumed to be a bug number, and expanded to nnnnn@bugs.debian.org.</para>
-             </listitem>
-             <listitem>
-               <para>'<literal>package</literal>' - carbon copy package@package.debian.org for each package given as an argument.</para>
-             </listitem>
-             <listitem>
-               <para>anything containing '@' - assumed to be an email address, and carbon copied as is.</para>
-             </listitem>
-           </itemizedlist>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-d/--done=<replaceable>done</replaceable></option></>
-       <ListItem>
-         <Para>Close the bug(s) listed on successful completion.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-m/--reason=<replaceable>reason</replaceable></option></>
-       <ListItem>
-         <Para>The reason for the removal or addition of the package(s).  This is a required option; if not provided an editor will be spawned so the reason can be added there.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-n/--no-action</option></>
-       <ListItem>
-         <Para>Don't actually do anything; just show what would be done.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-p/--partial</option></>
-       <ListItem>
-         <Para>Partial removal of a package, so the package is not removed from the overrides.  This option is implied by <option>-a/--architecture</option>.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-R/--rdep-check</option></>
-       <ListItem>
-         <Para>Check the reverse dependencies (and build-dependencies) of the packages that are to be removed and warn if anything will break.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-s/--suite=<replaceable>suite</replaceable></option></>
-       <ListItem>
-         <Para>Only add/remove the packages from the suite(s) listed.  The default is <literal>unstable</literal></PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-      <VarListEntry><term><option>-S/--source-only</option></>
-       <ListItem>
-         <Para>Only look at source packages.</PARA>
-       </LISTITEM>
-      </VarListEntry>
-
-    </VariableList>
-  </RefSect1>
-
-    <refsect1>
-      <title>How packages are chosen</title>
-      <para>There are 3 methods for selecting packages.</para>
-      <itemizedlist>
-       <listitem>
-         <para>Source + Binaries. (default)</para>
-         <para>In this mode <command>dak rm</command> will assume each of the package(s) passed as arguments are source packages and will also remove any binary packages built from these source packages.</para>
-       </listitem>
-       <listitem>
-         <para>Binary only.</para>
-         <para>Only binary packages are searched; source packages are ignored.  This mode is chosen by use of the <option>-b/--binary</option> switch.</para>
-         <para>This should <emphasis>only</emphasis> be used for orphaned binary packages (i.e. those no longer built by source packages); otherwise, in any system (e.g. Debian) which has auto-building, pointless (and uninstallable) recompiles will be triggered.</para>
-       </listitem>
-       <listitem>
-         <para>Source only.</para>
-         <para>Only source packages are searched; binary packages are ignored.  This mode is chosen by use of the <option>-S/--source</option> switch.</para>
-       </listitem>
-      </itemizedlist>
-    </refsect1>
-
-    <refsect1>
-      <title>Configuration</title>
-      <para><command>dak rm</command> uses dak's configuration file. It follows the typical ISC configuration format as seen in ISC tools like bind 8 and dhcpd.  Apart from being able to alter the defaults for command line options, the following configuration items are used:</para>
-      <variablelist>
-       <varlistentry>
-         <term>Rm::MyEmailAddress</term>
-         <listitem>
-           <para>This is used as the From: line for bug closing mails as per the -d/--done command line switch.  It, obviously, must be a RFC-822 valid email address.</para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term>Rm::LogFile</term>
-         <listitem>
-           <para>This is the (absolute) file name of the logfile that dak rm unconditionally writes too.  This can not be empty or an invalid file.</para>
-         </listitem>
-       </varlistentry>
-      </variablelist>
-    </refsect1>
-
-  <refsect1>
-    <title>Examples</title>
-      <para>The first example is of a source+binaries package removal.</para>
-      <informalexample>
-       <literallayout>
-$ dak rm -d 68136 -m "Requested by tbm@; confirmed with maintainer.  Superseded by libgmp2" gmp1   
-Working... done.
-Will remove the following packages from unstable:
-
-      gmp1 |  1.3.2-8.2 | source, alpha, hppa, arm, i386, m68k, powerpc, sparc
-  gmp1-dev |  1.3.2-8.2 | alpha, hppa, arm, i386, m68k, powerpc, sparc
-
-
-------------------- Reason -------------------
-Requested by tbm@; confirmed with maintainer.  Superseded by libgmp2
-----------------------------------------------
-
-Continue (y/N)? y
- Deleting... done.
-$
-         </literallayout>
-      </informalexample>
-      <para>The second example is of a binary-only multi-package removal.</para>
-      <informalexample>
-       <literallayout>
-$ dak rm -d 82562 -m "Requested by paul@; NBS." -b libgtkextra{5,9,10}
-Working... done.
-Will remove the following packages from unstable:
-
-libgtkextra10 |  0.99.10-2 | alpha, i386, m68k, powerpc, sparc
-libgtkextra5 |   0.99.5-1 | alpha, i386, m68k, powerpc, sparc
-libgtkextra9 |   0.99.9-1 | alpha, i386, m68k, powerpc, sparc
-
-Will also close bugs: 82562
-
-------------------- Reason -------------------
-Requested by paul@; NBS.
-----------------------------------------------
-
-Continue (y/N)? y
- Deleting... done.
-$
-       </literallayout>
-      </informalexample>
-  </refsect1>
-
-  <RefSect1><Title>Diagnostics</>
-    <para>
-      <command>dak rm</command> returns zero on normal operation, non-zero on error.
-    </PARA>
-  </RefSect1>
-
-  &manauthor;
-  
-</refentry>

diff --git a/web/index.html b/web/index.html
index 1b684159c7cd2a2ea6595cb7dc4b9d8e686a811e..9f0adcaed700cfc316e513d7662da3aec6a90512 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -112,22 +112,6 @@
  
             <p>The source is managed in git and is available
             from: <a href="http://ftp-master.debian.org/git/">http://ftp-master.debian.org/git/</a></p>
-
-                   <p>The old bzr tree is obsolete and no longer available. All
-                 information in it is now in git</p>
-                 
-            <p>The old CVS tree is obsolete but still available for historical purposes.
-            It's at <strong>:pserver:anonymous@cvs.debian.org:/cvs/dak</strong>;
-            the module is 'dak' and the login password is blank.
-            The old CVS repository can be <a href="http://cvs.debian.org/?cvsroot=dak">browsed</a>
-            courtesy of viewcvs.</p>
-
-            <p>You can also install the <a href="http://packages.debian.org/unstable/devel/dak">dak Package</a>
-            if you want to look at it and maybe run your own copy.</p>
-
-            <p>The <strong>really</strong> old dinstall scripts are still available
-            from <strong>:pserver:anonymous@cvs.debian.org:/cvs/ftp-maint</strong>;
-            the modules are 'dinstall' and 'masterfiles'.</p>
         </div>
 
                <div id="new"> 

diff --git a/web/x.png b/web/x.png
deleted file mode 100644 (file)
index b759b0a..0000000
Binary files a/web/x.png and /dev/null differ

diff --git a/web/x4.png b/web/x4.png
deleted file mode 100644 (file)
index bc37628..0000000
Binary files a/web/x4.png and /dev/null differ

diff --git a/web/x5.png b/web/x5.png
deleted file mode 100644 (file)
index 022f519..0000000
Binary files a/web/x5.png and /dev/null differ