r805 - in lvm2/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Wed May 19 10:27:21 2010
New Revision: 805

Log:
* debian/libdevmapper-dev.install: Install development lib symlink.
* debian/patches/install.patch: Fix installation.
* debian/rules: Don't longer create symlink.

Modified:
   lvm2/trunk/debian/libdevmapper-dev.install
   lvm2/trunk/debian/patches/install.patch
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/libdevmapper-dev.install
==============================================================================
--- lvm2/trunk/debian/libdevmapper-dev.install	Wed May 19 09:57:54 2010	(r804)
+++ lvm2/trunk/debian/libdevmapper-dev.install	Wed May 19 10:27:21 2010	(r805)
@@ -1,2 +1,3 @@
 usr/include/libdevmapper.h
-usr/lib/pkgconfig
+usr/lib/libdevmapper.so
+usr/lib/pkgconfig/devmapper.pc

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Wed May 19 09:57:54 2010	(r804)
+++ lvm2/trunk/debian/patches/install.patch	Wed May 19 10:27:21 2010	(r805)
@@ -30,3 +30,12 @@
  
  .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
  
+@@ -304,7 +296,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)

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Wed May 19 09:57:54 2010	(r804)
+++ lvm2/trunk/debian/rules	Wed May 19 10:27:21 2010	(r805)
@@ -187,7 +187,6 @@
 install_libdevmapper-dev: DIR = $(BUILD_DIR)/install_deb
 install_libdevmapper-dev: $(STAMPS_DIR)/install_deb
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	dh_link lib/libdevmapper.so.$(DEVMAPPER_ABINAME) usr/lib/libdevmapper.so
 	+$(MAKE_SELF) install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb