[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 d539802b40fff3739640230153caafe6581f3073
Merge: f8c6da4d0c7274cd02d7af89e1f7f019e06660c7 5fe01c92cac2795b9a1609a29171d138c4659b73
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Feb 13 11:20:26 2011 +0100

    Merge branch 'master' into dh
    
    Conflicts:
    	debian/changelog
    
    fix -i/-I in builddebcheck

diff --combined debian/changelog
index 2f83e7a,9ec9e44..305ddbf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,13 @@@
- pkglab (1.4.2-13) unstable; urgency=low
-   
+ pkglab (1.4.2-13) UNRELEASED; urgency=low
+ 
+   * Downgrade priority to extra, since dose2 has priority extra now.
+     Thanks to Luca Falavigna for the hint.
+   * Migrate to source format 3.0.
 +  * 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
+  -- Ralf Treinen <treinen at debian.org>  Sun, 13 Feb 2011 11:12:01 +0100
  
  pkglab (1.4.2-12) unstable; urgency=low
  
@@@ -12,7 -12,7 +15,7 @@@
    * 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 --combined debian/contrib/edos-builddebcheck
index 1bc3dc4,0c97bf5..c9e263a
--- a/debian/contrib/edos-builddebcheck
+++ b/debian/contrib/edos-builddebcheck
@@@ -74,8 -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|");
++     "| edos-debcheck -I $packagefile $edosoptions|");
  
  $sourcestanza=0;
  $explanation="";

-- 
pkglab packaging