From bb0d0c9b10ac5ab371f392d8cc8362b920e19cb2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Fri, 15 Jul 2005 17:41:14 +0300
Subject: [PATCH] Import Debian changes 1.23-8

dgen (1.23-8) unstable; urgency=low
.
  * Patch from Andreas Jochens to build with gcc 4.0. Closes: #297272
  * Remove "label at end of compound statement" from star.c.
  * Remove build dep on build-essential g++
  * New standards version.
---
 debian/changelog | 9 +++++++++
 debian/control   | 4 ++--
 debian/rules     | 4 ++--
 musa/m68kmake.c  | 3 ++-
 star/star.c      | 1 -
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da61e5a..580ca87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dgen (1.23-8) unstable; urgency=low
+
+  * Patch from Andreas Jochens to build with gcc 4.0. Closes: #297272
+  * Remove "label at end of compound statement" from star.c.
+  * Remove build dep on build-essential g++
+  * New standards version.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Jul 2005 17:41:14 +0300
+
 dgen (1.23-7) unstable; urgency=low
 
   * Rename tobin to dgen_tobin; there is also a tobin program in fondu.
diff --git a/debian/control b/debian/control
index ebe85f8..acea3ee 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: dgen
 Section: non-free/otherosfs
 Priority: optional
-Build-Depends: debhelper (>= 4), g++, libsdl1.2-dev, nasm [i386], xlibmesa-dev, xlibs-dev, dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 4), libsdl1.2-dev, nasm [i386], xlibmesa-dev, xlibs-dev, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.5.10.0
+Standards-Version: 3.6.2
 
 Package: dgen
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 3b6fbd0..c5cf998 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	-$(MAKE) AUTOMAKE=echo distclean
 	dh_clean
 
 install: build
@@ -21,7 +21,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) prefix=$(workdir)/usr install
+	$(MAKE) AUTOMAKE=echo prefix=$(workdir)/usr install
 
 	# Renamed this binary.
 	mv $(workdir)/usr/bin/tobin $(workdir)/usr/bin/dgen_tobin
diff --git a/musa/m68kmake.c b/musa/m68kmake.c
index 8fa3bd2..7823a68 100644
--- a/musa/m68kmake.c
+++ b/musa/m68kmake.c
@@ -1029,9 +1029,10 @@ void add_table_header(FILE* filep)
 	fprintf(filep, "/* ========================= OPCODE TABLE BUILDER ========================= */\n");
 	fprintf(filep, "/* ======================================================================== */\n\n");
 
+	fprintf(filep, "#include <stdlib.h>\n\n"); /* moved here for gcc 4.0 */
 	fprintf(filep, "#include \"m68kops.h\"\n");
 	fprintf(filep, "#include \"m68kcpu.h\"\n");
-	fprintf(filep, "#include <stdlib.h>\n\n");
+	/*fprintf(filep, "#include <stdlib.h>\n\n");*/
 	fprintf(filep, "#include <string.h>\n\n");
 
 	fprintf(filep, "extern void  (*m68k_instruction_jump_table[])(void); /* opcode handler jump table */\n\n");
diff --git a/star/star.c b/star/star.c
index 9d67fed..3218926 100644
--- a/star/star.c
+++ b/star/star.c
@@ -1931,7 +1931,6 @@ static void selective_usereg(void) {
 	case aind: case ainc: case adec:
 	case adsp: case axdp:
 		usereg();
-	default:
 	}
 }
 
-- 
2.11.4.GIT