Bug#626320: NMU diff for heroes 0.21-8.3

[Evgeni Golov]

Hi,

attached is the NMU diff I just uploaded to unstable.

regards
Evgeni

diff -u heroes-0.21/debian/control heroes-0.21/debian/control
--- heroes-0.21/debian/control
+++ heroes-0.21/debian/control
@@ -7,7 +7,8 @@
 
 Package: heroes-common
 Architecture: any
-Depends: heroes-sdl (= ${binary:Version}) | heroes-ggi (= ${binary:Version}), 
${shlibs:Depends}
+Depends: ${shlibs:Depends}
+Recommends: heroes-sdl (= ${binary:Version}) | heroes-ggi (= ${binary:Version})
 Replaces: heroes-ggi (<< 0.8-3), heroes-sdl (<< 0.8-3), heroes-utils
 Conflicts: heroes-ggi (<< 0.8-3), heroes-sdl (<< 0.8-3), heroes-utils
 Provides: heroes
@@ -29,7 +30,7 @@
 
 Package: heroes-ggi
 Architecture: any
-Depends: heroes-data (>=1.4-1), heroes-common, ${shlibs:Depends}
+Depends: heroes-data (>=1.4-1), heroes-common (= ${binary:Version}), 
${shlibs:Depends}
 Recommends: heroes-sound-effects, heroes-sound-tracks
 Description: Collect powerups and avoid your opponents' trails
  Heroes is similar to the "Tron" and "Nibbles" games of yore, but includes
@@ -49,7 +50,7 @@
 
 Package: heroes-sdl
 Architecture: any
-Depends: heroes-data (>= 1.4-1), heroes-common, ${shlibs:Depends}
+Depends: heroes-data (>= 1.4-1), heroes-common (= ${binary:Version}), 
${shlibs:Depends}
 Recommends: heroes-sound-effects, heroes-sound-tracks
 Description: Collect powerups and avoid your opponents' trails
  Heroes is similar to the "Tron" and "Nibbles" games of yore, but includes
diff -u heroes-0.21/debian/changelog heroes-0.21/debian/changelog
--- heroes-0.21/debian/changelog
+++ heroes-0.21/debian/changelog
@@ -1,3 +1,17 @@
+heroes (0.21-8.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS on big-endian arches.
+    + Use __swabX from linux/swab.h instead of __arch_swabX.
+    + Thanks to Raf Czlonka for testing the resulting binaries.
+    + Closes: #660236
+  * Drop depends of heroes-common on heroes-sdl|heroes-ggi to recommends.
+    + Closes: #626320
+  * Tighten depens of heroes-sdl and heroes-ggi on heroes-common to
+    = ${binary:Version}.
+
+ -- Evgeni Golov <evg...@debian.org>  Sat, 03 Mar 2012 16:29:31 +0100
+
 heroes (0.21-8.2) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- heroes-0.21.orig/src/bytesex.h
+++ heroes-0.21/src/bytesex.h
@@ -27,9 +27,9 @@
 
 #ifdef linux
 
-#include <asm/byteorder.h>
-#define BSWAP16(x) __arch__swab16(x)
-#define BSWAP32(x) __arch__swab32(x)
+#include <linux/swab.h>
+#define BSWAP16(x) __swab16(x)
+#define BSWAP32(x) __swab32(x)
 
 #else /* ! linux */