r871 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Sun Oct 16 18:08:23 UTC 2011 

Author: waldi
Date: Sun Oct 16 18:08:23 2011
New Revision: 871

Log:
* debian/changelog: Update version to 2.02.88-1.
* debian/libdevmapper1.02.1.symbols: Add new symbols.
* debian/patches: Update patches.

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

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/changelog	Sun Oct 16 18:08:23 2011	(r871)
@@ -1,3 +1,9 @@
+lvm2 (2.02.88-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org>  Sat, 15 Oct 2011 23:00:32 +0200
+
 lvm2 (2.02.86-1) unstable; urgency=low
 
   * New upstream version.

Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols	Sun Oct 16 18:08:23 2011	(r871)
@@ -74,8 +74,11 @@
  dm_pool_end_object at Base 2:1.02.20
  dm_pool_free at Base 2:1.02.20
  dm_pool_grow_object at Base 2:1.02.20
+ dm_pool_lock at Base 2:1.02.67
+ dm_pool_locked at Base 2:1.02.67
  dm_pool_strdup at Base 2:1.02.20
  dm_pool_strndup at Base 2:1.02.20
+ dm_pool_unlock at Base 2:1.02.67
  dm_pool_zalloc at Base 2:1.02.20
  dm_prepare_selinux_context at Base 2:1.02.63
  dm_realloc_aux at Base 2:1.02.20
@@ -155,6 +158,8 @@
  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_null_area at Base 2:1.02.67
+ dm_tree_node_add_raid_target at Base 2:1.02.67
  dm_tree_node_add_replicator_dev_target at Base 2:1.02.63
  dm_tree_node_add_replicator_target at Base 2:1.02.63
  dm_tree_node_add_snapshot_merge_target at Base 2:1.02.44

Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/patches/config.patch	Sun Oct 16 18:08:23 2011	(r871)
@@ -1,6 +1,6 @@
 --- a/doc/example.conf.in
 +++ b/doc/example.conf.in
-@@ -345,7 +345,7 @@
+@@ -393,7 +393,7 @@
      # Full pathnames can be given.
  
      # Search this directory first for shared libraries.

Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/patches/force-modprobe.patch	Sun Oct 16 18:08:23 2011	(r871)
@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -1096,11 +1096,7 @@
+@@ -1086,11 +1086,7 @@
  fi
  
  ################################################################################

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/patches/install.patch	Sun Oct 16 18:08:23 2011	(r871)
@@ -8,8 +8,8 @@
  MKDIR_P = @MKDIR_P@
  MSGFMT = @MSGFMT@
  LCOV = @LCOV@
-@@ -67,8 +68,7 @@
- initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d
+@@ -68,8 +69,7 @@
+ systemd_dir = $(DESTDIR)/lib/systemd/system
  ocf_scriptdir = $(DESTDIR)@OCFDIR@
  
 -USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
@@ -18,7 +18,7 @@
  
  DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@
  DEFAULT_ARCHIVE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_ARCHIVE_SUBDIR@
-@@ -92,22 +92,14 @@
+@@ -93,22 +93,14 @@
  endif
  
  # Handle installation of files

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Sun Oct 16 18:08:23 2011	(r871)
@@ -8,7 +8,7 @@
  		LIB_SUFFIX=so
  		DEVMAPPER=yes
  		ODIRECT=yes
-@@ -362,7 +361,7 @@
+@@ -382,7 +381,7 @@
  AC_MSG_CHECKING(whether to enable readline)
  AC_ARG_ENABLE([readline],
  	      AC_HELP_STRING([--disable-readline], [disable readline support]),
@@ -17,7 +17,7 @@
  AC_MSG_RESULT($READLINE)
  
  ################################################################################
-@@ -982,21 +981,9 @@
+@@ -972,21 +971,9 @@
  ################################################################################
  dnl -- Check for selinux
  if test x$SELINUX = xyes; then
@@ -42,7 +42,7 @@
  fi
  
  ################################################################################
-@@ -1017,49 +1004,6 @@
+@@ -1007,49 +994,6 @@
  AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
  
  ################################################################################
@@ -92,7 +92,7 @@
  dnl -- Internationalisation stuff
  AC_MSG_CHECKING(whether to enable internationalisation)
  AC_ARG_ENABLE(nls,
-@@ -1119,7 +1063,8 @@
+@@ -1109,7 +1053,8 @@
  ################################################################################
  dnl -- Ensure additional headers required
  if test x$READLINE = xyes; then
@@ -102,7 +102,7 @@
  fi
  
  if test x$CLVMD != xnone; then
-@@ -1359,6 +1304,7 @@
+@@ -1346,6 +1291,7 @@
  AC_SUBST(SALCK_CFLAGS)
  AC_SUBST(SALCK_LIBS)
  AC_SUBST(SELINUX_LIBS)

Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch	Sat Aug 27 17:20:52 2011	(r870)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Sun Oct 16 18:08:23 2011	(r871)
@@ -1,6 +1,6 @@
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
-@@ -172,67 +172,23 @@
+@@ -176,67 +176,23 @@
  .PHONY: install install_cluster install_device-mapper install_lvm2
  .PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin
  .PHONY: install_ocf
@@ -79,9 +79,9 @@
  endif
  
  ifneq ("$(CFLOW_LIST_TARGET)", "")
-@@ -353,9 +309,9 @@
- 	  $(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
- 	  $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
+@@ -358,9 +314,9 @@
+ 	  $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda) \
+ 	  .exported_symbols_generated core
  
 -clean: $(SUBDIRS.clean) cleandir
 +clean: subdirs-clean cleandir
@@ -89,7 +89,7 @@
 -distclean: cleandir $(SUBDIRS.distclean)
 +distclean: cleandir subdirs-distclean
  	test -z "$(DISTCLEAN_DIRS)" || $(RM) -r $(DISTCLEAN_DIRS)
- 	$(RM) $(DISTCLEAN_TARGETS) Makefile core
+ 	$(RM) $(DISTCLEAN_TARGETS) Makefile 
  
 --- a/Makefile.in
 +++ b/Makefile.in
@@ -102,7 +102,7 @@
  
  ifeq ("@APPLIB@", "yes")
    SUBDIRS += liblvm
-@@ -42,34 +42,6 @@
+@@ -44,34 +44,6 @@
  
  include make.tmpl

More information about the pkg-lvm-commits mailing list