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

* drkranz/make-changelog:
  Add import_changelogs.py script

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

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index b9ddf5f72a5a6adaf9e006f5a5487bf0b8d7750c..ee1dcdef922a884cbe63d800584ef574fe5ace2a 100755 (executable)
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -198,10 +198,14 @@ def do_newer_version(lowersuite_name, highersuite_name, code, session):
 
     # Check for packages in $highersuite obsoleted by versions in $lowersuite
     q = session.execute("""
+WITH highersuite_maxversion AS (SELECT s.source AS source, max(s.version) AS version
+  FROM src_associations sa, source s
+  WHERE sa.suite = :highersuite_id AND sa.source = s.id group by s.source)
 SELECT s.source, s.version AS lower, s2.version AS higher
-  FROM src_associations sa, source s, source s2, src_associations sa2
+  FROM src_associations sa, source s, source s2, src_associations sa2, highersuite_maxversion hm
   WHERE sa.suite = :highersuite_id AND sa2.suite = :lowersuite_id AND sa.source = s.id
    AND sa2.source = s2.id AND s.source = s2.source
+   AND hm.source = s.source AND hm.version < s2.version
    AND s.version < s2.version""", {'lowersuite_id': lowersuite.suite_id,
                                     'highersuite_id': highersuite.suite_id})
     ql = q.fetchall()

diff --git a/dak/make_changelog.py b/dak/make_changelog.py
old mode 100644 (file)
new mode 100755 (executable)
index 124020e..acd23c2
--- a/dak/make_changelog.py
+++ b/dak/make_changelog.py
@@ -134,7 +134,7 @@ def get_binary_uploads(suite, base_suite, session):
                JOIN base b on b.source = c.source
                JOIN cur_suite cs ON cs.source = c.source
                WHERE c.version > b.version
-               AND c.version <= cs.version 
+               AND c.version <= cs.version
                AND c.architecture = b.arch_string
                AND c.architecture = cs.arch_string
                ORDER BY c.source, c.version DESC, c.architecture"""