r550 - in lvm2/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Fri Feb 15 16:19:54 2008
New Revision: 550

Log:
* debian/changelog: Update version to 2.02.33-1.
* debian/patches/drop-realtime.patch, debian/patches/force-modprobe.patch,
  debian/patches/install.patch, debian/patches/libs-cleanup.patch: Update.


Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/patches/drop-realtime.patch
   lvm2/trunk/debian/patches/force-modprobe.patch
   lvm2/trunk/debian/patches/install.patch
   lvm2/trunk/debian/patches/libs-cleanup.patch

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	(original)
+++ lvm2/trunk/debian/changelog	Fri Feb 15 16:19:54 2008
@@ -1,3 +1,9 @@
+lvm2 (2.02.33-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 15 Feb 2008 16:00:39 +0000
+
 lvm2 (2.02.31-1) unstable; urgency=low
 
   * New upstream version.

Modified: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- lvm2/trunk/debian/patches/drop-realtime.patch	(original)
+++ lvm2/trunk/debian/patches/drop-realtime.patch	Fri Feb 15 16:19:54 2008
@@ -229,7 +229,7 @@
  dnl -- Check for getopt
  AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 to if getopt_long is available.]))
  
-@@ -557,7 +535,6 @@
+@@ -552,7 +530,6 @@
  AC_SUBST(DEBUG)
  AC_SUBST(DEVMAPPER)
  AC_SUBST(HAVE_LIBDL)

Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch	(original)
+++ lvm2/trunk/debian/patches/force-modprobe.patch	Fri Feb 15 16:19:54 2008
@@ -1,6 +1,6 @@
 --- trunk.orig/configure.in
 +++ trunk/configure.in
-@@ -500,11 +500,7 @@
+@@ -495,11 +495,7 @@
  AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
  
  ################################################################################

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	(original)
+++ lvm2/trunk/debian/patches/install.patch	Fri Feb 15 16:19:54 2008
@@ -1,6 +1,6 @@
 --- trunk.orig/tools/Makefile.in
 +++ trunk/tools/Makefile.in
-@@ -145,22 +145,16 @@
+@@ -141,22 +141,16 @@
  endif
  
  install_cmdlib_dynamic: liblvm2cmd.so
@@ -28,7 +28,7 @@
  	@echo Creating symbolic links for individual commands in $(sbindir)
  	@( \
  		for v in `cat .commands`; do \
-@@ -170,7 +164,6 @@
+@@ -166,7 +160,6 @@
  	)
  
  install_tools_static: lvm.static
@@ -120,7 +120,7 @@
  
 --- trunk.orig/man/Makefile.in
 +++ trunk/man/Makefile.in
-@@ -40,14 +40,14 @@
+@@ -46,14 +46,14 @@
  	@for f in $(MAN8); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \
@@ -137,7 +137,7 @@
  	done
  
  install_cluster:
-@@ -55,5 +55,5 @@
+@@ -61,5 +61,5 @@
  	@for f in $(MAN8CLUSTER); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	(original)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Fri Feb 15 16:19:54 2008
@@ -92,7 +92,7 @@
  dnl -- Check for realtime clock support
  if test x$REALTIME = xyes; then
  	AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no)
-@@ -578,10 +521,6 @@
+@@ -573,10 +516,6 @@
  
  AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
  
@@ -103,7 +103,7 @@
  ################################################################################
  AC_PATH_PROG(MODPROBE_CMD, modprobe)
  
-@@ -613,13 +552,11 @@
+@@ -608,13 +547,11 @@
  AC_SUBST(LDDEPS)
  AC_SUBST(LDFLAGS)
  AC_SUBST(LIB_SUFFIX)
@@ -117,7 +117,7 @@
  AC_SUBST(HAVE_REALTIME)
  AC_SUBST(CMDLIB)
  AC_SUBST(MSGFMT)
-@@ -635,7 +572,6 @@
+@@ -630,7 +567,6 @@
  AC_SUBST(DMEVENTD)
  AC_SUBST(CFLOW_CMD)
  AC_SUBST(CSCOPE_CMD)
@@ -127,15 +127,13 @@
  dnl -- First and last lines should not contain files to generate in order to
 --- trunk.orig/lib/activate/fs.c
 +++ trunk/lib/activate/fs.c
-@@ -174,12 +174,10 @@
+@@ -174,10 +174,8 @@
  		return 0;
  	}
  
 -#ifdef HAVE_SELINUX
-         if (!dm_set_selinux_context(lv_path, S_IFLNK)) {
-                 stack;
-                 return 0;
-         }
+ 	if (!dm_set_selinux_context(lv_path, S_IFLNK))
+ 		return_0;
 -#endif
  
  	return 1;