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

[Bastian Blank]

Author: waldi
Date: Sun Nov 22 14:38:51 2009
New Revision: 696

Log:
* debian/changelog: Update.
* debian/libxen-dev.install: Add blktap static lib and header.
* debian/patches/tools-blktap-abiname.diff: Update.
* debian/patches/tools-blktap-prefix.diff:
  Install blktap static lib and header in public directory.

Modified:
   trunk/xen-3/debian/changelog
   trunk/xen-3/debian/libxen-dev.install
   trunk/xen-3/debian/patches/tools-blktap-abiname.diff
   trunk/xen-3/debian/patches/tools-blktap-prefix.diff

Modified: trunk/xen-3/debian/changelog
==============================================================================
--- trunk/xen-3/debian/changelog	Sun Nov 22 14:37:14 2009	(r695)
+++ trunk/xen-3/debian/changelog	Sun Nov 22 14:38:51 2009	(r696)
@@ -1,6 +1,7 @@
 xen-3 (3.4.2-2) UNRELEASED; urgency=low
 
   * Remove Jeremy T. Bouse from uploaders.
+  * Export blktap lib and headers.
 
  -- Bastian Blank <waldi at debian.org>  Sun, 22 Nov 2009 15:35:41 +0100
 

Modified: trunk/xen-3/debian/libxen-dev.install
==============================================================================
--- trunk/xen-3/debian/libxen-dev.install	Sun Nov 22 14:37:14 2009	(r695)
+++ trunk/xen-3/debian/libxen-dev.install	Sun Nov 22 14:38:51 2009	(r696)
@@ -1,5 +1,7 @@
+usr/lib/libblktap.a
 usr/lib/{libxenctrl.a,libxenguest.a}
 usr/lib/libxenstore.{a,so}
+usr/include/blktaplib.h
 usr/include/{xenctrl.h,xenguest.h}
 usr/include/{xs.h,xs_lib.h}
 usr/include/xen

Modified: trunk/xen-3/debian/patches/tools-blktap-abiname.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-blktap-abiname.diff	Sun Nov 22 14:37:14 2009	(r695)
+++ trunk/xen-3/debian/patches/tools-blktap-abiname.diff	Sun Nov 22 14:38:51 2009	(r696)
@@ -11,19 +11,19 @@
  
  CFLAGS   += -I.
  CFLAGS   += $(CFLAGS_libxenctrl)
-@@ -28,7 +26,7 @@
- OBJS_PIC = $(SRCS:.c=.opic)
+@@ -29,7 +27,7 @@
  IBINS   :=
  
--LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
-+LIB      = libblktap.a libblktap.so
+ LIB_STATIC = libblktap.a
+-LIB_SHARED = libblktap.so.$(MAJOR).$(MINOR)
++LIB_SHARED = libblktap.so
  
  .PHONY: all
  all: $(LIB)
-@@ -38,19 +36,15 @@
- 	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
+@@ -41,19 +39,15 @@
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
- 	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
+ 	$(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) $(LIB_SHARED) $(DESTDIR)$(PRIVATE_LIBDIR)
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
  	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
@@ -34,7 +34,7 @@
  
 -libblktap.so.$(MAJOR).$(MINOR): $(OBJS_PIC) 
 -	$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
-+libblktap.so: $(OBJS_PIC) 
++libblktap.so: $(OBJS_PIC)
 +	$(CC) $(CFLAGS) $(SHLIB_CFLAGS) \
  	      $(LDFLAGS) -o $@ $^
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)

Modified: trunk/xen-3/debian/patches/tools-blktap-prefix.diff
==============================================================================
--- trunk/xen-3/debian/patches/tools-blktap-prefix.diff	Sun Nov 22 14:37:14 2009	(r695)
+++ trunk/xen-3/debian/patches/tools-blktap-prefix.diff	Sun Nov 22 14:38:51 2009	(r696)
@@ -1,16 +1,27 @@
 --- a/tools/blktap/lib/Makefile
 +++ b/tools/blktap/lib/Makefile
-@@ -34,11 +34,11 @@
+@@ -27,18 +27,21 @@
+ OBJS_PIC = $(SRCS:.c=.opic)
+ IBINS   :=
+ 
+-LIB      = libblktap.a libblktap.so.$(MAJOR).$(MINOR)
++LIB_STATIC = libblktap.a
++LIB_SHARED = libblktap.so.$(MAJOR).$(MINOR)
+ 
+ .PHONY: all
+-all: $(LIB)
++all: $(LIB_STATIC) $(LIB_SHARED)
  
  .PHONY: install
  install: all
--	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 +	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_LIBDIR)
  	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
 -	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
 -	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
 -	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
-+	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(PRIVATE_LIBDIR)
++	$(INSTALL_DATA) $(LIB_STATIC) $(DESTDIR)$(LIBDIR)
++	$(INSTALL_DATA) $(LIB_SHARED) $(DESTDIR)$(PRIVATE_LIBDIR)
 +	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so.$(MAJOR)
 +	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(PRIVATE_LIBDIR)/libblktap.so
  	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)