Control: tags 832630 + pending

Dear maintainer,

I've prepared an NMU for nas (versioned as 1.9.4-4.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru nas-1.9.4/debian/changelog nas-1.9.4/debian/changelog
--- nas-1.9.4/debian/changelog  2015-12-18 18:35:29.000000000 +0100
+++ nas-1.9.4/debian/changelog  2016-07-30 07:02:38.000000000 +0200
@@ -1,3 +1,12 @@
+nas (1.9.4-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport the upstream commit 89d46e3cfbd8795f2635c30b809079903a12008f to
+    build the voxware server also on Hurd; patch
+    upstream_Build-the-voxware-server-on-Hurd.patch. Closes: #832630
+
+ -- Pino Toscano <p...@debian.org>  Sat, 30 Jul 2016 07:02:36 +0200
+
 nas (1.9.4-4) unstable; urgency=medium
 
   * Change nas-bin dependency from perl5 to perl. Closes: #808232
diff -Nru nas-1.9.4/debian/patches/series nas-1.9.4/debian/patches/series
--- nas-1.9.4/debian/patches/series     2014-11-10 18:54:13.000000000 +0100
+++ nas-1.9.4/debian/patches/series     2016-07-30 07:01:26.000000000 +0200
@@ -1,2 +1,3 @@
 multiarch-AuErrorDB.patch
 snprintf.m4
+upstream_Build-the-voxware-server-on-Hurd.patch
diff -Nru 
nas-1.9.4/debian/patches/upstream_Build-the-voxware-server-on-Hurd.patch 
nas-1.9.4/debian/patches/upstream_Build-the-voxware-server-on-Hurd.patch
--- nas-1.9.4/debian/patches/upstream_Build-the-voxware-server-on-Hurd.patch    
1970-01-01 01:00:00.000000000 +0100
+++ nas-1.9.4/debian/patches/upstream_Build-the-voxware-server-on-Hurd.patch    
2016-07-30 07:00:17.000000000 +0200
@@ -0,0 +1,45 @@
+From 89d46e3cfbd8795f2635c30b809079903a12008f Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.p...@tiscali.it>
+Date: Wed, 27 Jul 2016 22:24:17 +0200
+Subject: [PATCH] Build the voxware server on Hurd
+
+While Hurd has no audio yet, at least this brings nas on Hurd on par
+with what is done currently on Linux and *BSD.
+---
+ server/Imakefile          | 4 ++--
+ server/dia/auservertype.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/server/Imakefile b/server/Imakefile
+index 72587d0..6ab761e 100644
+--- a/server/Imakefile
++++ b/server/Imakefile
+@@ -96,10 +96,10 @@ ALL1 = nasd
+ #endif
+ 
+ 
+-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(FreeBSDArchitecture) || 
defined(LinuxArchitecture) || defined(i386BsdArchitecture) || 
defined(USLArchitecture) || defined(cygwinArchitecture) || 
defined(__DragonFly__)
++#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(FreeBSDArchitecture) || 
defined(LinuxArchitecture) || defined(i386BsdArchitecture) || 
defined(USLArchitecture) || defined(cygwinArchitecture) || 
defined(__DragonFly__) || defined(GNUArchitecture)
+ # define CanBuildAuServer     YES
+ 
+-#if !defined(GNUMachArchitecture)
++#if !defined(GNUMachArchitecture) || defined(GNUArchitecture)
+ # if defined(cygwinArchitecture)
+ ALL1 = nasd.exe
+ # else
+diff --git a/server/dia/auservertype.h b/server/dia/auservertype.h
+index 9e0f392..cb5c12f 100644
+--- a/server/dia/auservertype.h
++++ b/server/dia/auservertype.h
+@@ -14,7 +14,7 @@
+ # define SGI_SERVER
+ #endif /* sgi */
+ 
+-#if defined(__DragonFly__) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || (defined(SVR4) 
&& (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__)
++#if defined(__DragonFly__) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || (defined(SVR4) 
&& (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__) || 
defined(__GNU__)
+ # define VOXWARE_SERVER
+ #endif /* voxware */
+ 
+-- 
+2.8.1
+

Reply via email to