From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 3 Oct 2010 13:20:04 +0000 (+0200)
Subject: Merge remote branch 'drkranz/make-changelog' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4d1130d0a22b6aac6396c7a504675ff87459b2d8;hp=2a76a705c2236604e703884c6420b57efa60a9c9;p=dak.git

Merge remote branch 'drkranz/make-changelog' into merge

* drkranz/make-changelog:
  Don't hardcode paths
  Check brit_file value, it can be None
  s/britney_changelog/changelog/
  Restore Changelogs config entry for compatibility purposes
  Update projectb with changelogs config values
  Define Britney changelog file from suite table
  make-changelog: drop useless -T command
  Define changelogs export path into projectb

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 88aa2a9e..faced95a 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -96,12 +96,6 @@ Check-Overrides
 //      OriginSuite "Unstable";
     };
 
-    lenny-backports-sloppy
-    {
-      Process "1";
-      OriginSuite "lenny-backports";
-    };
-
   };
 };