[Pkg-xen-changes] r509 - in trunk/xen-3/debian: . patches templates

Bastian Blank waldi at alioth.debian.org
Sat Jan 26 23:03:40 UTC 2008 

Author: waldi
Date: Sat Jan 26 23:03:40 2008
New Revision: 509

Log:
* debian/changelog: Update.
* debian/libxen-dev.install: Use real paths.
* debian/libxenstore3.0.install, debian/xenstore-utils.install: Add.
* debian/patches/config-prefix.diff: Define public bindir and libdir.
* debian/patches/tools-lib-abiname.diff
  - Remove libxenstore.
  - Install shared libxenctrl/libxenguest.
  - Remove abiname of libflask.
  - Remove static libflask.
* debian/patches/tools-prefix.diff
  - Install xenstore utils into public bindir.
  - Install libxenstore into public libdir.
  - Install static libxenctrl/libxenguest into public libdir.
* debian/rules.real
  - Make an installation tree for all utils and libs packages.
  - Build libxenstore3.0.
  - Build xenstore-utils.
* debian/templates/control.main.in
  - Add libxenstore3.0.
  - Add xenstore-utils.
  - Add libxenstore3.0 dep to libxen-dev.


Added:
   trunk/xen-3/debian/libxenstore3.0.install
   trunk/xen-3/debian/xenstore-utils.install
Modified:
   trunk/xen-3/debian/changelog
   trunk/xen-3/debian/libxen-dev.install
   trunk/xen-3/debian/patches/config-prefix.diff
   trunk/xen-3/debian/patches/tools-lib-abiname.diff
   trunk/xen-3/debian/patches/tools-prefix.diff
   trunk/xen-3/debian/rules.real
   trunk/xen-3/debian/templates/control.main.in

Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog	(original)
+++ trunk/xen-3/debian/changelog	Sat Jan 26 23:03:40 2008
@@ -1,6 +1,7 @@
 xen-3 (3.2.0-3) UNRELEASED; urgency=low
 
   * Clean environment for build.
+  * Add packages libxenstore3.0 and xenstore-utils.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 26 Jan 2008 22:18:23 +0000
 

