[med-svn] r15557 - trunk/packages/uc-echo/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-12-18 08:57:09 +0000 (Wed, 18 Dec 2013)
New Revision: 15557

Modified:
   trunk/packages/uc-echo/trunk/debian/changelog
   trunk/packages/uc-echo/trunk/debian/rules
Log:
Apply patch from Nobuhiro Iwamatsu


Modified: trunk/packages/uc-echo/trunk/debian/changelog
===================================================================
--- trunk/packages/uc-echo/trunk/debian/changelog	2013-12-18 08:53:35 UTC (rev 15556)
+++ trunk/packages/uc-echo/trunk/debian/changelog	2013-12-18 08:57:09 UTC (rev 15557)
@@ -1,9 +1,15 @@
 uc-echo (1.12-4) UNRELEASED; urgency=low
 
+  [ Andreas Tille ]
   * debian/upstream: title needs quoting since it contains a ": " string
   * debian/control:
      - cme fix dpkg-control
 
+  [ Nobuhiro Iwamatsu ]
+  * Add sh4 powerpcspe and m68k for don't need -m64.
+  * Use dpkg-architecture -qDEB_HOST_MULTIARCH instead of gcc -print-multiarch.
+    Closes: #728412
+
  -- Andreas Tille <tille at debian.org>  Wed, 18 Dec 2013 09:56:50 +0100
 
 uc-echo (1.12-3) unstable; urgency=low

Modified: trunk/packages/uc-echo/trunk/debian/rules
===================================================================
--- trunk/packages/uc-echo/trunk/debian/rules	2013-12-18 08:53:35 UTC (rev 15556)
+++ trunk/packages/uc-echo/trunk/debian/rules	2013-12-18 08:57:09 UTC (rev 15557)
@@ -3,11 +3,12 @@
 # DH_VERBOSE := 1
 
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-LIBRARY_PATH=/usr/lib/$(gcc -print-multiarch)
-CPATH=/usr/include/$(gcc -print-multiarch)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)
+CPATH=/usr/include/$(DEB_HOST_MULTIARCH)
 export LIBRARY_PATH CPATH
 ADDCXXFLAGS = -m64
-ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel kfreebsd-i386 hurd-i386 armel armhf ia64 ))
+ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),mips mipsel kfreebsd-i386 hurd-i386 armel armhf ia64 sh4 powerpcspe m68k))
 ADDCXXFLAGS = 
 endif