r893 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Tue May 1 18:16:53 UTC 2012


Author: waldi
Date: Tue May  1 18:16:52 2012
New Revision: 893

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

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/libdevmapper1.02.1.symbols
   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	Sun Jan 15 20:46:30 2012	(r892)
+++ lvm2/trunk/debian/changelog	Tue May  1 18:16:52 2012	(r893)
@@ -1,5 +1,6 @@
-lvm2 (2.02.88-3) UNRELEASED; urgency=low
+lvm2 (2.02.95-1) UNRELEASED; urgency=low
 
+  * New upstream version.
   * Fix dependencies in clvm init script. (closes: #655970)
   * Demote cluster manager dependency to recommends.
 

Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols	Sun Jan 15 20:46:30 2012	(r892)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols	Tue May  1 18:16:52 2012	(r893)
@@ -10,18 +10,65 @@
  dm_bitset_destroy at Base 2:1.02.20
  dm_bitset_equal at Base 2:1.02.47
  dm_bounds_check_debug at Base 2:1.02.20
+ dm_build_dm_name at Base 2:1.02.74
+ dm_build_dm_uuid at Base 2:1.02.74
+ dm_config_clone_node at Base 2:1.02.74
+ dm_config_clone_node_with_mem at Base 2:1.02.74
+ dm_config_create at Base 2:1.02.74
+ dm_config_create_node at Base 2:1.02.74
+ dm_config_create_value at Base 2:1.02.74
+ dm_config_destroy at Base 2:1.02.74
+ dm_config_find_bool at Base 2:1.02.74
+ dm_config_find_float at Base 2:1.02.74
+ dm_config_find_int64 at Base 2:1.02.74
+ dm_config_find_int at Base 2:1.02.74
+ dm_config_find_node at Base 2:1.02.74
+ dm_config_find_str at Base 2:1.02.74
+ dm_config_find_str_allow_empty at Base 2:1.02.74
+ dm_config_from_string at Base 2:1.02.74
+ dm_config_get_custom at Base 2:1.02.74
+ dm_config_get_list at Base 2:1.02.74
+ dm_config_get_section at Base 2:1.02.74
+ dm_config_get_str at Base 2:1.02.74
+ dm_config_get_uint32 at Base 2:1.02.74
+ dm_config_get_uint64 at Base 2:1.02.74
+ dm_config_has_node at Base 2:1.02.74
+ dm_config_insert_cascaded_tree at Base 2:1.02.74
+ dm_config_maybe_section at Base 2:1.02.74
+ dm_config_memory at Base 2:1.02.74
+ dm_config_parent_name at Base 2:1.02.74
+ dm_config_parse at Base 2:1.02.74
+ dm_config_remove_cascaded_tree at Base 2:1.02.74
+ dm_config_set_custom at Base 2:1.02.74
+ dm_config_tree_find_bool at Base 2:1.02.74
+ dm_config_tree_find_float at Base 2:1.02.74
+ dm_config_tree_find_int64 at Base 2:1.02.74
+ dm_config_tree_find_int at Base 2:1.02.74
+ dm_config_tree_find_node at Base 2:1.02.74
+ dm_config_tree_find_str at Base 2:1.02.74
+ dm_config_tree_find_str_allow_empty at Base 2:1.02.74
+ dm_config_write_node at Base 2:1.02.74
  dm_cookie_supported at Base 2:1.02.36
+ dm_count_chars at Base 2:1.02.74
  dm_create_dir at Base 2:1.02.24
  dm_create_lockfile at Base 2:1.02.63
  dm_daemon_is_running at Base 2:1.02.63
+ dm_device_get_name at Base 2:1.02.74
+ dm_device_has_holders at Base 2:1.02.74
+ dm_device_has_mounted_fs at Base 2:1.02.74
  dm_dir at Base 2:1.02.20
  dm_driver_version at Base 2:1.02.20
  dm_dump_memory_debug at Base 2:1.02.20
+ dm_escape_double_quotes at Base 2:1.02.74
+ dm_escaped_len at Base 2:1.02.74
  dm_fclose at Base 2:1.02.24
  dm_format_dev at Base 2:1.02.20
  dm_free_aux at Base 2:1.02.20
  dm_get_library_version at Base 2:1.02.20
+ dm_get_name_mangling_mode at Base 2:1.02.74
  dm_get_next_target at Base 2:1.02.20
+ dm_get_status_thin at Base 2:1.02.74
+ dm_get_status_thin_pool at Base 2:1.02.74
  dm_get_suspended_counter at Base 2:1.02.65
  dm_hash_create at Base 2:1.02.20
  dm_hash_destroy at Base 2:1.02.20
@@ -39,7 +86,9 @@
  dm_hash_remove_binary at Base 2:1.02.20
  dm_hash_wipe at Base 2:1.02.20
  dm_is_dm_major at Base 2:1.02.20
+ dm_is_empty_dir at Base 2:1.02.74
  dm_lib_exit at Base 2:1.02.20
+ dm_lib_init at Base 2:1.02.74
  dm_lib_release at Base 2:1.02.20
  dm_list_add at Base 2:1.02.30
  dm_list_add_h at Base 2:1.02.30
@@ -97,11 +146,16 @@
  dm_report_output at Base 2:1.02.27
  dm_report_set_output_field_name_prefix at Base 2:1.02.27
  dm_set_dev_dir at Base 2:1.02.20
+ dm_set_name_mangling_mode at Base 2:1.02.74
  dm_set_selinux_context at Base 2:1.02.20
+ dm_set_sysfs_dir at Base 2:1.02.74
+ dm_set_uuid_prefix at Base 2:1.02.74
  dm_snprintf at Base 2:1.02.20
  dm_split_lvm_name at Base 2:1.02.20
  dm_split_words at Base 2:1.02.20
  dm_strdup_aux at Base 2:1.02.20
+ dm_strncpy at Base 2:1.02.74
+ dm_sysfs_dir at Base 2:1.02.74
  dm_task_add_target at Base 2:1.02.20
  dm_task_create at Base 2:1.02.20
  dm_task_destroy at Base 2:1.02.20
@@ -110,6 +164,8 @@
  dm_task_get_driver_version at Base 2:1.02.20
  dm_task_get_info at Base 2:1.02.20
  dm_task_get_name at Base 2:1.02.20
+ dm_task_get_name_mangled at Base 2:1.02.74
+ dm_task_get_name_unmangled at Base 2:1.02.74
  dm_task_get_names at Base 2:1.02.20
  dm_task_get_read_ahead at Base 2:1.02.24
  dm_task_get_uuid at Base 2:1.02.20
@@ -117,6 +173,7 @@
  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_retry_remove at Base 2:1.02.74
  dm_task_run at Base 2:1.02.20
  dm_task_secure_data at Base 2:1.02.63
  dm_task_set_add_node at Base 2:1.02.63
@@ -167,16 +224,22 @@
  dm_tree_node_add_snapshot_target at Base 2:1.02.20
  dm_tree_node_add_striped_target at Base 2:1.02.20
  dm_tree_node_add_target_area at Base 2:1.02.20
+ dm_tree_node_add_thin_pool_message at Base 2:1.02.74
+ dm_tree_node_add_thin_pool_target at Base 2:1.02.74
+ dm_tree_node_add_thin_target at Base 2:1.02.74
  dm_tree_node_add_zero_target at Base 2:1.02.20
  dm_tree_node_get_context at Base 2:1.02.20
  dm_tree_node_get_info at Base 2:1.02.20
  dm_tree_node_get_name at Base 2:1.02.20
  dm_tree_node_get_uuid at Base 2:1.02.20
  dm_tree_node_num_children at Base 2:1.02.20
+ dm_tree_node_set_callback at Base 2:1.02.74
  dm_tree_node_set_presuspend_node at Base 2:1.02.63
  dm_tree_node_set_read_ahead at Base 2:1.02.24
+ dm_tree_node_set_udev_flags at Base 2:1.02.74
  dm_tree_node_size_changed at Base 2:1.02.36
  dm_tree_preload_children at Base 2:1.02.20
+ dm_tree_retry_remove at Base 2:1.02.74
  dm_tree_set_cookie at Base 2:1.02.36
  dm_tree_skip_lockfs at Base 2:1.02.20
  dm_tree_suspend_children at Base 2:1.02.20
@@ -188,5 +251,8 @@
  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
+ dm_unescape_colons_and_at_signs at Base 2:1.02.74
+ dm_unescape_double_quotes at Base 2:1.02.74
+ dm_uuid_prefix at Base 2:1.02.74
  dm_zalloc_aux at Base 2:1.02.63
  dm_zalloc_aux_debug at Base 2:1.02.63

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Sun Jan 15 20:46:30 2012	(r892)
+++ lvm2/trunk/debian/patches/install.patch	Tue May  1 18:16:52 2012	(r893)
@@ -8,8 +8,8 @@
  MKDIR_P = @MKDIR_P@
  MSGFMT = @MSGFMT@
  LCOV = @LCOV@
-@@ -68,8 +69,7 @@
- systemd_dir = $(DESTDIR)/lib/systemd/system
+@@ -71,8 +72,7 @@
+ tmpfiles_dir = $(DESTDIR)@tmpfilesdir@
  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@
-@@ -93,22 +93,14 @@
+@@ -96,22 +96,14 @@
  endif
  
  # Handle installation of files
@@ -37,9 +37,9 @@
 +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_DIR = $(INSTALL) -m 755 -d
+ INSTALL_ROOT_DIR = $(INSTALL) -m 700 -d
+ INSTALL_ROOT_DATA = $(INSTALL) -m 600
 -INSTALL_SCRIPT = $(INSTALL) -p $(M_INSTALL_PROGRAM)
 +INSTALL_SCRIPT = $(INSTALL_PROGRAM)
  

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Sun Jan 15 20:46:30 2012	(r892)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Tue May  1 18:16:52 2012	(r893)
@@ -1,14 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -34,7 +34,6 @@
- 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
- 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
- 		LDDEPS="$LDDEPS .export.sym"
--		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- 		LIB_SUFFIX=so
- 		DEVMAPPER=yes
- 		ODIRECT=yes
-@@ -382,7 +381,7 @@
+@@ -416,7 +416,7 @@
  AC_MSG_CHECKING(whether to enable readline)
  AC_ARG_ENABLE([readline],
  	      AC_HELP_STRING([--disable-readline], [disable readline support]),
@@ -17,7 +9,7 @@
  AC_MSG_RESULT($READLINE)
  
  ################################################################################
-@@ -972,21 +971,9 @@
+@@ -1067,21 +1067,9 @@
  ################################################################################
  dnl -- Check for selinux
  if test x$SELINUX = xyes; then
@@ -42,7 +34,7 @@
  fi
  
  ################################################################################
-@@ -1007,49 +994,6 @@
+@@ -1102,49 +1090,6 @@
  AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
  
  ################################################################################
@@ -92,7 +84,7 @@
  dnl -- Internationalisation stuff
  AC_MSG_CHECKING(whether to enable internationalisation)
  AC_ARG_ENABLE(nls,
-@@ -1109,7 +1053,8 @@
+@@ -1225,7 +1170,8 @@
  ################################################################################
  dnl -- Ensure additional headers required
  if test x$READLINE = xyes; then
@@ -102,7 +94,7 @@
  fi
  
  if test x$CLVMD != xnone; then
-@@ -1346,6 +1291,7 @@
+@@ -1469,6 +1415,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	Sun Jan 15 20:46:30 2012	(r892)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Tue May  1 18:16:52 2012	(r893)
@@ -1,6 +1,6 @@
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
-@@ -176,67 +176,23 @@
+@@ -189,67 +189,23 @@
  .PHONY: install install_cluster install_device-mapper install_lvm2
  .PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin
  .PHONY: install_ocf
@@ -79,7 +79,7 @@
  endif
  
  ifneq ("$(CFLOW_LIST_TARGET)", "")
-@@ -358,9 +314,9 @@
+@@ -371,9 +327,9 @@
  	  $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda) \
  	  .exported_symbols_generated core
  
@@ -102,15 +102,15 @@
  
  ifeq ("@APPLIB@", "yes")
    SUBDIRS += liblvm
-@@ -44,34 +44,6 @@
+@@ -48,34 +48,6 @@
  
  include make.tmpl
  
 -libdm: include
--lib: libdm
+-lib: libdm libdaemon
 -liblvm: lib
--daemons: lib tools
--tools: lib device-mapper
+-daemons: lib libdaemon tools
+-tools: lib libdaemon device-mapper
 -po: tools daemons
 -
 -lib.device-mapper: include.device-mapper
@@ -148,33 +148,5 @@
 -man: $(MAN5) $(MAN8) $(MAN8CLUSTER)
 +man: $(MAN5) $(MAN8) $(MAN8CLUSTER) $(MAN8DM)
  
- $(MAN5) $(MAN8) $(MAN8CLUSTER):	Makefile
+ $(MAN5) $(MAN8) $(MAN8DM) $(MAN8CLUSTER):	Makefile
  
---- a/daemons/Makefile.in
-+++ b/daemons/Makefile.in
-@@ -17,10 +17,6 @@
- 
- .PHONY: dmeventd clvmd cmirrord
- 
--ifneq ("@CLVMD@", "none")
--  SUBDIRS = clvmd
--endif
--
- ifeq ("@BUILD_CMIRRORD@", "yes")
-   SUBDIRS += cmirrord
- endif
-@@ -36,8 +32,13 @@
-   SUBDIRS = clvmd cmirrord dmeventd
- endif
- 
-+ifneq ("@CLVMD@", "none")
-+  SUBDIRS += clvmd
-+endif
-+
- include $(top_builddir)/make.tmpl
- 
- ifeq ("@BUILD_DMEVENTD@", "yes")
--device-mapper: dmeventd.device-mapper
-+device-mapper:
-+	$(MAKE) -C dmeventd device-mapper
- endif



More information about the pkg-lvm-commits mailing list