Modified: trunk/xen-3/debian/libxen-dev.install
==============================================================================
--- trunk/xen-3/debian/libxen-dev.install	(original)
+++ trunk/xen-3/debian/libxen-dev.install	Sat Jan 26 23:03:40 2008
@@ -1,6 +1,12 @@
-tools/libxc/{libxenctrl.a,libxenguest.a} usr/lib
-tools/libxc/{xenctrl.h,xenguest.h} usr/include
-tools/xenstore/libxenstore.a usr/lib
-tools/xenstore/{xs.h,xs_lib.h} usr/include
-xen/include/public/*.h usr/include/xen
-xen/include/public/{arch-ia64,arch-x86,foreign,hvm,io,xsm} usr/include/xen
+usr/lib/{libxenctrl.a,libxenguest.a}
+usr/lib/libxenstore.{a,so}
+usr/include/{xenctrl.h,xenguest.h}
+usr/include/{xs.h,xs_lib.h}
+usr/include/xen
+../../../xen/include/public/*.h usr/include/xen
+../../../xen/include/public/arch-ia64/*.h usr/include/xen/arch-ia64
+../../../xen/include/public/arch-x86/*.h usr/include/xen/arch-x86
+../../../xen/include/public/foreign/*.h usr/include/xen/foreign
+../../../xen/include/public/hvm/*.h usr/include/xen/hvm
+../../../xen/include/public/io/*.h usr/include/xen/io
+../../../xen/include/public/xsm/*.h usr/include/xen/xsm

Added: trunk/xen-3/debian/libxenstore3.0.install
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/libxenstore3.0.install	Sat Jan 26 23:03:40 2008
@@ -0,0 +1 @@
+usr/lib/libxenstore.so.*

Modified: trunk/xen-3/debian/patches/config-prefix.diff
==============================================================================
--- trunk/xen-3/debian/patches/config-prefix.diff	(original)
+++ trunk/xen-3/debian/patches/config-prefix.diff	Sat Jan 26 23:03:40 2008
@@ -1,6 +1,6 @@
 --- xen-3.orig/Config.mk
 +++ xen-3/Config.mk
-@@ -31,6 +31,10 @@
+@@ -31,6 +31,13 @@
  include $(XEN_ROOT)/config/$(XEN_OS).mk
  include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk
  
@@ -8,6 +8,9 @@
 +BINDIR = $(PREFIX)/bin
 +LIBDIR = $(PREFIX)/lib
 +
++PUBLIC_BINDIR = bin
++PUBLIC_LIBDIR = lib
++
  ifneq ($(EXTRA_PREFIX),)
  EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
  EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)

Modified: trunk/xen-3/debian/patches/tools-lib-abiname.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-lib-abiname.diff	(original)
+++ trunk/xen-3/debian/patches/tools-lib-abiname.diff	Sat Jan 26 23:03:40 2008
@@ -23,26 +23,26 @@
  
  .PHONY: all
  all: build
-@@ -105,16 +102,10 @@
- install: build
+@@ -106,16 +103,12 @@
  	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
  	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
 -	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DATA) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
 -	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
 -	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
-+	$(INSTALL_DATA) libxenctrl.so $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
  
 -	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DATA) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
 -	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
 -	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
-+	$(INSTALL_DATA) libxenguest.so $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
  
  .PHONY: TAGS
-@@ -143,26 +134,16 @@
+@@ -144,26 +137,16 @@
  libxenctrl.a: $(CTRL_LIB_OBJS)
  	$(AR) rc $@ $^
  
@@ -73,45 +73,6 @@
  
  -include $(DEPS)
  
---- xen-3.orig/tools/xenstore/Makefile
-+++ xen-3/tools/xenstore/Makefile
-@@ -2,9 +2,6 @@
- include $(XEN_ROOT)/tools/Rules.mk
- XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
- 
--MAJOR = 3.0
--MINOR = 0
--
- PROFILE=#-pg
- BASECFLAGS=-Werror
- # Make gcc generate dependencies.
-@@ -50,13 +47,8 @@
- xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
--libxenstore.so: libxenstore.so.$(MAJOR)
--	ln -sf $< $@
--libxenstore.so.$(MAJOR): libxenstore.so.$(MAJOR).$(MINOR)
--	ln -sf $< $@
--
--libxenstore.so.$(MAJOR).$(MINOR): xs.opic xs_lib.opic
--	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenstore.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread
-+libxenstore.so: xs.opic xs_lib.opic
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ $(SOCKET_LIBS) -lpthread
- 
- libxenstore.a: xs.o xs_lib.o
- 	$(AR) rcs libxenstore.a $^
-@@ -85,9 +77,7 @@
- 	$(INSTALL_DIR) $(DESTDIR)/usr/include
- 	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
--	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
--	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
--	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
-+	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
- 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
 --- xen-3.orig/tools/blktap/lib/Makefile
 +++ xen-3/tools/blktap/lib/Makefile
 @@ -1,9 +1,7 @@
@@ -125,16 +86,25 @@
  
  BLKTAP_INSTALL_DIR = /usr/$(BINDIR)
  
-@@ -28,7 +26,7 @@
+@@ -28,35 +26,30 @@
  OBJS     = $(patsubst %.c,%.o,$(SRCS))
  IBINS   :=
  
 -LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
-+LIB      = libblktap.a libblktap.so
++LIB      = libblktap.so
  
  .PHONY: all
  all: build
-@@ -43,19 +41,15 @@
+ 
+ .PHONY: build
+-build: libblktap.a
++build: libblktap.so
+ 
+ .PHONY: libblktap
+-libblktap: libblktap.a
++libblktap: libblktap.so
+ 
+ install: all
  	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)/usr/include
  	$(INSTALL_DATA) $(LIB) $(DESTDIR)/usr/$(LIBDIR)
@@ -145,17 +115,19 @@
  clean:
  	rm -rf *.a *.so* *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS
  
- libblktap.a: $(OBJS) 
+-libblktap.a: $(OBJS) 
 -	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
++libblktap.so: $(OBJS) 
 +	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
  	      -L$(XEN_XENSTORE) $(LDFLAGS) -l xenstore                                \
 -	      -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) libblktap.so
+-	$(AR) rc $@ libblktap.so
 +	      -o libblktap.so $^ $(LIBS)
- 	$(AR) rc $@ libblktap.so
  
  .PHONY: TAGS all build clean install libblktap
+ 
 --- xen-3.orig/tools/libfsimage/common/Makefile
 +++ xen-3/tools/libfsimage/common/Makefile
 @@ -1,9 +1,6 @@
@@ -204,3 +176,45 @@
  
  -include $(DEPS)
  
+--- xen-3.orig/tools/flask/libflask/Makefile
++++ xen-3/tools/flask/libflask/Makefile
+@@ -21,8 +21,7 @@
+ LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
+ PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS))
+ 
+-LIB := libflask.a
+-LIB += libflask.so libflask.so.$(MAJOR) libflask.so.$(MAJOR).$(MINOR)
++LIB += libflask.so
+ 
+ .PHONY: all
+ all: build
+@@ -35,10 +34,7 @@
+ install: build
+ 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+ 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+-	$(INSTALL_PROG) libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_DATA) libflask.a $(DESTDIR)/usr/$(LIBDIR)
+-	ln -sf libflask.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so.$(MAJOR)
+-	ln -sf libflask.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libflask.so
++	$(INSTALL_PROG) libflask.so $(DESTDIR)/usr/$(LIBDIR)
+ 	$(INSTALL_DATA) include/flask.h $(DESTDIR)/usr/include
+ 
+ .PHONY: TAGS
+@@ -51,15 +47,7 @@
+ 
+ # libflask
+ 
+-libflask.a: $(LIB_OBJS)
+-	$(AR) rc $@ $^
+-
+-libflask.so: libflask.so.$(MAJOR)
+-	ln -sf $< $@
+-libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR)
+-	ln -sf $< $@
+-
+-libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
++libflask.so: $(PIC_OBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^
+ 
+ -include $(DEPS)

Modified: trunk/xen-3/debian/patches/tools-prefix.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-prefix.diff	(original)
+++ trunk/xen-3/debian/patches/tools-prefix.diff	Sat Jan 26 23:03:40 2008
@@ -155,22 +155,34 @@
  
 --- xen-3.orig/tools/xenstore/Makefile
 +++ xen-3/tools/xenstore/Makefile
-@@ -81,13 +81,9 @@
+@@ -81,18 +81,16 @@
  install: all
  	$(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
 -	$(INSTALL_DIR) $(DESTDIR)/usr/bin
 -	$(INSTALL_DIR) $(DESTDIR)/usr/sbin
 +	$(INSTALL_DIR) $(DESTDIR)/usr/$(BINDIR)
++	$(INSTALL_DIR) $(DESTDIR)/usr/$(PUBLIC_BINDIR)
  	$(INSTALL_DIR) $(DESTDIR)/usr/include
 -	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
 -	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
 -	$(INSTALL_PROG) xenstore-control $(DESTDIR)/usr/bin
 -	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
-+	$(INSTALL_PROG) xenstore-control xenstore-ls xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
- 	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
- 	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
- 	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
+-	$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so.$(MAJOR)
+-	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenstore.so
+-	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_PROG) xenstore-control xenstored $(CLIENTS) $(DESTDIR)/usr/$(BINDIR)
++	$(INSTALL_PROG) xenstore-ls $(CLIENTS) $(DESTDIR)/usr/$(PUBLIC_BINDIR)
++	$(INSTALL_DIR) $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
++	$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
++	ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(PUBLIC_LIBDIR)/libxenstore.so.$(MAJOR)
++	ln -sf libxenstore.so.$(MAJOR) $(DESTDIR)/usr/$(PUBLIC_LIBDIR)/libxenstore.so
++	$(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
+ 	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
+ 	$(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
+ 
 --- xen-3.orig/tools/xentrace/Makefile
 +++ xen-3/tools/xentrace/Makefile
 @@ -35,15 +35,11 @@
@@ -240,3 +252,24 @@
  
  INCLUDES += -I. -I.. -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
  
+--- xen-3.orig/tools/libxc/Makefile
++++ xen-3/tools/libxc/Makefile
+@@ -104,15 +104,16 @@
+ .PHONY: install
+ install: build
+ 	[ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DIR) $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
+ 	[ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+ 	$(INSTALL_PROG) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DATA) libxenctrl.a $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
+ 	ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so.$(MAJOR)
+ 	ln -sf libxenctrl.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenctrl.so
+ 	$(INSTALL_DATA) xenctrl.h $(DESTDIR)/usr/include
+ 
+ 	$(INSTALL_PROG) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(LIBDIR)
++	$(INSTALL_DATA) libxenguest.a $(DESTDIR)/usr/$(PUBLIC_LIBDIR)
+ 	ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
+ 	ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
+ 	$(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include

Modified: trunk/xen-3/debian/rules.real
==============================================================================
--- trunk/xen-3/debian/rules.real	(original)
+++ trunk/xen-3/debian/rules.real	Sat Jan 26 23:03:40 2008
@@ -11,7 +11,10 @@
 
 include debian/rules.defs
 
-binary-arch-arch: install-lib-dev_$(ARCH) install-utils_$(ARCH)
+binary-arch-arch: install-lib-dev_$(ARCH)
+binary-arch-arch: install-libxenstore_$(ARCH)
+binary-arch-arch: install-utils_$(ARCH)
+binary-arch-arch: install-xenstore-utils_$(ARCH)
 binary-arch-flavour: install-hypervisor_$(ARCH)_$(FLAVOUR)
 
 binary-indep: install-docs
@@ -67,7 +70,7 @@
 	touch $@
 
 $(STAMPS_DIR)/build-utils_$(ARCH) \
-install-utils_$(ARCH): CONFIG = \
+$(STAMPS_DIR)/install-utils_$(ARCH): CONFIG = \
 		XEN_COMPILE_ARCH=$(XEN_ARCH) \
 		XEN_TARGET_ARCH=$(XEN_ARCH) \
 		XEN_VERSION=$(VERSION)$(ABINAME) \
@@ -78,6 +81,13 @@
 	$(MAKE_CLEAN) -C $(DIR)/tools $(CONFIG)
 	touch $@
 
+$(STAMPS_DIR)/install-utils_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH)
+$(STAMPS_DIR)/install-utils_$(ARCH): INSTALL_DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+$(STAMPS_DIR)/install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
+	@rm -rf $(INSTALL_DIR)
+	$(MAKE_CLEAN) -C $(DIR)/tools install DESTDIR=$(CURDIR)/$(INSTALL_DIR) $(CONFIG)
+	touch $@
+
 install-base:
 	dh_installchangelogs
 	dh_installdocs
@@ -110,15 +120,29 @@
 	cp $(DIR)/xen/xen.gz debian/$(PACKAGE_NAME)/boot/xen-$(VERSION)$(ABINAME)-$(FLAVOUR).gz
 	$(MAKE_SELF) install-base
 
-install-lib-dev_$(ARCH): DIR = $(BUILD_DIR)/build-utils_$(ARCH)
+install-lib-dev_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
 install-lib-dev_$(ARCH): PACKAGE_NAME = libxen-dev
 install-lib-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-lib-dev_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
+install-lib-dev_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install --sourcedir=$(DIR)
+	dh_strip
+	dh_shlibdeps
+	$(MAKE_SELF) install-base
+
+install-libxenstore_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-libxenstore_$(ARCH): PACKAGE_NAME = libxenstore3.0
+install-libxenstore_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-libxenstore_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_install --sourcedir=$(DIR)
 	dh_strip
+	dh_makeshlibs
+	dh_shlibdeps
 	$(MAKE_SELF) install-base
 
 install-utils_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH)
@@ -126,19 +150,29 @@
 install-utils_$(ARCH): PACKAGE_NAME = xen-utils-$(VERSION)$(ABINAME)
 install-utils_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-utils_$(ARCH): $(STAMPS_DIR)/build-utils_$(ARCH)
+install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	@rm -rf $(DIR)
-	$(MAKE_CLEAN) -C $(SOURCE_DIR)/tools install DESTDIR=$(CURDIR)/$(DIR) DISTDIR=$(CURDIR)/$(DIR) $(CONFIG)
 	install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS
 	install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian
-	dh_install --sourcedir=$(DIR) usr/lib
+	dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION)$(ABINAME)
 	dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
 	dh_pycentral
 	dh_strip
 	dh_shlibdeps
 	$(MAKE_SELF) install-base
 
+install-xenstore-utils_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH)
+install-xenstore-utils_$(ARCH): PACKAGE_NAME = xenstore-utils
+install-xenstore-utils_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-xenstore-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install --sourcedir=$(DIR)
+	dh_strip
+	dh_shlibdeps
+	$(MAKE_SELF) install-base
+
 # vim: filetype=make

Modified: trunk/xen-3/debian/templates/control.main.in
==============================================================================
--- trunk/xen-3/debian/templates/control.main.in	(original)
+++ trunk/xen-3/debian/templates/control.main.in	Sat Jan 26 23:03:40 2008
@@ -5,8 +5,26 @@
  includes a description interface (both the api, and a nice explanation of
  how XEN works).
 
+Package: libxenstore3.0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Xenstore communications library for Xen
+ This package contains the public libxenstore.
+
 Package: libxen-dev
 Section: libdevel
 Architecture: any
+Depends: libxenstore3.0 (= ${binary:Version})
 Description: Public headers and libs for Xen
  This package contains the public headers and static libraries for Xen.
+
+Package: xenstore-utils
+Section: admin
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: xen-utils-common (<= 3.1.0-1)
+Replaces: xen-utils-common (<= 3.1.0-1)
+Description: Xenstore utilities for Xen
+ This package contains the Xenstore utilities.
+

Added: trunk/xen-3/debian/xenstore-utils.install
==============================================================================
--- (empty file)
+++ trunk/xen-3/debian/xenstore-utils.install	Sat Jan 26 23:03:40 2008
@@ -0,0 +1 @@
+usr/bin/xenstore-*

More information about the Pkg-xen-changes mailing list