[kernel] r8833 - in people/waldi/redhat-cluster/openais/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Thu May 31 07:40:56 UTC 2007
Author: waldi
Date: Thu May 31 07:40:54 2007
New Revision: 8833
Log:
debian: Update.
Added:
people/waldi/redhat-cluster/openais/debian/libopenais-dev.install
people/waldi/redhat-cluster/openais/debian/libopenais2.install
people/waldi/redhat-cluster/openais/debian/openais.dirs
people/waldi/redhat-cluster/openais/debian/openais.install
people/waldi/redhat-cluster/openais/debian/openais.logrotate
people/waldi/redhat-cluster/openais/debian/patches/
people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch (contents, props changed)
people/waldi/redhat-cluster/openais/debian/patches/003_default_conf.dpatch (contents, props changed)
people/waldi/redhat-cluster/openais/debian/patches/00list
Modified:
people/waldi/redhat-cluster/openais/debian/rules
Added: people/waldi/redhat-cluster/openais/debian/libopenais-dev.install
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/libopenais-dev.install Thu May 31 07:40:54 2007
@@ -0,0 +1,2 @@
+usr/include
+usr/share/man/man3
Added: people/waldi/redhat-cluster/openais/debian/libopenais2.install
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/libopenais2.install Thu May 31 07:40:54 2007
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/openais/*.a
+usr/lib/openais/*.so
+usr/share/man/man3
Added: people/waldi/redhat-cluster/openais/debian/openais.dirs
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/openais.dirs Thu May 31 07:40:54 2007
@@ -0,0 +1,2 @@
+var/lib/openais
+var/log/openais
Added: people/waldi/redhat-cluster/openais/debian/openais.install
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/openais.install Thu May 31 07:40:54 2007
@@ -0,0 +1,5 @@
+etc/ais
+usr/sbin
+usr/share/man/man5
+usr/share/man/man8
+usr/lib/openais/lcrso
Added: people/waldi/redhat-cluster/openais/debian/openais.logrotate
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/openais.logrotate Thu May 31 07:40:54 2007
@@ -0,0 +1,10 @@
+/var/log/openais/*.log {
+ weekly
+ missingok
+ rotate 52
+ compress
+ delaycompress
+ notifempty
+ create 640 root adm
+ sharedscripts
+}
Added: people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/patches/001_makefile.dpatch Thu May 31 07:40:54 2007
@@ -0,0 +1,56 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 001_makefile.dpatch by <fabbione at gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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
+@@ -37,23 +37,9 @@
+ INCLUDEDIR_SERVICE=/usr/include/openais/service
+ MANDIR=/usr/share/man
+ ETCDIR=/etc/ais
+-LCRSODIR=/usr/libexec/lcrso
+-ARCH=$(shell uname -p)
++LCRSODIR=/usr/lib/openais/lcrso
+
+-ifeq (,$(findstring 64,$(ARCH)))
+-LIBDIR=/usr/lib/openais
+-else
+-LIBDIR=/usr/lib64/openais
+-endif
+-ifeq (s390,$(ARCH))
+ LIBDIR=/usr/lib/openais
+-endif
+-ifeq (s390x,$(ARCH))
+-LIBDIR=/usr/lib64/openais
+-endif
+-ifeq (ia64,$(ARCH))
+-LIBDIR=/usr/lib/openais
+-endif
+
+ all:
+ (cd lcr; echo ==== `pwd` ===; $(MAKE) all);
+@@ -150,7 +136,7 @@
+ install -m 755 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)
+
+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 @@
+ path_list[0] = strdup (cwd);
+ path_list_entries++;
+ }
+- path_list[path_list_entries++] = "/usr/libexec/lcrso";
++ path_list[path_list_entries++] = "/usr/lib/openais/lcrso";
+ }
+
+ static void ld_library_path_build (void)
Added: people/waldi/redhat-cluster/openais/debian/patches/003_default_conf.dpatch
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/patches/003_default_conf.dpatch Thu May 31 07:40:54 2007
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 003_default_conf.dpatch by <fabbione at gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad openais-0.81~/conf/openais.conf openais-0.81/conf/openais.conf
+--- openais-0.81~/conf/openais.conf 2006-09-01 12:12:25.000000000 +0200
++++ openais-0.81/conf/openais.conf 2007-04-20 10:29:11.000000000 +0200
+@@ -4,6 +4,8 @@
+ version: 2
+ secauth: off
+ threads: 0
++ rrp_mode: none
++ vsftype: none
+ interface {
+ ringnumber: 0
+ bindnetaddr: 192.168.2.0
+@@ -14,9 +16,9 @@
+
+ logging {
+ fileline: off
+- to_stderr: yes
++ to_stderr: no
+ to_file: yes
+- logfile: /tmp/openais.log
++ logfile: /var/log/openais/openais.log
+ debug: off
+ timestamp: on
+ logger {
Added: people/waldi/redhat-cluster/openais/debian/patches/00list
==============================================================================
--- (empty file)
+++ people/waldi/redhat-cluster/openais/debian/patches/00list Thu May 31 07:40:54 2007
@@ -0,0 +1,2 @@
+001_makefile
+003_default_conf
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 07:40:54 2007
@@ -11,14 +11,13 @@
export OPENAIS_BUILD=$(if $(findstring debug,$(DEB_BUILD_OPTIONS)),DEBUG)
-$(BUILD_DIR) $(STAMPS_DIR):
- @[ -d $@ ] || mkdir $@
-
setup: $(STAMPS_DIR)/setup
$(STAMPS_DIR)/setup: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
$(STAMPS_DIR)/setup: DIR = $(BUILD_DIR)/build
-$(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR)
+$(STAMPS_DIR)/setup:
+ @[ -d $(BUILD_DIR) ] || mkdir $(BUILD_DIR)
+ @[ -d $(STAMPS_DIR) ] || mkdir $(STAMPS_DIR)
dh_testdir
@rm -rf $(DIR)
mkdir $(DIR)
@@ -43,7 +42,7 @@
rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
install: DIR = $(BUILD_DIR)/build
-install: build
+install: $(STAMPS_DIR)/build
dh_testdir
dh_testroot
dh_clean -k
More information about the Kernel-svn-changes
mailing list