[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-11-23-gf5850e5

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 0d36eb2185bdf5776c16565fb62e2b445dd146ff
Author: Ralf Treinen <treinen at free.fr>
Date:   Wed May 26 22:59:44 2010 +0200

    read binary packages using -I

diff --git a/debian/changelog b/debian/changelog
index e254c0c..2f83e7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
+pkglab (1.4.2-13) unstable; urgency=low
+  
+  * edos-builddebcheck: read the binary package file directly using
+    the "-I" option, instead of merging it with the source packages
+    (closes: #582951). Thanks a lot to Andi Barth for the idea!
+
+ -- Ralf Treinen <treinen at debian.org>  Sat, 20 Nov 2010 11:04:47 +0100
+
 pkglab (1.4.2-12) unstable; urgency=low
 
   * Fix a typo in the long description of edos-distcheck (closes: #603831).
   * Standards-Version: 3.9.1 (no change).
 
  -- Ralf Treinen <treinen at debian.org>  Sat, 20 Nov 2010 10:56:55 +0100
-
+  
 pkglab (1.4.2-11) unstable; urgency=low
 
   * Fix a bug in the handling of the options -base and -add-source
diff --git a/debian/contrib/add-sources.py b/debian/contrib/add-sources.py
index 279a070..2738e97 100755
--- a/debian/contrib/add-sources.py
+++ b/debian/contrib/add-sources.py
@@ -139,11 +139,6 @@ def pkg_of_src(src):
 
     return pkg
 
-#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']:
         pkg = pkg_of_src(src)
diff --git a/debian/contrib/edos-builddebcheck b/debian/contrib/edos-builddebcheck
index 0c97bf5..c9e263a 100755
--- a/debian/contrib/edos-builddebcheck
+++ b/debian/contrib/edos-builddebcheck
@@ -74,8 +74,8 @@ if ( $architecture eq "" ) {
 }
 
 open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
-     "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
-     "| edos-debcheck $edosoptions|");
+     "--prefix \"$sourceprefix\" $sourcesfile $architecture ".
+     "| edos-debcheck -I $packagefile $edosoptions|");
 
 $sourcestanza=0;
 $explanation="";

-- 
pkglab packaging