r507 - in devmapper/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Wed Jan  2 12:54:52 2008
New Revision: 507

Log:
* debian/patches/series: Update.
* debian/patches/install.patch: Add.
* debian/rules: Remove explicit static linking.


Added:
   devmapper/trunk/debian/patches/install.patch
Modified:
   devmapper/trunk/debian/patches/series
   devmapper/trunk/debian/rules

Added: devmapper/trunk/debian/patches/install.patch
==============================================================================
--- (empty file)
+++ devmapper/trunk/debian/patches/install.patch	Wed Jan  2 12:54:52 2008
@@ -0,0 +1,93 @@
+--- trunk.orig/lib/Makefile.in
++++ trunk/lib/Makefile.in
+@@ -54,11 +54,7 @@
+ 	install_ioctl install_ioctl_static \
+ 	install_pkgconfig
+ 
+-INSTALL_TYPE = install_dynamic
+-
+-ifeq ("@STATIC_LINK@", "yes")
+-  INSTALL_TYPE += install_static
+-endif
++INSTALL_TYPE = install_dynamic install_static
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+   INSTALL_TYPE += install_pkgconfig
+@@ -67,27 +63,22 @@
+ install: $(INSTALL_TYPE) install_include
+ 
+ install_include:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
+-		$(includedir)/libdevmapper.h
++	$(INSTALL) -D -m 644 libdevmapper.h $(includedir)/libdevmapper.h
+ 
+ install_dynamic: install_ at interface@
+ 	$(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION) \
+ 		$(libdir)/libdevmapper.$(LIB_SUFFIX)
+ 
+ install_static: install_ at interface@_static
+-	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
+ 
+ install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
++	$(INSTALL) -D $< $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
+-		$(usrlibdir)/pkgconfig/devmapper.pc
++	$(INSTALL) -D -m 644 libdevmapper.pc $(usrlibdir)/pkgconfig/devmapper.pc
+ 
+ install_ioctl_static: ioctl/libdevmapper.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/libdevmapper.a.$(LIB_VERSION)
++	$(INSTALL) -D -m 644 $< $(libdir)/libdevmapper.a
+ 
+ $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION): $(interface)/%.$(LIB_SUFFIX)
+ 	rm -f $@
+--- trunk.orig/dmeventd/Makefile.in
++++ trunk/dmeventd/Makefile.in
+@@ -53,25 +53,21 @@
+ install: $(INSTALL_TYPE) install_include install_dmeventd
+ 
+ install_include:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \
+-		$(includedir)/libdevmapper-event.h
++	$(INSTALL) -D -m 644 libdevmapper-event.h $(includedir)/libdevmapper-event.h
+ 
+ install_dynamic: libdevmapper-event.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
++	$(INSTALL) -D $< $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
+ 	$(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
+ 		$(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+ 
+ install_dmeventd: dmeventd
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
+-		$(usrlibdir)/pkgconfig/devmapper-event.pc
++	$(INSTALL) -D -m 644 libdevmapper-event.pc $(usrlibdir)/pkgconfig/devmapper-event.pc
+ 
+ install_static: libdevmapper-event.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/libdevmapper-event.a.$(LIB_VERSION)
++	$(INSTALL) -D $< $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
+ 	$(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
+ 
+ .PHONY: distclean_lib distclean
+--- trunk.orig/dmsetup/Makefile.in
++++ trunk/dmsetup/Makefile.in
+@@ -43,8 +43,8 @@
+ .PHONY: install_dynamic install_static
+ 
+ install_dynamic: dmsetup
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_static: dmsetup.static
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 

Modified: devmapper/trunk/debian/patches/series
==============================================================================
--- devmapper/trunk/debian/patches/series	(original)
+++ devmapper/trunk/debian/patches/series	Wed Jan  2 12:54:52 2008
@@ -1,3 +1,4 @@
 type-kernel_dev_t.patch
 libs-cleanup.patch
+install.patch
 pkgconfig.patch

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Wed Jan  2 12:54:52 2008
@@ -41,7 +41,6 @@
 		--libdir=/lib --sbindir=/sbin \
 		--enable-compat \
 		--enable-pkgconfig \
-		--enable-static_link \
 		--with-device-uid=0 \
 		--with-device-gid=6 \
 		--with-device-mode=0660