[kernel] r8838 - in people/waldi/redhat-cluster/openais/debian: . patches

[Bastian Blank]

Author: waldi
Date: Thu May 31 08:12:15 2007
New Revision: 8838

Log:
debian: Update.


Modified:
   people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch
   people/waldi/redhat-cluster/openais/debian/rules

Modified: people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch
==============================================================================
--- people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch	(original)
+++ people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch	Thu May 31 08:12:15 2007
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad openais-0.79~/Makefile openais-0.79/Makefile
---- openais-0.79~/Makefile	2006-07-18 09:33:13.000000000 +0200
-+++ openais-0.79/Makefile	2006-07-18 09:35:19.000000000 +0200
+diff -urNad openais~/Makefile openais/Makefile
+--- openais~/Makefile	2006-08-16 02:08:52.000000000 +0200
++++ openais/Makefile	2007-05-31 10:05:58.012462012 +0200
 @@ -37,23 +37,9 @@
  INCLUDEDIR_SERVICE=/usr/include/openais/service
  MANDIR=/usr/share/man
@@ -33,19 +33,74 @@
  
  all:
  	(cd lcr; echo ==== `pwd` ===; $(MAKE) all);
-@@ -150,7 +136,7 @@
- 	install -m 755 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
+@@ -130,37 +116,37 @@
+ 	cp -a lib/libcfg.so.2 $(DESTDIR)$(LIBDIR)
+ 	cp -a exec/libtotem_pg.so.2 $(DESTDIR)$(LIBDIR)
+ 
+-	install -m 755 lib/libais.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaAmf.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaClm.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaCkpt.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaEvt.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaLck.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaMsg.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libevs.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libcpg.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libcfg.so.2.* $(DESTDIR)$(LIBDIR)
+-	install -m 755 exec/libtotem_pg.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libais.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaAmf.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaClm.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaCkpt.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaEvt.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaLck.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaMsg.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libevs.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libcpg.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libcfg.so.2.* $(DESTDIR)$(LIBDIR)
++	install -m 644 exec/libtotem_pg.so.2.* $(DESTDIR)$(LIBDIR)
+ 
+ ifneq "NO" "$(STATICLIBS)"
+-	install -m 755 lib/libais.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaAmf.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaClm.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaCkpt.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaEvt.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaLck.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libSaMsg.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libevs.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libcpg.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libevs.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libcpg.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 lib/libcfg.a $(DESTDIR)$(LIBDIR)
+-	install -m 755 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libais.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaAmf.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaClm.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaCkpt.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaEvt.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaLck.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libSaMsg.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libevs.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libcpg.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libevs.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libcpg.a $(DESTDIR)$(LIBDIR)
++	install -m 644 lib/libcfg.a $(DESTDIR)$(LIBDIR)
++	install -m 644 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
  endif
  
 -	echo $(LIBDIR) > $(DESTDIR)/etc/ld.so.conf.d/openais-$(ARCH).conf
 +	echo $(LIBDIR) > $(DESTDIR)/etc/ld.so.conf.d/openais.conf
  
- 	install -m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR)
+-	install -m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR)
++	install -m 644 exec/*lcrso $(DESTDIR)$(LCRSODIR)
  
-diff -urNad openais-0.79~/lcr/lcr_ifact.c openais-0.79/lcr/lcr_ifact.c
---- openais-0.79~/lcr/lcr_ifact.c	2006-07-18 09:33:13.000000000 +0200
-+++ openais-0.79/lcr/lcr_ifact.c	2006-07-18 09:33:32.000000000 +0200
-@@ -170,7 +170,7 @@
+ 	install -m 755 exec/aisexec $(DESTDIR)$(SBINDIR)
+ 	install -m 700 exec/keygen $(DESTDIR)$(SBINDIR)/ais-keygen
+diff -urNad openais~/lcr/lcr_ifact.c openais/lcr/lcr_ifact.c
+--- openais~/lcr/lcr_ifact.c	2007-03-12 18:28:44.000000000 +0100
++++ openais/lcr/lcr_ifact.c	2007-05-31 10:05:22.220462012 +0200
+@@ -177,7 +177,7 @@
  		path_list[0] = strdup (cwd);
  		path_list_entries++;
  	}

Modified: people/waldi/redhat-cluster/openais/debian/rules
==============================================================================
--- people/waldi/redhat-cluster/openais/debian/rules	(original)
+++ people/waldi/redhat-cluster/openais/debian/rules	Thu May 31 08:12:15 2007
@@ -55,6 +55,9 @@
 	dh_installinit -p openais -- start 59 S . start 7 0 6 .
 	dh_installlogrotate
 	dh_strip
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/openais/usr/lib/openais/lcrso/*
+endif
 	dh_compress
 	dh_fixperms
 	dh_installdeb