[Pkg-xen-changes] r97 - trunk/xen-3.0/debian
Bastian Blank
waldi at costa.debian.org
Thu Mar 9 22:00:40 UTC 2006
Author: waldi
Date: 2006-03-09 22:00:39 +0000 (Thu, 09 Mar 2006)
New Revision: 97
Removed:
trunk/xen-3.0/debian/xen-utils-3.0.manpages
Modified:
trunk/xen-3.0/debian/rules
trunk/xen-3.0/debian/xen-docs-3.0.install
trunk/xen-3.0/debian/xen-utils-3.0.install
Log:
* debian/rules: Always build and install docs.
* debian/xen-docs-3.0.install: Fix install location.
* debian/xen-utils-3.0.install: Install manpages.
* debian/xen-utils-3.0.manpages: Remove.
Modified: trunk/xen-3.0/debian/rules
===================================================================
--- trunk/xen-3.0/debian/rules 2006-03-09 21:46:05 UTC (rev 96)
+++ trunk/xen-3.0/debian/rules 2006-03-09 22:00:39 UTC (rev 97)
@@ -42,7 +42,7 @@
touch $@
build: $(STAMPS_DIR)/build
-$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup build-hypervisor build-tools
+$(STAMPS_DIR)/build: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup build-docs build-hypervisor build-tools
dh_testdir
touch $@
@@ -50,6 +50,10 @@
$(STAMPS_DIR)/build-%: DIR=$(BUILD_DIR)/$(@F)
+$(STAMPS_DIR)/build-docs: $(STAMPS_DIR)/setup-docs
+ $(MAKE) -C $(DIR)/docs
+ touch $@
+
$(STAMPS_DIR)/build-hypervisor-amd64: $(STAMPS_DIR)/setup-hypervisor-amd64
$(MAKE) -C $(DIR)/xen XEN_TARGET_ARCH=x86_64
touch $@
@@ -111,15 +115,18 @@
dh_clean
install-arch: install-hypervisor install-tools-check
- dh_testdir
- dh_testroot
- dh_installdirs
install-indep: install-docs
+install-docs: DH_OPTIONS = -pxen-docs-$(MAJOR)
install-docs:
- $(MAKE) -C debian/build/build-docs/docs
+ dh_testdir
+ dh_testroot
+ dh_clean
+ $(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
+ dh_install --sourcedir=debian/tmp
+
install-hypervisor-%:
dh_testdir
dh_testroot
@@ -135,6 +142,7 @@
dh_testroot
dh_clean
+ $(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp
dh_install --sourcedir=debian/tmp
Modified: trunk/xen-3.0/debian/xen-docs-3.0.install
===================================================================
--- trunk/xen-3.0/debian/xen-docs-3.0.install 2006-03-09 21:46:05 UTC (rev 96)
+++ trunk/xen-3.0/debian/xen-docs-3.0.install 2006-03-09 22:00:39 UTC (rev 97)
@@ -1 +1 @@
-usr/share/doc/xen
+usr/share/doc/xen/pdf/* usr/share/doc/xen-docs-3.0
Modified: trunk/xen-3.0/debian/xen-utils-3.0.install
===================================================================
--- trunk/xen-3.0/debian/xen-utils-3.0.install 2006-03-09 21:46:05 UTC (rev 96)
+++ trunk/xen-3.0/debian/xen-utils-3.0.install 2006-03-09 22:00:39 UTC (rev 97)
@@ -8,3 +8,4 @@
usr/lib/xen/bin/xen*
usr/lib/xen/*.so
usr/sbin
+usr/share/man
Deleted: trunk/xen-3.0/debian/xen-utils-3.0.manpages
===================================================================
--- trunk/xen-3.0/debian/xen-utils-3.0.manpages 2006-03-09 21:46:05 UTC (rev 96)
+++ trunk/xen-3.0/debian/xen-utils-3.0.manpages 2006-03-09 22:00:39 UTC (rev 97)
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/man/man1/xentop.1
-debian/tmp/usr/share/man/man1/xentrace_format.1
-debian/tmp/usr/share/man/man8/xentrace.8
More information about the Pkg-xen-changes
mailing list