[kernel] r9852 - in dists/trunk/redhat-cluster/openais/debian: . patches

Frederik Schüler fs at alioth.debian.org
Sat Dec 1 23:26:24 UTC 2007 

Author: fs
Date: Sat Dec  1 23:26:24 2007
New Revision: 9852

Log:
Package new upstream release 0.82
Add myself to uploaders
Rediff 001_makefile.dpatch, split out lcr path fix
Drop 002_fix_include_path.dpatch



Added:
   dists/trunk/redhat-cluster/openais/debian/patches/003_lcr-fixpath.dpatch   (contents, props changed)
Modified:
   dists/trunk/redhat-cluster/openais/debian/changelog
   dists/trunk/redhat-cluster/openais/debian/control
   dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
   dists/trunk/redhat-cluster/openais/debian/patches/00list

Modified: dists/trunk/redhat-cluster/openais/debian/changelog
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/changelog	(original)
+++ dists/trunk/redhat-cluster/openais/debian/changelog	Sat Dec  1 23:26:24 2007
@@ -1,8 +1,15 @@
-openais (0.81-2) UNRELEASED; urgency=low
+openais (0.82-1) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * Drop unnecessary patches.
 
- -- Bastian Blank <waldi at debian.org>  Sat, 22 Sep 2007 10:40:07 +0200
+  [ Frederik Schüler ]
+  * New upstream release (Closes: #453438)
+  * Add myself to uploaders.
+  * Rediff 001_makefile.dpatch
+  * Drop 002_fix_include_path.dpatch
+
+ -- Frederik Schüler <fs at debian.org>  Sat, 01 Dec 2007 19:55:14 +0100
 
 openais (0.81-1) unstable; urgency=low
 

Modified: dists/trunk/redhat-cluster/openais/debian/control
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/control	(original)
+++ dists/trunk/redhat-cluster/openais/debian/control	Sat Dec  1 23:26:24 2007
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
-Uploaders: Bastian Blank <waldi at debian.org>
+Uploaders: Bastian Blank <waldi at debian.org>, Frederik Schüler <fs at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: dpatch, debhelper (>> 5)
 

Modified: dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch	(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/001_makefile.dpatch	Sat Dec  1 23:26:24 2007
@@ -5,55 +5,60 @@
 ## DP: No description.
 
 @DPATCH@
-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
- ETCDIR=/etc/ais
--LCRSODIR=/usr/libexec/lcrso
--ARCH=$(shell uname -p)
-+LCRSODIR=/usr/lib/openais/lcrso
- 
+--- openais/Makefile.old	2007-12-01 19:47:41.000000000 +0100
++++ openais/Makefile	2007-12-02 00:13:22.000000000 +0100
+@@ -38,23 +38,9 @@
+ INCLUDEDIR_SERVICE=$(PREFIX)/include/openais/service
+ MANDIR=$(PREFIX)/share/man
+ ETCDIR=/etc
+-LCRSODIR=$(PREFIX)/libexec/lcrso
+ ARCH=$(shell uname -p)
+-
 -ifeq (,$(findstring 64,$(ARCH)))
--LIBDIR=/usr/lib/openais
+-LIBDIR=$(PREFIX)/lib/openais
 -else
--LIBDIR=/usr/lib64/openais
+-LIBDIR=$(PREFIX)/lib64/openais
 -endif
 -ifeq (s390,$(ARCH))
- LIBDIR=/usr/lib/openais
+-LIBDIR=$(PREFIX)/lib/openais
 -endif
 -ifeq (s390x,$(ARCH))
--LIBDIR=/usr/lib64/openais
+-LIBDIR=$(PREFIX)/lib64/openais
 -endif
 -ifeq (ia64,$(ARCH))
--LIBDIR=/usr/lib/openais
++LCRSODIR=$(PREFIX)/lib/openais/lcrso
+ LIBDIR=$(PREFIX)/lib/openais
 -endif
  
  all:
  	(cd lcr; echo ==== `pwd` ===; $(MAKE) all);
-@@ -130,9 +116,9 @@
- 	install -m 755 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
- endif
+@@ -103,17 +89,17 @@
+ 	    $(CP) -a lib/lib$$aLib.so $(DESTDIR)$(LIBDIR);		\
+ 	    $(CP) -a lib/lib$$aLib.so.2 $(DESTDIR)$(LIBDIR);		\
+ 	    install -m 755 lib/lib$$aLib.so.2.* $(DESTDIR)$(LIBDIR);	\
+-	    if [ "xNO" = "x$(STATICLIBS)" ]; then			\
+-	        install -m 755 lib/lib$$aLib.a $(DESTDIR)$(LIBDIR);	\
++	    if [ "x" = "x$(STATICLIBS)" ]; then			\
++	        $(CP) -a lib/lib$$aLib.a $(DESTDIR)$(LIBDIR);	\
+ 		if [ ${OPENAIS_COMPAT} = "DARWIN" ]; then		\
+ 		    ranlib $(DESTDIR)$(LIBDIR)/lib$$aLib.a;		\
+ 	        fi							\
+ 	    fi								\
+ 	done
  
--	echo $(LIBDIR) > $(DESTDIR)/etc/ld.so.conf.d/openais-$(ARCH).conf
-+	echo $(LIBDIR) > $(DESTDIR)/etc/ld.so.conf.d/openais.conf
+-	echo $(LIBDIR) > $(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais-$(ARCH).conf
++	echo $(LIBDIR) > $(DESTDIR)$(ETCDIR)/ld.so.conf.d/openais.conf
  
 -	install -m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR)
 +	install -m 644 exec/*lcrso $(DESTDIR)$(LCRSODIR)
- 
  	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++;
- 	}
--	path_list[path_list_entries++] = "/usr/libexec/lcrso";
-+	path_list[path_list_entries++] = "/usr/lib/openais/lcrso";
- }
  
- static void ld_library_path_build (void)
+@@ -138,7 +124,6 @@
+ 	install -m 644 exec/service.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+ 	install -m 644 exec/timer.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+ 	install -m 644 exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+-	install -m 644 exec/print.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+ 	install -m 644 exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+ 	install -m 644 include/swab.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+ 	install -m 644 man/*.3 $(DESTDIR)$(MANDIR)/man3

Added: dists/trunk/redhat-cluster/openais/debian/patches/003_lcr-fixpath.dpatch
==============================================================================
--- (empty file)
+++ dists/trunk/redhat-cluster/openais/debian/patches/003_lcr-fixpath.dpatch	Sat Dec  1 23:26:24 2007
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_lcr_fixpath.dpatch by <fs at debian.org>  
+## based on a patch from <fabbione at gordian.int.fabbione.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- openais/lcr/lcr_ifact.c.old	2007-12-01 19:53:08.000000000 +0100
++++ openais/lcr/lcr_ifact.c	2007-12-01 19:54:04.000000000 +0100
+@@ -179,7 +179,7 @@
+ 		path_list_entries++;
+ 	}
+ 	
+-	path_list[path_list_entries++] = PREFIX"/libexec/lcrso";
++	path_list[path_list_entries++] = "/usr/lib/openais/lcrso";
+ }
+ 
+ static void ld_library_path_build (void)

Modified: dists/trunk/redhat-cluster/openais/debian/patches/00list
==============================================================================
--- dists/trunk/redhat-cluster/openais/debian/patches/00list	(original)
+++ dists/trunk/redhat-cluster/openais/debian/patches/00list	Sat Dec  1 23:26:24 2007
@@ -1,2 +1,2 @@
 001_makefile
-002_fix_include_path
+003_lcr-fixpath

More information about the Kernel-svn-changes mailing list