Bastian Blank
2010-Mar-01 22:11 UTC
[Pkg-xen-changes] r736 - in trunk/xen-3/debian: bin templates
Author: waldi
Date: Mon Mar 1 22:10:59 2010
New Revision: 736
Log:
debian/bin/gencontrol.py, debian/templates: Remove notion of an abiname.
Modified:
trunk/xen-3/debian/bin/gencontrol.py
trunk/xen-3/debian/templates/control.hypervisor.in
trunk/xen-3/debian/templates/control.utils.in
trunk/xen-3/debian/templates/xen-utils.lintian-overrides.in
trunk/xen-3/debian/templates/xen-utils.postinst.in
trunk/xen-3/debian/templates/xen-utils.prerm.in
Modified: trunk/xen-3/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-3/debian/bin/gencontrol.py Mon Mar 1 22:09:27 2010 (r735)
+++ trunk/xen-3/debian/bin/gencontrol.py Mon Mar 1 22:10:59 2010 (r736)
@@ -17,7 +17,6 @@
def do_main_setup(self, vars, makeflags, extra):
makeflags.update({
''VERSION'': self.version.xen_version,
- ''ABINAME'': self.abiname,
})
def do_main_packages(self, packages, vars, makeflags, extra):
@@ -105,10 +104,8 @@
def process_changelog(self):
changelog = Changelog(version = VersionXen)
self.version = changelog[0].version
- self.abiname = ''abiname'' in
self.config[''abi'',] and ''-%s'' %
self.config[''abi'',][''abiname''] or
''''
self.vars = {
''version'': self.version.xen_version,
- ''abiname'': self.abiname,
}
if __name__ == ''__main__'':
Modified: trunk/xen-3/debian/templates/control.hypervisor.in
=============================================================================---
trunk/xen-3/debian/templates/control.hypervisor.in Mon Mar 1 22:09:27 2010
(r735)
+++ trunk/xen-3/debian/templates/control.hypervisor.in Mon Mar 1 22:10:59 2010
(r736)
@@ -1,7 +1,7 @@
-Package: xen-hypervisor- at version@@abiname@@localversion@
+Package: xen-hypervisor- at version@@localversion@
Depends: ${misc:Depends}
-Provides: xen-hypervisor, xen-hypervisor- at version@@abiname@, xen-hypervisor
at localversion@
-Recommends: xen-utils- at version@@abiname@
+Provides: xen-hypervisor, xen-hypervisor- at version@, xen-hypervisor at
localversion@
+Recommends: xen-utils- at version@
Suggests: xen-docs- at version@
Description: The Xen Hypervisor on @class@
The hypervisor is the "core" for XEN itself. It gets booted by the
boot loader
Modified: trunk/xen-3/debian/templates/control.utils.in
=============================================================================---
trunk/xen-3/debian/templates/control.utils.in Mon Mar 1 22:09:27 2010 (r735)
+++ trunk/xen-3/debian/templates/control.utils.in Mon Mar 1 22:10:59 2010
(r736)
@@ -1,6 +1,6 @@
-Package: xen-utils- at version@@abiname@
+Package: xen-utils- at version@
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
xen-utils-common (>= 3.3.1-1), iproute, udev (>> 0.060)
-Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at
version@@abiname@
+Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor- at version@
Provides: xen-utils
Suggests: xen-docs- at version@
XB-Python-Version: ${python:Versions}
Modified: trunk/xen-3/debian/templates/xen-utils.lintian-overrides.in
=============================================================================---
trunk/xen-3/debian/templates/xen-utils.lintian-overrides.in Mon Mar 1 22:09:27
2010 (r735)
+++ trunk/xen-3/debian/templates/xen-utils.lintian-overrides.in Mon Mar 1
22:10:59 2010 (r736)
@@ -1 +1 @@
-statically-linked-binary ./usr/lib/xen- at version@@abiname@/boot/hvmloader
+statically-linked-binary ./usr/lib/xen- at version@/boot/hvmloader
Modified: trunk/xen-3/debian/templates/xen-utils.postinst.in
=============================================================================---
trunk/xen-3/debian/templates/xen-utils.postinst.in Mon Mar 1 22:09:27 2010
(r735)
+++ trunk/xen-3/debian/templates/xen-utils.postinst.in Mon Mar 1 22:10:59 2010
(r736)
@@ -4,7 +4,7 @@
case "$1" in
configure)
- update-alternatives --install /usr/lib/xen-default xen-default
/usr/lib/xen- at version@@abiname@ 1 || true
+ update-alternatives --install /usr/lib/xen-default xen-default
/usr/lib/xen- at version@ 1 || true
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/xen-3/debian/templates/xen-utils.prerm.in
=============================================================================---
trunk/xen-3/debian/templates/xen-utils.prerm.in Mon Mar 1 22:09:27 2010 (r735)
+++ trunk/xen-3/debian/templates/xen-utils.prerm.in Mon Mar 1 22:10:59 2010
(r736)
@@ -4,7 +4,7 @@
case "$1" in
remove)
- update-alternatives --remove xen-default /usr/lib/xen- at
version@@abiname@
+ update-alternatives --remove xen-default /usr/lib/xen- at version@
;;
upgrade|deconfigure|failed-upgrade)