Bug#554987: xvier: diff for NMU version 1.0-7.5

[Meike Reichle]

tags 554987 + patch
thanks

Hi Josip, 

sorry for not informing you about the intended NMU. I used a borrowed
Laptop during the BSP[0] and did not notice the mails I generated weren't
sent out. It wasn't meant as an offence and the upload was my full
responsibility and not Uwe's. I generated the patch again and attached it
to this mail. 

Regards,
Meike

[0] http://lists.debian.org/debian-devel-announce/2009/12/msg00000.html

diff -u xvier-1.0/debian/control xvier-1.0/debian/control
--- xvier-1.0/debian/control
+++ xvier-1.0/debian/control
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Josip Rodin <joy-packa...@debian.org>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Build-Depends: libx11-dev, xutils-dev, libxext-dev
 
 Package: xvier
diff -u xvier-1.0/debian/changelog xvier-1.0/debian/changelog
--- xvier-1.0/debian/changelog
+++ xvier-1.0/debian/changelog
@@ -1,3 +1,17 @@
+xvier (1.0-7.5) unstable; urgency=high
+
+  * Non-maintainer upload.
+
+  [Uwe Kleine-König]
+  * fix segfault on archs that have sizeof(int) < sizeof(int*)
+    (Closes: #554987)
+
+  [Meike Reichle]
+  * Bumped standards version (no further changes needed)
+  * Fixed debian-rules-ignores-make-clean-error 
+
+ -- Uwe Kleine-König <u.kleine-koe...@pengutronix.de>  Sat, 23 Jan 2010 19:58:26 +0100
+
 xvier (1.0-7.4) unstable; urgency=high
 
   * Non-maintainer upload, high urgency to fix RC bug.
diff -u xvier-1.0/debian/rules xvier-1.0/debian/rules
--- xvier-1.0/debian/rules
+++ xvier-1.0/debian/rules
@@ -14,7 +14,7 @@
 
 clean: debian/rules
 	test `id -u` -eq 0
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f Makefile
 	rm -f debian/substvars debian/files
 	rm -rf $(tmp)
only in patch2:
unchanged:
--- xvier-1.0.orig/vierinit.c
+++ xvier-1.0/vierinit.c
@@ -78,7 +78,7 @@
       pui++;
     }
   _p_h_ = (int *)malloc((row_col + 4 * vnum) * sizeof(int));
-  pp = (int **)malloc(row_col * sizeof(int));
+  pp = (int **)malloc(row_col * sizeof(int *));
   for (pui = i = 0; i < row_col; i++) {
     pp[i] = _p_h_ + pui;
     for (j = 0; j < vnum; j++)