[Pkg-samba-maint] r2794 - in trunk/ctdb/debian: . patches

[mparent-guest at alioth.debian.org]

tags 530064 pending
thanks

Author: mparent-guest
Date: 2009-05-30 08:56:44 +0000 (Sat, 30 May 2009)
New Revision: 2794

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/patches/10_no-lib64.diff
Log:
10_no-lib64.diff updated: Don't Ship files in /usr/lib64 only on amd64


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-05-29 20:54:30 UTC (rev 2793)
+++ trunk/ctdb/debian/changelog	2009-05-30 08:56:44 UTC (rev 2794)
@@ -1,8 +1,10 @@
 ctdb (1.0.82-2) unstable; urgency=low
 
-  * 50-fix-bashism.diff: Fix "bashism in /bin/sh script" (Closes: #530064)
+  * 10_no-lib64.diff updated: Don't Ship files in /usr/lib64 only on amd64
+  * 50-fix-bashism.diff (new): Fix "bashism in /bin/sh script"
+    (Closes: #530064)
 
- -- Mathieu Parent <math.parent at gmail.com>  Mon, 25 May 2009 23:13:59 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 30 May 2009 10:54:19 +0200
 
 ctdb (1.0.82-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/patches/10_no-lib64.diff
===================================================================
--- trunk/ctdb/debian/patches/10_no-lib64.diff	2009-05-29 20:54:30 UTC (rev 2793)
+++ trunk/ctdb/debian/patches/10_no-lib64.diff	2009-05-30 08:56:44 UTC (rev 2794)
@@ -1,4 +1,4 @@
-Goal: Don't ship files in /usr/lib64
+Goal: Don't ship files in /usr/lib64 for amd64 port
 
 See http://bugs.debian.org/528976
 
@@ -10,30 +10,12 @@
 ===================================================================
 --- a/configure
 +++ b/configure
-@@ -1843,16 +1843,16 @@
+@@ -1845,7 +1845,7 @@
  
- 
- 
--if test "${libdir}" = '${exec_prefix}/lib'; then
--  case `uname -m` in
+ if test "${libdir}" = '${exec_prefix}/lib'; then
+   case `uname -m` in
 -    x86_64|ppc64|powerpc64)
--      libdir='${exec_prefix}/lib64'
--      ;;
--    *)
--      libdir='${exec_prefix}/lib'
--      ;;
--  esac
--fi
-+#if test "${libdir}" = '${exec_prefix}/lib'; then
-+#  case `uname -m` in
-+#    x86_64|ppc64|powerpc64)
-+#      libdir='${exec_prefix}/lib64'
-+#      ;;
-+#    *)
-+#      libdir='${exec_prefix}/lib'
-+#      ;;
-+#  esac
-+#fi
- 
- case `uname` in
-   Linux*)
++    ppc64|powerpc64)
+       libdir='${exec_prefix}/lib64'
+       ;;
+     *)