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

[Ralf Treinen]

The following commit has been merged in the master branch:
commit cec80be3145a35841bb838591791e0af0dd3a21d
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Apr 20 10:20:05 2010 +0200

    add config file for builddebcheck (Zack's patch)

diff --git a/debian/changelog b/debian/changelog
index 89da67a..147c59f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,14 @@ pkglab (1.4.2-10) UNRELEASED; urgency=low
     the packages in a disjunction is build-essential then the whole
     disjunctive clause is discarded. Thanks to Zack for the patch!
     (closes: #574380).
+  * Have edos-debcheck use (via add-sources.py) the config file
+    /etc/edos-builddebcheck.conf. Install that config file, and put
+    into /usr/share/edos-distcheck the script to generate it. Thanks
+    to Zack for the patch! (closes: #574721).
   * Added debian/source/format, current format is 1.0 (in order to
     facilitate backports).
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 19 Apr 2010 22:58:22 +0200
+ -- Ralf Treinen <treinen at debian.org>  Tue, 20 Apr 2010 10:19:39 +0200
 
 pkglab (1.4.2-9) unstable; urgency=low
 
diff --git a/debian/contrib/add-sources.py b/debian/contrib/add-sources.py
index 78b7521..279a070 100755
--- a/debian/contrib/add-sources.py
+++ b/debian/contrib/add-sources.py
@@ -12,18 +12,20 @@
 
 # $Id: add-sources.py 5957 2008-08-16 18:32:17Z zack $
 
-# build-essential packages. All build-dependencies and build-conflicts
-# to one of these packages is simply ignored.
-# TODO: this list should be obtained from the binary package file,
-# by grep-dctrl -F Build-Essential --pattern=yes -s Package -n
-# but then we have to change the way this command is called.
+# build-essential packages: all (unversioned) build-dependencies will be
+# ignored. This list is just the default fallback for when
+# /etc/edos-builddebcheck.conf is not available; when it is, per-arch
+# build-essential packages will be read from it
 buildessentials = ['apt', 'binutils', 'cpio', 'cpp', 'dpkg-dev',
                    'g++', 'gcc', 'libc6-dev', 'make', 'patch',
                    'perl', 'perl-modules']
-
+CONFFILE = "/etc/edos-builddebcheck.conf"
+ 
+import os
 import string
 import sys
 
+from ConfigParser import ConfigParser
 from optparse import OptionParser
 from debian_bundle import deb822
 
@@ -38,6 +40,14 @@ if len(args) != 2:
     sys.exit(2)
 sources_file = args[0]
 architecture = args[1]
+if os.path.isfile(CONFFILE):
+    conf = ConfigParser()
+    conf.read(CONFFILE)
+    if conf.has_option('build-essentials', architecture):
+        # overrire default with configured per-arch build-essentials
+        raw_b_e = conf.get('build-essentials', architecture)
+        buildessentials = map(lambda s: s.strip(), raw_b_e.split(','))
+
 
 def pkg_of_src(src):
     global architecture, options
diff --git a/debian/contrib/edos-builddebcheck.conf b/debian/contrib/edos-builddebcheck.conf
new file mode 100644
index 0000000..f98e376
--- /dev/null
+++ b/debian/contrib/edos-builddebcheck.conf
@@ -0,0 +1,15 @@
+[build-essentials]
+alpha: binutils, build-essential, dpkg-dev, libc6.1-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+amd64: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+armel: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+hppa: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+hurd-i386: binutils, build-essential, dpkg-dev, libc0.3-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+i386: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+ia64: binutils, build-essential, dpkg-dev, libc6.1-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+kfreebsd-amd64: binutils, build-essential, dpkg-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+kfreebsd-i386: binutils, build-essential, dpkg-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+mips: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+mipsel: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+powerpc: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+s390: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
+sparc: binutils, build-essential, dpkg-dev, libc6-dev, cpp, g++, gcc, make, patch, perl-modules, perl
diff --git a/debian/contrib/get-buildessentials b/debian/contrib/get-buildessentials
index 201fa56..57e8863 100755
--- a/debian/contrib/get-buildessentials
+++ b/debian/contrib/get-buildessentials
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$output = "buildessentials.py";
+$output = "edos-builddebcheck.conf";
 $mirror="ftp://ftp.fr.debian.org/debian";
 @arches=("alpha", "amd64", "armel", "hppa", "hurd-i386", "i386", "ia64",
     "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc",
@@ -8,17 +8,18 @@ $mirror="ftp://ftp.fr.debian.org/debian";
 
 open(OUT,">$output");
 select OUT;
+print "[build-essentials]\n";
 foreach $arch (@arches) {
     my($isfirst)=1;
-    print "buildessentials[\'$arch\']=[";
+    print "$arch: ";
     open(ESS,"wget -O - $mirror/dists/sid/main/binary-$arch/Packages.bz2 | bzcat | grep-dctrl -FBuild-Essential -ni yes -sPackage |");
     while ($p=<ESS>) {
 	chop $p;
 	print ", " unless $isfirst;
-	print "'$p\'";
+	print $p;
 	$isfirst=0;
     }
-    print "]\n";
+    print "\n";
     close ESS;
 }
 close OUT;
diff --git a/debian/edos-distcheck.dirs b/debian/edos-distcheck.dirs
index 0f6b3b8..643155c 100644
--- a/debian/edos-distcheck.dirs
+++ b/debian/edos-distcheck.dirs
@@ -2,3 +2,4 @@ usr/bin
 usr/lib/edos-distcheck
 usr/share/edos-distcheck
 usr/share/man
+etc
diff --git a/debian/edos-distcheck.install b/debian/edos-distcheck.install
index 86a9605..ead8362 100644
--- a/debian/edos-distcheck.install
+++ b/debian/edos-distcheck.install
@@ -1,2 +1,4 @@
 debian/contrib/add-sources.py usr/share/edos-distcheck
 debian/contrib/edos-builddebcheck usr/bin
+debian/contrib/get-buildessentials usr/share/edos-distcheck
+debian/contrib/edos-builddebcheck.conf etc
\ No newline at end of file

-- 
pkglab packaging