r587 - in devmapper/trunk/debian: . patches

Sun Jul 6 12:54:32 UTC 2008

Author: waldi
Date: Sun Jul  6 12:54:31 2008
New Revision: 587

Log:
* debian/changelog: Update to (2:1.02.27-1).
* debian/patches/dmsetup-export.patch, debian/patches/libs-cleanup.patch:
  Update.


Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/patches/dmsetup-export.patch
   devmapper/trunk/debian/patches/libs-cleanup.patch

Modified: devmapper/trunk/debian/changelog
==============================================================================

--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Sun Jul  6 12:54:31 2008
@@ -1,3 +1,9 @@
+devmapper (2:1.02.27-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 06 Jul 2008 11:31:35 +0200
+
 devmapper (2:1.02.26-1) unstable; urgency=low
 
   * New upstream version.

Modified: devmapper/trunk/debian/patches/dmsetup-export.patch
==============================================================================
--- devmapper/trunk/debian/patches/dmsetup-export.patch	(original)
+++ devmapper/trunk/debian/patches/dmsetup-export.patch	Sun Jul  6 12:54:31 2008
@@ -1,6 +1,6 @@
 --- a/dmsetup/dmsetup.c
 +++ b/dmsetup/dmsetup.c
-@@ -1073,6 +1073,64 @@
+@@ -1076,6 +1076,64 @@
  	return r;
  }
  
@@ -65,7 +65,7 @@
  /* Show target names and their version numbers */
  static int _targets(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
  {
-@@ -2035,6 +2086,7 @@
+@@ -2122,6 +2180,7 @@
  	{"targets", "", 0, 0, _targets},
  	{"version", "", 0, 0, _version},
  	{"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry},

Modified: devmapper/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- devmapper/trunk/debian/patches/libs-cleanup.patch	(original)
+++ devmapper/trunk/debian/patches/libs-cleanup.patch	Sun Jul  6 12:54:31 2008
@@ -26,10 +26,10 @@
  
 --- trunk.orig/configure.in
 +++ trunk/configure.in
-@@ -229,29 +229,18 @@
- 
+@@ -264,29 +264,18 @@
  	if test x$HAVE_SEPOL = xyes; then
- 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
+ 		AC_DEFINE([HAVE_SEPOL], 1,
+ 		  [Define to 1 if sepol_check_context is available.])
 -		LIBS="-lsepol $LIBS"
 +		LDFLAGS_SEPOL="-lsepol"
  	fi
@@ -37,7 +37,7 @@
  	AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
  
  	if test x$HAVE_SELINUX = xyes; then
- 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 if selinux is available.])
+ 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
 -		LIBS="-lselinux $LIBS"
 +		LDFLAGS_SELINUX="-lselinux"
 +		LDFLAGS_SELINUX_STATIC="$LDFLAGS_SELINUX $LDFLAGS_SEPOL -lpthread"
@@ -45,38 +45,38 @@
  		AC_MSG_WARN(Disabling selinux)
  	fi
 -
--	# With --enable-static_link and selinux enabled, linking dmsetup
+-	# With --enable-static_link and selinux enabled, linking
 -	# fails on at least Debian unstable due to unsatisfied references
 -	# to pthread_mutex_lock and _unlock.  See if we need -lpthread.
 -	if test "$STATIC_LINK-$HAVE_SELINUX" = yes-yes; then
--		dm_saved_libs=$LIBS
+-		lvm_saved_libs=$LIBS
 -		LIBS="$LIBS -static"
 -		AC_SEARCH_LIBS([pthread_mutex_lock], [pthread],
 -		  [test "$ac_cv_search_pthread_mutex_lock" = "none required" ||
 -				LIB_PTHREAD=-lpthread])
--		LIBS=$dm_saved_libs
+-		LIBS=$lvm_saved_libs
 -	fi
  fi
  
  ################################################################################
-@@ -402,7 +390,8 @@
- AC_SUBST(STATIC_LINK)
- AC_SUBST(OWNER)
- AC_SUBST(GROUP)
+@@ -473,7 +462,8 @@
+ AC_SUBST(INTL_PACKAGE)
+ AC_SUBST(JOBS)
+ AC_SUBST(LDDEPS)
 -AC_SUBST(LIBS)
 +AC_SUBST(LDFLAGS_SELINUX)
 +AC_SUBST(LDFLAGS_SELINUX_STATIC)
+ AC_SUBST(LIB_SUFFIX)
+ AC_SUBST(LOCALEDIR)
+ AC_SUBST(LVM1)
+@@ -488,7 +478,6 @@
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
+ AC_SUBST(STATIC_LINK)
+-AC_SUBST([LIB_PTHREAD])
  AC_SUBST(interface)
  AC_SUBST(kerneldir)
  AC_SUBST(missingkernel)
-@@ -426,7 +416,6 @@
- AC_SUBST(DEVICE_MODE)
- AC_SUBST(DMEVENTD)
- AC_SUBST(PKGCONFIG)
--AC_SUBST([LIB_PTHREAD])
- 
- ################################################################################
- dnl -- First and last lines should not contain files to generate in order to 
 --- trunk.orig/dmeventd/Makefile.in
 +++ trunk/dmeventd/Makefile.in
 @@ -35,7 +35,7 @@
@@ -96,8 +96,8 @@
  
 +LDFLAGS += @LDFLAGS_SELINUX@
 +
- DEFS += -DDEVICE_UID=@DEVICE_UID@ -DDEVICE_GID=@DEVICE_GID@ \
- 	-DDEVICE_MODE=@DEVICE_MODE@
+ DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
+ 	-DDM_DEVICE_MODE=@DM_DEVICE_MODE@
  
 --- trunk.orig/make.tmpl.in
 +++ trunk/make.tmpl.in
@@ -115,7 +115,7 @@
  LDFLAGS += -L$(interfacedir)
 -CLDFLAGS += -L$(interfacedir)
  
- ifeq ("@COMPAT@", "yes")
+ ifeq ("@DM_COMPAT@", "yes")
    DEFS += -DDM_COMPAT
 @@ -89,7 +87,6 @@
  #DEFS += -DBOUNDS_CHECK

