Bastian Blank
2010-Jun-30 13:58 UTC
[Pkg-xen-changes] r794 - in trunk/xen/debian: . patches
Author: waldi
Date: Wed Jun 30 13:58:03 2010
New Revision: 794
Log:
* debian/changelog: Set version to 4.0.1~rc3-1.
* debian/patches: Update.
* debian/patches/series: Remove patches.
Deleted:
trunk/xen/debian/patches/tools-libxc-device.diff
trunk/xen/debian/patches/tools-xentrace-install.diff
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/patches/series
trunk/xen/debian/patches/tools-python-prefix.diff
trunk/xen/debian/patches/tools-xentrace-prefix.diff
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Wed Jun 30 09:03:47 2010 (r793)
+++ trunk/xen/debian/changelog Wed Jun 30 13:58:03 2010 (r794)
@@ -1,5 +1,6 @@
-xen (4.0.0-3) UNRELEASED; urgency=low
+xen (4.0.1~rc3-1) UNRELEASED; urgency=low
+ * New upstream release candidate.
* Call dh_pyversion with the correct version.
-- Bastian Blank <waldi at debian.org> Sun, 27 Jun 2010 12:11:12 +0200
Modified: trunk/xen/debian/patches/series
=============================================================================---
trunk/xen/debian/patches/series Wed Jun 30 09:03:47 2010 (r793)
+++ trunk/xen/debian/patches/series Wed Jun 30 13:58:03 2010 (r794)
@@ -44,8 +44,5 @@
tools-include-install.diff
tools-xenmon-install.diff
-tools-xentrace-install.diff
tools-python-shebang.diff
-
-tools-libxc-device.diff
Modified: trunk/xen/debian/patches/tools-python-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-python-prefix.diff Wed Jun 30 09:03:47 2010
(r793)
+++ trunk/xen/debian/patches/tools-python-prefix.diff Wed Jun 30 13:58:03 2010
(r794)
@@ -29,7 +29,7 @@
a.extend(args)
- try:
- os.execv(exepath, a)
-- except OSError, exn:
+- except (OSError, TypeError), exn:
- print exepath, ": ", exn
- sys.exit(1)
-
Modified: trunk/xen/debian/patches/tools-xentrace-prefix.diff
=============================================================================---
trunk/xen/debian/patches/tools-xentrace-prefix.diff Wed Jun 30 09:03:47 2010
(r793)
+++ trunk/xen/debian/patches/tools-xentrace-prefix.diff Wed Jun 30 13:58:03 2010
(r794)
@@ -1,6 +1,6 @@
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
-@@ -35,12 +35,10 @@
+@@ -35,13 +35,11 @@
.PHONY: install
install: build
@@ -9,9 +9,10 @@
+ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(MAN1DIR)
$(INSTALL_DIR) $(DESTDIR)$(MAN8DIR)
-- $(INSTALL_PROG) $(BIN) $(SCRIPTS) $(DESTDIR)$(BINDIR)
+- $(INSTALL_PROG) $(BIN) $(DESTDIR)$(BINDIR)
++ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
+ $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(BINDIR)
- [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN)
$(DESTDIR)$(PRIVATE_BINDIR)
-+ $(INSTALL_PROG) $(BIN) $(LIBBIN) $(SCRIPTS) $(DESTDIR)$(PRIVATE_BINDIR)
$(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
$(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)