Bug#298152: #298152: checkinstall: incorrectly sets Arch:x86_64 for .deb under amd64

[matt hope]

[Martin Samuelsson <[EMAIL PROTECTED]> - 14:16PM Sunday Nov  6]:

> Would this patch do the trick?

> diff -ur checkinstall-1.5.3/checkinstall 
> checkinstall-patched-1.5.3/checkinstall
> --- checkinstall-1.5.3/checkinstall   2005-11-06 14:03:59.302390154 +0100
> +++ checkinstall-patched-1.5.3/checkinstall   2005-11-06 14:10:20.886160966 
> +0100
> @@ -1146,8 +1146,8 @@
>  
> # Fix the PowerPC architecture description if we're on Debian
> 
> -   if [ "$CK_DEBIAN" = "1" ] && [ "$ARCHITECTURE" = "ppc" ]; then
> -  ARCHITECTURE="powerpc"
> +   if [ "$CK_DEBIAN" = "1" ] then
> +  ARCHITECTURE=`dpkg-architecture -qDEB_HOST_ARCH`
> fi


That looks sane at first pass (although I dont have any amd64 to test on)

However, I'm going to look over checkinstall 1.6.0.

-- 
 >dopey!debian.org
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#298152: #298152: checkinstall: incorrectly sets Arch:x86_64 for .deb under amd64

[Martin Samuelsson]

Kurt Roeckx @ 2005-06-12 (Sunday), 23:05 (+0200)
> You should be using something like dpkg --print-architecture or
> dpkg-architecture instead.

Would this patch do the trick?
--
/Martin
diff -ur checkinstall-1.5.3/checkinstall checkinstall-patched-1.5.3/checkinstall
--- checkinstall-1.5.3/checkinstall 2005-11-06 14:03:59.302390154 +0100
+++ checkinstall-patched-1.5.3/checkinstall 2005-11-06 14:10:20.886160966 
+0100
@@ -1146,8 +1146,8 @@
 
# Fix the PowerPC architecture description if we're on Debian

-   if [ "$CK_DEBIAN" = "1" ] && [ "$ARCHITECTURE" = "ppc" ]; then
-  ARCHITECTURE="powerpc"
+   if [ "$CK_DEBIAN" = "1" ] then
+  ARCHITECTURE=`dpkg-architecture -qDEB_HOST_ARCH`
fi
   
 

Bug#298152: #298152: checkinstall: incorrectly sets Arch:x86_64 for .deb under amd64

[Kurt Roeckx]

You should be using something like dpkg --print-architecture or
dpkg-architecture instead.


Kurt



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#298152: #298152: checkinstall: incorrectly sets Arch:x86_64 for .deb under amd64

[Alexandra N. Kossovsky]

Attached patch will deal with amd64 in the same way as with ppc.

-- 
Regards,
Sasha.
Alexandra N. Kossovsky, software engineer.
e-mail: [EMAIL PROTECTED]
--- checkinstall.old2005-06-12 22:44:24.311870357 +0400
+++ checkinstall2005-06-12 22:45:36.265687623 +0400
@@ -1144,11 +1144,14 @@
 fi# i386, i486, i586 or i686.
   # You can change this with "--arch"
 
-   # Fix the PowerPC architecture description if we're on Debian
+   # Fix the PowerPC & Amd64 architectures description if we're on Debian

if [ "$CK_DEBIAN" = "1" ] && [ "$ARCHITECTURE" = "ppc" ]; then
   ARCHITECTURE="powerpc"
fi
+   if [ "$CK_DEBIAN" = "1" ] && [ "$ARCHITECTURE" = "x86_64" ]; then
+  ARCHITECTURE="amd64"
+   fi
   
 
OPTION=junk