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

[Steve Langasek]

On Mon, Oct 10, 2011 at 06:47:43PM +0000, sathieu at alioth.debian.org wrote:
> Modified: trunk/ctdb/debian/changelog
> ===================================================================
> --- trunk/ctdb/debian/changelog	2011-10-08 04:37:10 UTC (rev 3926)
> +++ trunk/ctdb/debian/changelog	2011-10-10 18:47:43 UTC (rev 3927)
> @@ -2,6 +2,7 @@
>  
>    * New upstream release
>      - updated 92-apache-service-enable.diff 
> +  * Don't use /use/lib64 on ppc64 (Closes: #644907)
>  
>   -- Mathieu Parent <sathieu at debian.org>  Wed, 21 Sep 2011 22:07:40 +0200

> Modified: trunk/ctdb/debian/patches/10_no-lib64.diff
> ===================================================================
> --- trunk/ctdb/debian/patches/10_no-lib64.diff	2011-10-08 04:37:10 UTC (rev 3926)
> +++ trunk/ctdb/debian/patches/10_no-lib64.diff	2011-10-10 18:47:43 UTC (rev 3927)
> @@ -1,10 +1,10 @@
> -Goal: Don't ship files in /usr/lib64 for amd64 port
> +Goal: Don't ship files in /usr/lib64 for amd64 and ppc64 port
>  
> -See http://bugs.debian.org/528976
> +See http://bugs.debian.org/528976 and http://bugs.debian.org/644907
>  
>  Author: Mathieu Parent <math.parent at gmail.com>
>  
> -Upstream status: Debian specific
> +Upstream status: Debian specific?
>  
>  Index: b/configure
>  ===================================================================
> @@ -15,7 +15,7 @@
>   if test "${libdir}" = '${exec_prefix}/lib'; then
>     case `uname -m` in
>  -    x86_64|ppc64|powerpc64)
> -+    ppc64|powerpc64)
> ++    thearchthatreallywantslib6411)
>         libdir='${exec_prefix}/lib64'
>         ;;
>       *)

This is not an advisable way to handle the issue - configure is an
autogenerated file, any changes here will be lost if someone ever runs
autoconf during build.

How about just switching the package to do multiarch instead?  Then

   test "${libdir}" = '${exec_prefix}/lib'

is always false, and you don't have to worry about patching configure...

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org