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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 8263a6dfef9a95ca2bdcd725aba9de8e458e13f8
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Aug 21 21:56:19 2009 +0200

    now get the back-translation of explanations right

diff --git a/debian/changelog b/debian/changelog
index ec32ead..cae90fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,8 @@ pkglab (1.4.2-5) unstable; urgency=low
     source stanza into the generated binary package stanza since the 
     Architecture is mandatory for binary packages (closes: #538926).
   * Edos-builddebcheck calls edos-debcheck with the -quiet option.
-  * Edos-builddebcheck: translate back all occurrences of the the
-    generated source package.
+  * Edos-builddebcheck: adapt the translation of the explanation to the
+    new format of explanations.
 
  -- Ralf Treinen <treinen at debian.org>  Fri, 21 Aug 2009 21:41:19 +0200
 
diff --git a/debian/contrib/edos-builddebcheck b/debian/contrib/edos-builddebcheck
old mode 100644
new mode 100755
index b13073d..0c97bf5
--- a/debian/contrib/edos-builddebcheck
+++ b/debian/contrib/edos-builddebcheck
@@ -84,7 +84,8 @@ $binpackage="";
 while (<RESULT>) {
     if (/^\s+/) {
 	if ($sourcestanza) {
-	    s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/og;
+	    s/^(\s*)$sourceprefix(.*)depends on/$1$2build-depends on/o;
+	    s/^(\s*)$sourceprefix(.*) and (.*) conflict/$1$2 build-conflicts with $3/o;
 	    print;
 	    if (/depends on ([^\s]*) .*\{.*\}/) {
 		push(@binqueue,$1);
@@ -101,9 +102,6 @@ while (<RESULT>) {
 	    s/^$sourceprefix//o;
 	    print;
 	    
-	    $_=<RESULT>;
-	    print;
-	    
 	    $sourcestanza=1;
 	} elsif (/^([^\s]*) .*: FAILED/) {
 	    $binpackage=$1;

-- 
pkglab packaging