r775 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Tue Mar 16 20:09:19 UTC 2010
Author: waldi
Date: Tue Mar 16 20:09:17 2010
New Revision: 775
Log:
* debian/changelog: Set version to 2.02.61-1.
* debian/libdevmapper1.02.1.symbols: Update with new symbols.
* debian/patches: Update to apply.
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/libdevmapper1.02.1.symbols
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libdm-atomic.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
lvm2/trunk/debian/patches/rules-subdir.patch
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/changelog Tue Mar 16 20:09:17 2010 (r775)
@@ -1,8 +1,9 @@
-lvm2 (2.02.54-2) UNRELEASED; urgency=low
+lvm2 (2.02.61-1) UNRELEASED; urgency=low
+ * New upstream version.
* Use 3.0 (quilt) source format.
- -- Bastian Blank <waldi at debian.org> Sun, 28 Feb 2010 12:43:32 +0100
+ -- Bastian Blank <waldi at debian.org> Tue, 16 Mar 2010 20:59:53 +0100
lvm2 (2.02.54-1) unstable; urgency=low
Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols Tue Mar 16 20:09:17 2010 (r775)
@@ -104,6 +104,7 @@
dm_task_get_versions at Base 2:1.02.20
dm_task_no_flush at Base 2:1.02.20
dm_task_no_open_count at Base 2:1.02.20
+ dm_task_query_inactive_table at Base 2:1.02.44
dm_task_run at Base 2:1.02.20
dm_task_set_cookie at Base 2:1.02.36
dm_task_set_event_nr at Base 2:1.02.20
@@ -126,6 +127,7 @@
dm_task_update_nodes at Base 2:1.02.20
dm_tree_activate_children at Base 2:1.02.20
dm_tree_add_dev at Base 2:1.02.20
+ dm_tree_add_dev_with_udev_flags at Base 2:1.02.44
dm_tree_add_new_dev at Base 2:1.02.20
dm_tree_add_new_dev_with_udev_flags at Base 2:1.02.39
dm_tree_children_use_uuid at Base 2:1.02.20
@@ -141,6 +143,7 @@
dm_tree_node_add_linear_target at Base 2:1.02.20
dm_tree_node_add_mirror_target at Base 2:1.02.20
dm_tree_node_add_mirror_target_log at Base 2:1.02.20
+ dm_tree_node_add_snapshot_merge_target at Base 2:1.02.44
dm_tree_node_add_snapshot_origin_target at Base 2:1.02.20
dm_tree_node_add_snapshot_target at Base 2:1.02.20
dm_tree_node_add_striped_target at Base 2:1.02.20
@@ -159,6 +162,8 @@
dm_tree_suspend_children at Base 2:1.02.20
dm_tree_use_no_flush_suspend at Base 2:1.02.20
dm_udev_complete at Base 2:1.02.36
+ dm_udev_get_checking at Base 2:1.02.44
dm_udev_get_sync_support at Base 2:1.02.36
+ dm_udev_set_checking at Base 2:1.02.44
dm_udev_set_sync_support at Base 2:1.02.36
dm_udev_wait at Base 2:1.02.36
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Tue Mar 16 20:09:17 2010 (r775)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -946,11 +946,7 @@
+@@ -948,11 +948,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/patches/install.patch Tue Mar 16 20:09:17 2010 (r775)
@@ -119,7 +119,7 @@
--- a/man/Makefile.in
+++ b/man/Makefile.in
-@@ -63,14 +63,14 @@
+@@ -72,14 +72,14 @@
@for f in $(MAN8); \
do \
$(RM) $(MAN8DIR)/$$f; \
@@ -136,7 +136,7 @@
done
install_cluster:
-@@ -78,7 +78,7 @@
+@@ -87,7 +87,7 @@
@for f in $(MAN8CLUSTER); \
do \
$(RM) $(MAN8DIR)/$$f; \
@@ -145,7 +145,7 @@
done
install_device-mapper:
-@@ -86,7 +86,7 @@
+@@ -95,7 +95,7 @@
@for f in $(MAN8DM); \
do \
$(RM) $(MAN8DIR)/$$f; \
@@ -156,7 +156,7 @@
install: install_lvm2 install_device-mapper
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
-@@ -73,7 +69,7 @@
+@@ -73,7 +73,7 @@
install_device-mapper: install
install_include:
@@ -165,7 +165,7 @@
$(includedir)/libdevmapper.h
install_dynamic: install_ at interface@
-@@ -81,19 +77,16 @@
+@@ -81,19 +81,16 @@
$(libdir)/libdevmapper.$(LIB_SUFFIX)
install_static: install_ at interface@_static
@@ -230,26 +230,26 @@
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
-@@ -35,7 +35,7 @@
- LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@
+@@ -35,7 +35,6 @@
+ LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ -ldevmapper-event-lvm2
install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -D $< \
- $(libdir)/$<.$(LIB_VERSION)
- $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+- $(libdir)/$<
++ $(INSTALL) -D $< $(libdir)/$<
+ install: install_lvm2
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
-@@ -35,7 +35,7 @@
- LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@
+@@ -35,7 +35,6 @@
+ LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ -ldevmapper-event-lvm2
install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -D $< \
- $(libdir)/$<.$(LIB_VERSION)
- $(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+- $(libdir)/$<
++ $(INSTALL) -D $< $(libdir)/$<
+ install: install_lvm2
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -24,7 +24,7 @@
@@ -273,7 +273,7 @@
LCOV = @LCOV@
@@ -56,11 +57,6 @@
interface = @interface@
- interfacedir = $(top_srcdir)/libdm/$(interface)
+ interfacebuilddir = $(top_builddir)/libdm/$(interface)
-# setup misc variables
-# define the ownership variables for the binaries and man pages
@@ -411,7 +411,7 @@
fi
################################################################################
-@@ -1092,7 +1089,6 @@
+@@ -1094,7 +1091,6 @@
AC_SUBST(DM_LIB_VERSION)
AC_SUBST(DM_LIB_PATCHLEVEL)
AC_SUBST(FSADM)
@@ -419,7 +419,7 @@
AC_SUBST(GULM_CFLAGS)
AC_SUBST(GULM_LIBS)
AC_SUBST(HAVE_LIBDL)
-@@ -1116,7 +1112,6 @@
+@@ -1118,7 +1114,6 @@
AC_SUBST(LVM_RELEASE_DATE)
AC_SUBST(MIRRORS)
AC_SUBST(MSGFMT)
Modified: lvm2/trunk/debian/patches/libdm-atomic.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-atomic.patch Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/patches/libdm-atomic.patch Tue Mar 16 20:09:17 2010 (r775)
@@ -1,6 +1,6 @@
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
-@@ -404,12 +404,19 @@
+@@ -406,12 +406,19 @@
static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
uid_t uid, gid_t gid, mode_t mode, int check_udev)
{
@@ -21,7 +21,7 @@
if (stat(path, &info) >= 0) {
if (!S_ISBLK(info.st_mode)) {
-@@ -432,24 +439,33 @@
+@@ -435,24 +442,33 @@
"node creation.", path);
old_mask = umask(0);
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Tue Mar 16 20:09:17 2010 (r775)
@@ -8,7 +8,7 @@
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
-@@ -783,24 +782,6 @@
+@@ -785,24 +784,6 @@
fi;
################################################################################
@@ -33,7 +33,7 @@
dnl -- Check for dlopen
AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-@@ -831,35 +812,9 @@
+@@ -833,35 +814,9 @@
################################################################################
dnl -- Check for selinux
if test x$SELINUX = xyes; then
@@ -72,7 +72,7 @@
fi
################################################################################
-@@ -883,7 +838,7 @@
+@@ -885,7 +840,7 @@
dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
if test x$READLINE != xno; then
rl_found=yes
@@ -81,7 +81,7 @@
test x$READLINE:$rl_found = xyes:no &&
AC_MSG_ERROR(
GNU Readline could not be found which is required for the
-@@ -1099,6 +1054,9 @@
+@@ -1101,6 +1056,9 @@
AC_SUBST(JOBS)
AC_SUBST(LDDEPS)
AC_SUBST(LIBS)
@@ -91,10 +91,10 @@
AC_SUBST(LIB_SUFFIX)
AC_SUBST(LOCALEDIR)
AC_SUBST(LVM1)
-@@ -1125,7 +1083,6 @@
- AC_SUBST(STATICDIR)
+@@ -1128,7 +1086,6 @@
AC_SUBST(STATIC_LINK)
AC_SUBST(UDEV_RULES)
+ AC_SUBST(UDEV_SYNC)
-AC_SUBST([LIB_PTHREAD])
AC_SUBST(interface)
AC_SUBST(kerneldir)
@@ -127,8 +127,8 @@
- -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
+ -o $@ dmsetup.o -ldevmapper $(LIBS)
- dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
- -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
+ -o $@ dmsetup.o -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
@@ -139,8 +139,8 @@
- $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
+ $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM)
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacedir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) -o $@ \
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) \
- -rdynamic
+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM)
@@ -156,8 +156,8 @@
- $(LVMLIBS) $(LIBS) -rdynamic
+ $(LVMLIBS) $(LIBS)
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacedir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacedir) -o $@ \
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
- dmeventd.o $(LVMLIBS) $(LIBS) -rdynamic
+ dmeventd.o $(LVMLIBS) $(LIBS)
@@ -176,7 +176,7 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -101,7 +101,6 @@
+@@ -104,7 +104,6 @@
#DEFS += -DBOUNDS_CHECK
#CFLAGS += -pg
@@ -184,7 +184,7 @@
STRIP=
#STRIP = -s
-@@ -205,13 +204,13 @@
+@@ -208,13 +207,13 @@
ifeq ("@LIB_SUFFIX@","so")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch Tue Mar 16 19:58:19 2010 (r774)
+++ lvm2/trunk/debian/patches/rules-subdir.patch Tue Mar 16 20:09:17 2010 (r775)
@@ -1,6 +1,6 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -128,65 +128,27 @@
+@@ -131,65 +131,27 @@
.PHONY: all install install_cluster pofile distclean clean cflow device-mapper
.PHONY: install_device-mapper install_lvm2
@@ -78,7 +78,7 @@
endif
$(TARGETS): $(OBJECTS)
-@@ -234,12 +196,12 @@
+@@ -237,12 +199,12 @@
%.mo: %.po
$(MSGFMT) -o $@ $<
@@ -138,7 +138,7 @@
@CSCOPE_CMD@ -b -R
--- a/man/Makefile.in
+++ b/man/Makefile.in
-@@ -49,9 +49,7 @@
+@@ -58,9 +58,7 @@
.PHONY: man
More information about the pkg-lvm-commits
mailing list