Merge remote-tracking branch 'ansgar/description-md5' into merge

* ansgar/description-md5:
  generate_translations: do not include some descriptions more than once
  Also make generate_translations work with PostgreSQL 9.1.

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

diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py
index 0410950afe32d7c5d2237f481b706f14e14dae97..151920c1fda001a37733c78f9a5214b1c2694671 100755 (executable)
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@ -255,7 +255,7 @@ WITH
       FROM suite AS s LEFT JOIN suite AS os ON s.overridesuite = os.suite_name)
 
 SELECT
-     'Package\: ' || b.package
+     E'Package\: ' || b.package
   || E'\nDescription-md5\: ' || bm_description_md5.value
   || E'\nDescription-en\: ' || bm_description.value
   || E'\n'
@@ -273,8 +273,8 @@ FROM binaries b
   JOIN source s ON b.source = s.id
 
 WHERE ba.suite = :suite AND o.component = :component
-GROUP BY s.source, b.package, bm_description_md5.value, bm_description.value
-ORDER BY s.source, b.package, bm_description_md5.value
+GROUP BY b.package, bm_description_md5.value, bm_description.value
+ORDER BY MIN(s.source), b.package, bm_description_md5.value
 """
 
 def generate_translations(suite_id, component_id):