The following commit has been merged in the master branch: commit 99e7e5ce9532cb2667456a649fb72103c30843ed Author: Ralf Treinen <trei...@free.fr> Date: Thu Aug 20 22:51:00 2009 +0200
add-sources: copy Architecture field. edos-builddebcheck: call edos-debcheck with -quiet option diff --git a/debian/changelog b/debian/changelog index 0b7ad8c..43d9824 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,12 @@ pkglab (1.4.2-5) unstable; urgency=low from source package p (closes: #516587). * Fix add-sources.py to separate binary and source file by blank line (closes: #538925). + * Fix add-sources.py to always copy the Architecture field from the + 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. - -- Ralf Treinen <trei...@debian.org> Thu, 20 Aug 2009 13:04:42 +0200 + -- Ralf Treinen <trei...@debian.org> Thu, 20 Aug 2009 22:48:52 +0200 pkglab (1.4.2-4) unstable; urgency=low diff --git a/debian/contrib/add-sources.py b/debian/contrib/add-sources.py old mode 100644 new mode 100755 index dad96ac..3d36c2c --- a/debian/contrib/add-sources.py +++ b/debian/contrib/add-sources.py @@ -90,7 +90,7 @@ def pkg_of_src(src): pp_or_dep = lambda deps: string.join(map(pp_atomic_dep, deps), ' | ') return string.join(map(pp_or_dep, rels), ', ') - for field in ['Version', 'Priority', 'Section', 'Maintainer']: + for field in ['Version', 'Priority', 'Section', 'Maintainer', 'Architecture']: if src.has_key(field): pkg[field] = src[field] bin_depends = mk_bin_rels(['build-depends', 'build-depends-indep'], diff --git a/debian/contrib/edos-builddebcheck b/debian/contrib/edos-builddebcheck index 847da2e..09bcfe2 100644 --- a/debian/contrib/edos-builddebcheck +++ b/debian/contrib/edos-builddebcheck @@ -73,7 +73,7 @@ if ( $architecture eq "" ) { } } -open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ". +gopen(RESULT,"python /usr/share/edos-distcheck/add-sources.py ". "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ". "| edos-debcheck $edosoptions|"); diff --git a/debian/examples.edos-builddebcheck/Packages b/debian/examples.edos-builddebcheck/Packages new file mode 100644 index 0000000..e234d71 --- /dev/null +++ b/debian/examples.edos-builddebcheck/Packages @@ -0,0 +1,18 @@ +Package: bina +Version: 3 +Architecture: any +Conflicts: binc + +Package: binb +Version: 3 +Architecture: any +Depends: bind + +Package: binc +Version: 3 +Architecture: any + +Package: bind +Version: 3 +Architecture: any + diff --git a/debian/examples.edos-builddebcheck/Sources b/debian/examples.edos-builddebcheck/Sources new file mode 100644 index 0000000..0a4cd5d --- /dev/null +++ b/debian/examples.edos-builddebcheck/Sources @@ -0,0 +1,9 @@ +Package: sourcea +Version: 1 +Build-Depends: bina [alpha], binb [! alpha] + +Package: sourceb +Version: 2 +Architecture: any +Build-Depends: bina, binb | binc +Build-Conflicts: bind -- pkglab packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits