Bastian Blank
2011-Mar-09 10:43 UTC
[Pkg-xen-changes] r818 - in trunk/xen/debian: . patches
Author: waldi Date: Wed Mar 9 10:43:26 2011 New Revision: 818 Log: * debian/changelog: Update. * debian/patches/series: Add new patches. * debian/patches/tools-libxl-prefix.diff, debian/patches/tools-xenpaging-prefix.diff: Install into private dirs. Added: trunk/xen/debian/patches/tools-libxl-prefix.diff trunk/xen/debian/patches/tools-xenpaging-prefix.diff Modified: trunk/xen/debian/changelog trunk/xen/debian/patches/series Modified: trunk/xen/debian/changelog =============================================================================--- trunk/xen/debian/changelog Wed Mar 9 10:33:11 2011 (r817) +++ trunk/xen/debian/changelog Wed Mar 9 10:43:26 2011 (r818) @@ -4,6 +4,7 @@ * Build documentation using pdflatex. * Use python 2.6. (closes: #596545) * Fix lintian override. + * Install new tools: xl, xenpaging. -- Bastian Blank <waldi at debian.org> Tue, 08 Mar 2011 13:21:34 +0100 Modified: trunk/xen/debian/patches/series =============================================================================--- trunk/xen/debian/patches/series Wed Mar 9 10:33:11 2011 (r817) +++ trunk/xen/debian/patches/series Wed Mar 9 10:43:26 2011 (r818) @@ -8,10 +8,12 @@ tools-flask-prefix.diff tools-libfsimage-prefix.diff tools-libxc-prefix.diff +tools-libxl-prefix.diff tools-misc-prefix.diff tools-pygrub-prefix.diff tools-python-prefix.diff tools-xenmon-prefix.diff +tools-xenpaging-prefix.diff tools-xenstat-prefix.diff tools-xenstore-prefix.diff tools-xentrace-prefix.diff Added: trunk/xen/debian/patches/tools-libxl-prefix.diff =============================================================================--- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/xen/debian/patches/tools-libxl-prefix.diff Wed Mar 9 10:43:26 2011 (r818) @@ -0,0 +1,30 @@ +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile +@@ -90,18 +90,19 @@ + + .PHONY: install + install: all +- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) +- $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) +- $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) +- ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) +- ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libxenlight.so ++ $(INSTALL_PROG) xl $(DESTDIR)$(PRIVATE_BINDIR) ++ $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR) ++ ln -sf libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenlight.so.$(MAJOR) ++ ln -sf libxenlight.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxenlight.so + $(INSTALL_DATA) libxenlight.a $(DESTDIR)$(LIBDIR) +- $(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR) +- ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(LIBDIR)/libxlutil.so.$(XLUMAJOR) +- ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(LIBDIR)/libxlutil.so ++ $(INSTALL_PROG) libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(PRIVATE_LIBDIR) ++ ln -sf libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxlutil.so.$(XLUMAJOR) ++ ln -sf libxlutil.so.$(XLUMAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libxlutil.so + $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(LIBDIR) + $(INSTALL_DATA) libxl.h $(DESTDIR)$(INCLUDEDIR) + $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh Added: trunk/xen/debian/patches/tools-xenpaging-prefix.diff =============================================================================--- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/xen/debian/patches/tools-xenpaging-prefix.diff Wed Mar 9 10:43:26 2011 (r818) @@ -0,0 +1,13 @@ +--- a/tools/xenpaging/Makefile ++++ b/tools/xenpaging/Makefile +@@ -30,8 +30,8 @@ + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + install: all +- $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) +- $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(SBINDIR) ++ $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) ++ $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(PRIVATE_BINDIR) + + clean: + rm -f *.o *~ $(DEPS) xen TAGS $(IBINS) $(LIB)