[Pkg-xen-changes] [xen] 30/30: Set version to 4.6.0-1

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch develop
in repository xen.

commit c213f6793e1c7f68727c0db291b2f314425d8d3a
Author: Bastian Blank <waldi at debian.org>
Date:   Sun Nov 1 20:56:29 2015 +0100

    Set version to 4.6.0-1
---
 debian/bin/gencontrol.py           | 10 +++++-----
 debian/changelog                   |  6 ++++++
 debian/rules.real                  | 16 ++++++----------
 debian/templates/control.source.in |  1 +
 debian/xen-utils-common.install    |  1 -
 debian/xenstore-utils.install      |  2 +-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 40f8837..2a801c0 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os, sys
 sys.path.append(os.path.join(sys.path[0], "../lib/python"))
@@ -52,7 +52,7 @@ class Gencontrol(Base):
 
         for i in ('postinst', 'prerm', 'lintian-overrides'):
             j = self.substitute(self.templates["xen-utils.%s" % i], vars)
-            file("debian/%s.%s" % (package_utils_name, i), 'w').write(j)
+            open("debian/%s.%s" % (package_utils_name, i), 'w').write(j)
 
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch %s" % makeflags]
         cmds_build = ["$(MAKE) -f debian/rules.real build-arch-arch %s" % makeflags]
@@ -72,14 +72,14 @@ class Gencontrol(Base):
             ('xen-arch', 'XEN_ARCH'),
             ('image-suffix', 'IMAGE_SUFFIX'),
         ):
-            if config_entry.has_key(i[0]):
+            if i[0] in config_entry:
                 makeflags[i[1]] = config_entry[i[0]]
 
     def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         hypervisor = self.templates["control.hypervisor"]
         system_latest = self.templates["control.system.latest"]
 
-        if not vars.has_key('desc'):
+        if not 'desc' in vars:
             vars['desc'] = ''
 
         packages_own = []
@@ -102,7 +102,7 @@ class Gencontrol(Base):
 
         for i in ('postinst', 'postrm'):
             j = self.substitute(self.templates["xen-hypervisor.%s" % i], vars)
-            file("debian/%s.%s" % (package_name, i), 'w').write(j)
+            open("debian/%s.%s" % (package_name, i), 'w').write(j)
 
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags]
         cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour %s" % makeflags]
diff --git a/debian/changelog b/debian/changelog
index 70be498..a881304 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xen (4.6.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 01 Nov 2015 17:43:30 +0000
+
 xen (4.5.1~rc1-1) experimental; urgency=medium
 
   [ Ian Campbell ]
diff --git a/debian/rules.real b/debian/rules.real
index 7ff231c..ac4ee13 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -122,7 +122,7 @@ $(STAMPS_DIR)/install-utils-common: $(STAMPS_DIR)/build-docs
 	@rm -rf $(INSTALL_DIR)
 	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/examples install-configs
 	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/common install-scripts
-	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/Linux install-udev install-scripts UDEV_RULES_DIR=/lib/udev
+	+$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools/hotplug/Linux install-scripts
 	+$(MAKE_CLEAN) -C debian/scripts install
 	touch $@
 
@@ -227,15 +227,11 @@ install-utils-common: $(STAMPS_DIR)/install-utils-common
 	dh_installinit --name xen -- defaults 20 21
 	dh_installinit --name xend
 	dh_installinit --name xendomains --no-start -- defaults 21 20
-	dh_installman $(SOURCE_DIR)/docs/man1/* $(SOURCE_DIR)/docs/man5/* \
-		$(SOURCE_DIR)/tools/xentrace/xentrace_format.1 \
-		$(SOURCE_DIR)/tools/xentrace/xentrace.8 \
-		$(SOURCE_DIR)/tools/xenstat/xentop/xentop.1
-	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/efi.txt
-	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xen-command-line.txt
-	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-disk-configuration.txt
-	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-network-configuration.txt
-	dh_installdocs $(SOURCE_DIR)/docs/txt/misc/xl-numa-placement.txt
+	dh_installman \
+		$(SOURCE_DIR)/docs/man1/* \
+		$(SOURCE_DIR)/docs/man5/* \
+		$(SOURCE_DIR)/docs/man8/*
+	dh_installdocs $(SOURCE_DIR)/docs/txt/misc
 	dh_link
 	dh_ucf
 	+$(MAKE_SELF) install-base
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index d721d5a..c136ff1 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -18,6 +18,7 @@ Build-Depends:
  libglib2.0-dev,
  liblzma-dev,
  libncurses5-dev,
+ libpixman-1-dev,
  libyajl-dev,
  libssl-dev,
  pkg-config,
diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install
index 3ea6597..d919bad 100644
--- a/debian/xen-utils-common.install
+++ b/debian/xen-utils-common.install
@@ -1,6 +1,5 @@
 etc/xen/scripts
 etc/xen/xl*
-lib/udev/rules.d/*.rules
 usr/lib/xen-common
 usr/sbin
 ../../tree/xen-utils-common/* /
diff --git a/debian/xenstore-utils.install b/debian/xenstore-utils.install
index 361c45c..199b491 100644
--- a/debian/xenstore-utils.install
+++ b/debian/xenstore-utils.install
@@ -1 +1 @@
-usr/sbin/xenstore-*
+usr/bin/xenstore-*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git