Bastian Blank
2011-Oct-26 14:52 UTC
[Pkg-xen-changes] r916 - in trunk/xen/debian: bin templates
Author: waldi
Date: Wed Oct 26 14:52:26 2011
New Revision: 916
Log:
* debian/bin/gencontrol.py: Include correct architectures for main packages.
* debian/templates/control.main.in: Remove not needed architecture specs.
Modified:
trunk/xen/debian/bin/gencontrol.py
trunk/xen/debian/templates/control.main.in
Modified: trunk/xen/debian/bin/gencontrol.py
=============================================================================---
trunk/xen/debian/bin/gencontrol.py Wed Oct 26 13:29:48 2011 (r915)
+++ trunk/xen/debian/bin/gencontrol.py Wed Oct 26 14:52:26 2011 (r916)
@@ -3,7 +3,7 @@
import os, sys
sys.path.append(os.path.join(sys.path[0], "../lib/python"))
-from debian_xen.debian import VersionXen
+from debian_xen.debian import VersionXen, PackageFieldList
from debian_linux.config import ConfigCoreHierarchy
from debian_linux.debian import Changelog
from debian_linux.gencontrol import Gencontrol as Base
@@ -19,9 +19,6 @@
''VERSION'': self.version.xen_version,
})
- def do_main_packages(self, packages, vars, makeflags, extra):
-
packages.extend(self.process_packages(self.templates["control.main"],
vars))
-
def do_arch_setup(self, vars, makeflags, arch, extra):
config_entry = self.config.merge(''base'', arch)
config_entry_description =
self.config.merge(''description'', arch)
@@ -32,18 +29,21 @@
makeflags[i[1]] = config_entry[i[0]]
def do_arch_packages(self, packages, makefile, arch, vars, makeflags,
extra):
- utils = self.templates["control.utils"]
- packages_utils = self.process_packages(utils, vars)
+ packages_main =
self.process_packages(self.templates["control.main"], vars)
+ packages_utils =
self.process_packages(self.templates["control.utils"], vars)
- for package in packages_utils:
+ for package in packages_main + packages_utils:
name = package[''Package'']
- if packages.has_key(name):
+ if name in packages:
package = packages.get(name)
- package[''Architecture''].append(arch)
else:
- package[''Architecture''] = [arch]
packages.append(package)
+ arches = package.setdefault(''Architecture'',
PackageFieldList())
+ if ''all'' not in arches:
+ arches.append(arch)
+ print name, arches
+
package_utils_name = packages_utils[0][''Package'']
for i in (''postinst'', ''prerm'',
''lintian-overrides''):
Modified: trunk/xen/debian/templates/control.main.in
=============================================================================---
trunk/xen/debian/templates/control.main.in Wed Oct 26 13:29:48 2011 (r915)
+++ trunk/xen/debian/templates/control.main.in Wed Oct 26 14:52:26 2011 (r916)
@@ -9,21 +9,18 @@
Package: libxenstore3.0
Section: libs
-Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Xenstore communications library for Xen
This package contains the public libxenstore.
Package: libxen-dev
Section: libdevel
-Architecture: any
Depends: libxenstore3.0 (= ${binary:Version}), ${misc:Depends}
Description: Public headers and libs for Xen
This package contains the public headers and static libraries for Xen.
Package: xenstore-utils
Section: admin
-Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: xen-utils-common (<= 3.1.0-1)
Replaces: xen-utils-common (<= 3.1.0-1)