r823 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Fri Jun 4 08:16:36 UTC 2010
Author: waldi
Date: Fri Jun 4 08:16:24 2010
New Revision: 823
Log:
* debian/changelog: Set version to 2.02.66-1.
* debian/libdevmapper1.02.1.symbols: Add new symbol.
* debian/patches: Update, remove merged patches.
Deleted:
lvm2/trunk/debian/patches/pkgconfig.patch
lvm2/trunk/debian/patches/scripts-bash.sh
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/libdevmapper1.02.1.symbols
lvm2/trunk/debian/patches/config.patch
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
lvm2/trunk/debian/patches/rules-subdir.patch
lvm2/trunk/debian/patches/series
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/changelog Fri Jun 4 08:16:24 2010 (r823)
@@ -1,3 +1,9 @@
+lvm2 (2.02.66-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org> Fri, 04 Jun 2010 07:59:01 +0000
+
lvm2 (2.02.64-1) unstable; urgency=low
* New upstream version.
Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols Fri Jun 4 08:16:24 2010 (r823)
@@ -50,6 +50,7 @@
dm_list_next at Base 2:1.02.30
dm_list_prev at Base 2:1.02.30
dm_list_size at Base 2:1.02.30
+ dm_list_splice at Base 2:1.02.48
dm_list_start at Base 2:1.02.30
dm_log at Base 2:1.02.20
dm_log_init at Base 2:1.02.20
Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/patches/config.patch Fri Jun 4 08:16:24 2010 (r823)
@@ -1,5 +1,5 @@
---- a/doc/example.conf
-+++ b/doc/example.conf
+--- a/doc/example.conf.in
++++ b/doc/example.conf.in
@@ -312,7 +312,7 @@
# Full pathnames can be given.
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Fri Jun 4 08:16:24 2010 (r823)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -931,11 +931,7 @@
+@@ -934,11 +934,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/patches/install.patch Fri Jun 4 08:16:24 2010 (r823)
@@ -8,14 +8,13 @@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
LCOV = @LCOV@
-@@ -80,18 +81,9 @@
- MAKEFLAGS = @JOBS@
+@@ -88,22 +89,14 @@
endif
--# Handle installation of files
+ # Handle installation of files
-ifeq ("@WRITE_INSTALL@", "yes")
-# leaving defaults
--M_INSTALL_PROGRAM =
+-M_INSTALL_SCRIPT =
-M_INSTALL_DATA = -m 644
-else
-M_INSTALL_PROGRAM = -m 555
@@ -28,14 +27,20 @@
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_WDATA = $(INSTALL_DATA)
+ INSTALL_DIR = $(INSTALL) -m 0755 -d
+ INSTALL_ROOT_DIR = $(INSTALL) -m 0700 -d
+ INSTALL_ROOT_DATA = $(INSTALL) -m 0600
+-INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM)
++INSTALL_SCRIPT = $(INSTALL_PROGRAM)
+
.SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
-@@ -304,7 +296,7 @@
+@@ -313,7 +306,7 @@
install_lib_shared: $(LIB_SHARED)
$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
$(INSTALL) -d $(usrlibdir)
- $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
+ $(LN_S) -f @libdir@/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
- # FIXME: plugins are currently installed with .so suffix only
- install_lib_shared_plugin: $(LIB_SHARED)
+ # FIXME: plugins are installed to subdirs
+ # and for compatibility links in libdir are created
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Fri Jun 4 08:16:24 2010 (r823)
@@ -17,7 +17,7 @@
AC_MSG_RESULT($READLINE)
################################################################################
-@@ -823,18 +822,9 @@
+@@ -825,20 +824,9 @@
################################################################################
dnl -- Check for selinux
if test x$SELINUX = xyes; then
@@ -29,9 +29,11 @@
- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
+- SELINUX_PC="libselinux"
- HAVE_SELINUX=yes ], [
- AC_MSG_WARN(Disabling selinux)
- SELINUX_LIBS=
+- SELINUX_PC=
- HAVE_SELINUX=no ])
+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+ SELINUX_LIBS="$(pkg-config --libs libselinux)"
@@ -39,7 +41,7 @@
fi
################################################################################
-@@ -855,49 +845,6 @@
+@@ -859,49 +847,6 @@
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
################################################################################
@@ -89,7 +91,7 @@
dnl -- Internationalisation stuff
AC_MSG_CHECKING(whether to enable internationalisation)
AC_ARG_ENABLE(nls, [ --enable-nls Enable Native Language Support],
-@@ -955,7 +902,8 @@
+@@ -959,7 +904,8 @@
################################################################################
dnl -- Ensure additional headers required
if test x$READLINE = xyes; then
@@ -99,14 +101,14 @@
fi
if test x$CLVMD != xnone; then
-@@ -1117,6 +1065,7 @@
+@@ -1163,6 +1109,7 @@
AC_SUBST(SALCK_CFLAGS)
AC_SUBST(SALCK_LIBS)
AC_SUBST(SELINUX_LIBS)
+AC_SUBST(SELINUX_LIBS_STATIC)
+ AC_SUBST(SELINUX_PC)
AC_SUBST(SNAPSHOTS)
AC_SUBST(STATICDIR)
- AC_SUBST(STATIC_LINK)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -104,8 +104,6 @@
@@ -145,5 +147,5 @@
+liblvm2cmd.$(LIB_SUFFIX): LIBS += $(DL_LIBS)
liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
-
- liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(LIB_SUFFIX)
+ $(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
+ $(CFLAGS) $(CLDFLAGS) -o $@ $(LVMLIBS) $(LIBS) \
Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/patches/rules-subdir.patch Fri Jun 4 08:16:24 2010 (r823)
@@ -1,9 +1,9 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -155,63 +155,24 @@
+@@ -166,62 +166,23 @@
.PHONY: all pofile distclean clean cleandir cflow device-mapper
.PHONY: install install_cluster install_device-mapper install_lvm2
- .PHONY: install_lib_shared install_lib_shared_plugin
+ .PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin
-.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
-.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
-.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -28,22 +28,13 @@
-install_device-mapper: $(SUBDIRS.install_device-mapper)
-install_lvm2: $(SUBDIRS.install_lvm2)
-cflow: $(SUBDIRS.cflow)
-+install: subdirs-install
-+install_cluster: subdirs-install_cluster
-+install_device-mapper: subdirs-install_device-mapper
-+install_lvm2: subdirs-install_lvm2
-
+-
-$(SUBDIRS): $(SUBDIRS.device-mapper)
- $(MAKE) -C $@
-+subdirs-%:
-+ + at set -e; for subdir in $(SUBDIRS); do \
-+ $(MAKE) -C $$subdir $(patsubst subdirs-%,%,$@); \
-+ done
-
+-
-$(SUBDIRS.device-mapper):
- $(MAKE) -C $(@:.device-mapper=) device-mapper
-+pofile: subdirs-pofile $(POTFILES)
-
+-
-$(SUBDIRS.install): $(SUBDIRS)
- $(MAKE) -C $(@:.install=) install
-
@@ -64,18 +55,26 @@
-
-$(SUBDIRS.cflow):
- $(MAKE) -C $(@:.cflow=) cflow
--
--ifeq ("@INTL@", "yes")
++install: subdirs-install
++install_cluster: subdirs-install_cluster
++install_device-mapper: subdirs-install_device-mapper
++install_lvm2: subdirs-install_lvm2
++
++subdirs-%:
++ + at set -e; for subdir in $(SUBDIRS); do \
++ $(MAKE) -C $$subdir $(patsubst subdirs-%,%,$@); \
++ done
+
+ ifeq ("@INTL@", "yes")
-pofile: $(SUBDIRS.pofile) $(POTFILES)
-
-$(SUBDIRS.pofile):
- $(MAKE) -C $(@:.pofile=) pofile
--endif
-+cflow: subdirs-cflow
++pofile: subdirs-pofile $(POTFILES)
+ endif
ifneq ("$(CFLOW_LIST_TARGET)", "")
- CLEAN_CFLOW += $(CFLOW_LIST_TARGET)
-@@ -328,9 +289,9 @@
+@@ -342,9 +303,9 @@
$(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
$(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series Wed May 19 13:33:42 2010 (r822)
+++ lvm2/trunk/debian/patches/series Fri Jun 4 08:16:24 2010 (r823)
@@ -2,8 +2,6 @@
libs-cleanup.patch
config.patch
force-modprobe.patch
-pkgconfig.patch
libdm-atomic.patch
rules-subdir.patch
implicit-pointer.patch
-scripts-bash.sh
More information about the pkg-lvm-commits
mailing list