[Pkg-electronics-commits] [SCM] Packaging for GTKWave branch, master, updated. debian/3.3.17-2-6-g93f8b5d

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 274768c3c129d31280899903167be6c61d31ab5c
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Mon Dec 27 15:43:16 2010 +0200

    Removed amd64_asm_fix.diff patch, as it is applied upstream.

diff --git a/debian/patches/amd64_asm_fix.diff b/debian/patches/amd64_asm_fix.diff
deleted file mode 100644
index 2ddb66a..0000000
--- a/debian/patches/amd64_asm_fix.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-Description: Fixed x86_64 assembler =q vs =Q problem in lxt.c.
- Also fixed in lxt.c that --disable-inline-asm did not propagate into its compile.
-Origin: http://gtkwave.cvs.sourceforge.net/viewvc/gtkwave/gtkwave3/src/lxt.c?revision=1.21
-Bug: https://sourceforge.net/tracker/?func=detail&atid=905922&aid=3130530&group_id=183606
-Bug-Ubuntu: https://launchpad.net/bugs/685534
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606126
-
---- a/src/lxt.c	2010-09-25 07:33:37.910345268 +0300
-+++ b/src/lxt.c	2010-12-07 06:45:08.424211335 +0200
-@@ -33,6 +33,13 @@
- #include "debug.h"
- #include "hierpack.h"
- 
-+#if defined(USE_INLINE_ASM)
-+#if defined(__i386__) || defined(__x86_64__)
-+#define USE_X86_INLINE_ASM
-+#endif
-+#endif
-+
-+
- /****************************************************************************/
- 
- /*
-@@ -174,7 +181,7 @@
-  * of a big-endian integer.  x86 specific version...
-  */
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#ifdef USE_X86_INLINE_ASM
- 
- inline static unsigned int get_byte(offset) {
-   return ((unsigned int)(*((unsigned char *) GLOBALS->mm_lxt_c_1+offset)));
-@@ -184,9 +191,11 @@
- {
- unsigned short x = *((unsigned short *)((unsigned char *)GLOBALS->mm_lxt_c_1+offset));
- 
--  __asm("xchgb %b0,%h0" :
--        "=q" (x)        :
--        "0" (x));
-+#if defined(__x86_64__)
-+    __asm("xchgb %b0,%h0" : "=Q" (x) : "0" (x));
-+#else
-+    __asm("xchgb %b0,%h0" : "=q" (x) : "0" (x));
-+#endif
- 
-     return (unsigned int) x;
- }
-@@ -2406,8 +2415,11 @@
- }
- 
- /*
-- * $Id: lxt.c,v 1.20 2010/06/02 03:51:30 gtkwave Exp $
-+ * $Id: lxt.c,v 1.21 2010/12/06 18:53:55 gtkwave Exp $
-  * $Log: lxt.c,v $
-+ * Revision 1.21  2010/12/06 18:53:55  gtkwave
-+ * __asm directive error fix for AMD64
-+ *
-  * Revision 1.20  2010/06/02 03:51:30  gtkwave
-  * don't autocoalesce escape identifiers
-  *
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6fe8dc8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-amd64_asm_fix.diff

-- 
Packaging for GTKWave