Bastian Blank
2009-Nov-15 15:05 UTC
[Pkg-xen-changes] r669 - in trunk/xen-3/debian: . patches
Author: waldi Date: Sun Nov 15 15:05:24 2009 New Revision: 669 Log: * debian/changelog: Update version to 3.4.2-1. * debian/patches/tools-libxc-abiname.diff: Fix. Modified: trunk/xen-3/debian/changelog trunk/xen-3/debian/patches/tools-libxc-abiname.diff Modified: trunk/xen-3/debian/changelog =============================================================================--- trunk/xen-3/debian/changelog Sun Nov 15 14:22:31 2009 (r668) +++ trunk/xen-3/debian/changelog Sun Nov 15 15:05:24 2009 (r669) @@ -1,3 +1,9 @@ +xen-3 (3.4.2-1) UNRELEASED; urgency=low + + * New upstream version. + + -- Bastian Blank <waldi at debian.org> Sun, 15 Nov 2009 14:44:48 +0000 + xen-3 (3.4.1-1) unstable; urgency=low * New upstream version. Modified: trunk/xen-3/debian/patches/tools-libxc-abiname.diff =============================================================================--- trunk/xen-3/debian/patches/tools-libxc-abiname.diff Sun Nov 15 14:22:31 2009 (r668) +++ trunk/xen-3/debian/patches/tools-libxc-abiname.diff Sun Nov 15 15:05:24 2009 (r669) @@ -44,7 +44,7 @@ $(INSTALL_DATA) xenguest.h $(DESTDIR)$(INCLUDEDIR) .PHONY: TAGS -@@ -131,26 +124,16 @@ +@@ -131,24 +124,14 @@ libxenctrl.a: $(CTRL_LIB_OBJS) $(AR) rc $@ $^ @@ -68,8 +68,17 @@ -libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR) - ln -sf $< $@ - + ifeq ($(CONFIG_MiniOS),y) + zlib-options + else +@@ -167,9 +150,9 @@ + xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D) + xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D) + +-libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l) -libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) ++libxenguest.so: LDFLAGS += $(call zlib-options,l) +libxenguest.so: $(GUEST_PIC_OBJS) libxenctrl.so + $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) $(call LDFLAGS_RPATH) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)