Merge branch 'master' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e57705e2f5e30d484ee905c72b767a0a92eed95b..8c7ce8a40ef2446994239b90591d884cc1e5b774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-10-27  Joerg Jaspert  <joerg@debian.org>
+
+       * scripts/debian/mkfilesindices: Remove oldstable
+
+       * config/debian/vars: Remove sarge
+
+       * config/debian/dak.conf: Untouchable o-p-u, until we removed all
+       of sarge and its files.
+
+       * config/debian/apt.conf.oldstable: Removed
+
+       * config/debian/apt.conf: Remove oldstable
+
 2008-10-14  Thomas Viehmann <tv@beamnet.de>
 
        * dak/show_deferred.py: produce .changes and improve status
@@ -11,7 +24,7 @@
 
         * daklib/database.py: added get_suites
        * dak/dak.py, dak/show_deferred.py: add show-deferred to dak.
-       
+
 2008-09-23  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/dak.conf: Add the validtime fields, set to 7
@@ -517,6 +530,7 @@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>