[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-4-8-gb5965bb

[Ralf Treinen (none)]

The following commit has been merged in the master branch:
commit b5965bbd60e5ce6a369966acf5f5a30f7c16bfab
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Thu Aug 20 13:05:37 2009 +0200

    addsources: stanzas have to be separated by blank line

diff --git a/debian/changelog b/debian/changelog
index 8d8f25a..0b7ad8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ pkglab (1.4.2-5) unstable; urgency=low
   * Packages to be checked can now be listed in the form "src:p",
     which will be expanded to the list of all packages that stem
     from source package p (closes:  #516587).
+  * Fix add-sources.py to separate binary and source file by blank line
+    (closes: #538925).
 
- -- Ralf Treinen <treinen at debian.org>  Tue, 18 Aug 2009 23:26:13 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 20 Aug 2009 13:04:42 +0200
 
 pkglab (1.4.2-4) unstable; urgency=low
 
diff --git a/debian/contrib/add-sources.py b/debian/contrib/add-sources.py
index 03217a7..dad96ac 100644
--- a/debian/contrib/add-sources.py
+++ b/debian/contrib/add-sources.py
@@ -112,6 +112,8 @@ def pkg_of_src(src):
 #for pkg in deb822.Packages.iter_paragraphs(sys.stdin):
 for line in sys.stdin:
     print line,
+# stanzas have to be separated by a blank line
+if not(line.isspace()): print 
 for src in deb822.Sources.iter_paragraphs(file(sources_file)):
     if src['Architecture'] in ['any', 'all'] \
             or architecture in src['Architecture'].split():
diff --git a/debian/contrib/edos-builddebcheck b/debian/contrib/edos-builddebcheck
index 6941fd5..847da2e 100644
--- a/debian/contrib/edos-builddebcheck
+++ b/debian/contrib/edos-builddebcheck
@@ -43,6 +43,8 @@ if ($debug) {
     print "Edos options: $edosoptions\n";
 }
 
+# check that all stanzas in the binary package file have the same
+# architecture.
 $packagearch="";
 open(P,$packagefile);
 while (<P>) {

-- 
pkglab packaging