[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 11e84a8c91760695de375233a73df2b661e26ce3
Author: Ralf Treinen <treinen at free.fr>
Date:   Fri Aug 21 21:41:45 2009 +0200

    translate correcly back the source package

diff --git a/debian/changelog b/debian/changelog
index 43d9824..ec32ead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ 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.
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 20 Aug 2009 22:48:52 +0200
+ -- Ralf Treinen <treinen at debian.org>  Fri, 21 Aug 2009 21:41:19 +0200
 
 pkglab (1.4.2-4) unstable; urgency=low
 
diff --git a/debian/contrib/edos-builddebcheck b/debian/contrib/edos-builddebcheck
index 847da2e..b13073d 100644
--- a/debian/contrib/edos-builddebcheck
+++ b/debian/contrib/edos-builddebcheck
@@ -84,7 +84,7 @@ $binpackage="";
 while (<RESULT>) {
     if (/^\s+/) {
 	if ($sourcestanza) {
-	    s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o;
+	    s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/og;
 	    print;
 	    if (/depends on ([^\s]*) .*\{.*\}/) {
 		push(@binqueue,$1);
diff --git a/debian/examples.edos-builddebcheck/Sources b/debian/examples.edos-builddebcheck/Sources
index 0a4cd5d..b4c1a8a 100644
--- a/debian/examples.edos-builddebcheck/Sources
+++ b/debian/examples.edos-builddebcheck/Sources
@@ -1,5 +1,6 @@
 Package: sourcea
 Version: 1
+Architecture: all
 Build-Depends: bina [alpha], binb [! alpha]
 
 Package: sourceb
@@ -7,3 +8,9 @@ Version: 2
 Architecture: any
 Build-Depends: bina, binb | binc
 Build-Conflicts: bind
+
+Package: sourcec
+Version: 2
+Architecture: amd64 i386
+Build-Depends: bina, binb | binc
+Build-Conflicts: bind

-- 
pkglab packaging