[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-308-g429f421

[Jörg Sommer]

The following commit has been merged in the master branch:
commit e40c5ee319b0cc82ef3151e6596df5e49ffc689c
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Mon Dec 14 11:16:53 2009 +0100

    Use DEB_HOST_ARCH_OS instead of DEB_BUILD_GNU_TYPE for architecture
    
    I was a little bit too optimistic in commit
    2a0125414528531ad5c218c096b8332c1d762ca0. At least on hurd, the
    DEB_BUILD_GNU_TYPE did not contain the substring hurd. Therefore, all
    builds on hurd and kfreebasd failed.
    
    This patch was written by Cyril Brulebois taken from #559063.

diff --git a/debian/changelog b/debian/changelog
index c2f5490..1222d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jed (1:0.99.19-1) UNRELEASED; urgency=low
 
   * New upstream release
 
+  * Better detection of non-linux architectures. (closes: #559063)
+
  -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 01 Jan 1970 00:00:00 +0000
 
 jed (1:0.99.19~pre210-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index e7bf1ac..7d855e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,13 +22,13 @@ endif
 configure_flags =  --prefix=/usr/share --exec-prefix=/usr --with-x \
   --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
 
-ifeq (, $(filter %-hurd-% %-kfreebsd-%, $(DEB_BUILD_GNU_TYPE)))
+ifeq ($(DEB_HOST_ARCH_OS),linux)
   configure_flags += --enable-gpm
 else
-# libgpm is not supported by these architectures: #345268 #95843
+# libgpm is not supported by non-linux architectures: #345268 #95843
   configure_flags += --disable-gpm
 endif
-ifeq (, $(findstring -hurd-, $(DEB_BUILD_GNU_TYPE)))
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
   configure_flags += --enable-xft
 else
 # The xrender extension is not supported on the hurd: #95843

-- 
Debian packaging of JED