[nethack] 01/01: Imported Debian patch 3.4.3-12.2

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to annotated tag debian/3.4.3-12.2
in repository nethack.

commit 5012b5e15b6ad1b06edd5bcaf55ca1cdf43cc36a
Author: Luca Falavigna <dktrkranz at debian.org>
Date:   Fri Aug 26 21:15:02 2011 +0200

    Imported Debian patch 3.4.3-12.2
---
 debian/changelog                       |  8 ++++++++
 debian/patches/00list                  |  1 +
 debian/patches/96_binutils-gold.dpatch | 17 +++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cee9a13..272df5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nethack (3.4.3-12.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/96_binutils-gold.dpatch:
+    - Fix FTBFS with binutils-gold (Closes: #555769).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Fri, 26 Aug 2011 21:15:02 +0200
+
 nethack (3.4.3-12.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/00list b/debian/patches/00list
index f514dc8..f07d3ce 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -22,3 +22,4 @@
 93_enh_dump
 94_enh_sortloot
 95_enh_engulf_prayers
+96_binutils-gold
diff --git a/debian/patches/96_binutils-gold.dpatch b/debian/patches/96_binutils-gold.dpatch
new file mode 100644
index 0000000..67ab5e1
--- /dev/null
+++ b/debian/patches/96_binutils-gold.dpatch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 96_binutils-gold.dpatch by Luca Falavigna <dktrkranz at debian.org>
+## DP: Fix FTBFS with binutils-gold.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nethack-3.4.3~/sys/unix/Makefile.src nethack-3.4.3/sys/unix/Makefile.src
+--- nethack-3.4.3~/sys/unix/Makefile.src	2011-08-26 21:13:05.938567905 +0200
++++ nethack-3.4.3/sys/unix/Makefile.src	2011-08-26 21:14:23.510570283 +0200
+@@ -309,7 +309,7 @@
+ # IRIX 4.0.x needs -lsun if NIS (YP) is being used for passwd file lookup
+ # LIBS = -lsun
+ #
+-LIBS =
++LIBS = -lstdc++
+ 
+ # make NetHack
+ GAME     = nethack

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nethack.git