Package: atari800
Version: 1.3.2-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my atari800 1.3.2-1.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u atari800-1.3.2/debian/changelog atari800-1.3.2/debian/changelog
--- atari800-1.3.2/debian/changelog
+++ atari800-1.3.2/debian/changelog
@@ -1,3 +1,14 @@
+atari800 (1.3.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. (Closes: #346876)
+ * Remove static declarations of variables followed by non-static
+ declarations of the same variables; fixes FTBFS on gcc-4.0, patch from
+ Andreas Jochens. (Closes: #297011)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sat, 21 Jan 2006 03:02:51 +0100
+
atari800 (1.3.2-1) unstable; urgency=low
* New upstream source and new maintainer (closes: #226787).
diff -u atari800-1.3.2/debian/control atari800-1.3.2/debian/control
--- atari800-1.3.2/debian/control
+++ atari800-1.3.2/debian/control
@@ -2,7 +2,7 @@
Section: contrib/otherosfs
Priority: optional
Maintainer: Martin Albert <[EMAIL PROTECTED]>
-Build-Depends: xlibs-dev, libsdl1.2-dev, libncurses-dev, zlib1g-dev
+Build-Depends: libx11-dev, libxext-dev, libxt-dev, x-dev, libsdl1.2-dev,
libncurses-dev, zlib1g-dev
Standards-Version: 3.1.1.1
Package: atari800
only in patch2:
unchanged:
--- atari800-1.3.2.orig/src/atari_x11.c
+++ atari800-1.3.2/src/atari_x11.c
@@ -215,7 +215,7 @@
static int keypad_trig = 1; /* Keypad Trigger Position */
static int keypad_stick = 0x0f; /* Keypad Joystick Position */
-static int mouse_mode = -1; /* Joystick, Paddle and Light Pen */
+static int mouse_mode_local = -1; /* Joystick, Paddle and Light Pen */
static int mouse_stick; /* Mouse Joystick Position */
static int js0_mode = -1;
@@ -1174,7 +1174,7 @@
new_mode = xv_get(keypad_item, PANEL_VALUE);
- if ((new_mode != mouse_mode) &&
+ if ((new_mode != mouse_mode_local) &&
(new_mode != js0_mode) &&
(new_mode != js1_mode)) {
keypad_mode = new_mode;
@@ -1196,12 +1196,12 @@
if ((new_mode != keypad_mode) &&
(new_mode != js0_mode) &&
(new_mode != js1_mode)) {
- mouse_mode = new_mode;
+ mouse_mode_local = new_mode;
}
else {
sorry_message();
xv_set(mouse_item,
- PANEL_VALUE, mouse_mode,
+ PANEL_VALUE, mouse_mode_local,
NULL);
}
}
@@ -1214,7 +1214,7 @@
new_mode = xv_get(js0_item, PANEL_VALUE);
if ((new_mode != keypad_mode) &&
- (new_mode != mouse_mode) &&
+ (new_mode != mouse_mode_local) &&
(new_mode != js1_mode)) {
js0_mode = new_mode;
}
@@ -1233,7 +1233,7 @@
new_mode = xv_get(js1_item, PANEL_VALUE);
if ((new_mode != keypad_mode) &&
- (new_mode != mouse_mode) &&
+ (new_mode != mouse_mode_local) &&
(new_mode != js0_mode)) {
js1_mode = new_mode;
}
@@ -1692,7 +1692,7 @@
}
#endif
- mouse_mode = mode++;
+ mouse_mode_local = mode++;
if (keypad_mode == -1)
keypad_mode = mode++;
@@ -1879,7 +1879,7 @@
"Paddle 8",
"Light Pen",
NULL,
-
PANEL_VALUE, mouse_mode,
+
PANEL_VALUE, mouse_mode_local,
PANEL_NOTIFY_PROC, mouse_callback,
NULL);
ypos += 25;
@@ -2531,7 +2531,7 @@
Atari_WhatIs(keypad_mode);
printf("\n");
printf("Mouse is ");
- Atari_WhatIs(mouse_mode);
+ Atari_WhatIs(mouse_mode_local);
printf("\n");
printf("/dev/js0 is ");
Atari_WhatIs(js0_mode);
@@ -3415,12 +3415,12 @@
else if (keypad_mode == 1)
nibble_1 = keypad_stick;
- if (mouse_mode == 0) {
- mouse_joystick(mouse_mode);
+ if (mouse_mode_local == 0) {
+ mouse_joystick(mouse_mode_local);
nibble_0 = mouse_stick;
}
else if (mouse_mode == 1) {
- mouse_joystick(mouse_mode);
+ mouse_joystick(mouse_mode_local);
nibble_1 = mouse_stick;
}
#ifdef LINUX_JOYSTICK
@@ -3448,12 +3448,12 @@
else if (keypad_mode == 3)
nibble_1 = keypad_stick;
- if (mouse_mode == 2) {
- mouse_joystick(mouse_mode);
+ if (mouse_mode_local == 2) {
+ mouse_joystick(mouse_mode_local);
nibble_0 = mouse_stick;
}
else if (mouse_mode == 3) {
- mouse_joystick(mouse_mode);
+ mouse_joystick(mouse_mode_local);
nibble_1 = mouse_stick;
}
#ifdef LINUX_JOYSTICK
@@ -3486,7 +3486,7 @@
if (num == keypad_mode) {
trig = keypad_trig;
}
- if (num == mouse_mode) {
+ if (num == mouse_mode_local) {
Window root_return;
Window child_return;
int root_x_return;
@@ -3558,7 +3558,7 @@
{
int pot;
- if (num == (mouse_mode - 4)) {
+ if (num == (mouse_mode_local - 4)) {
Window root_return;
Window child_return;
int root_x_return;
only in patch2:
unchanged:
--- atari800-1.3.2.orig/src/sndsave.h
+++ atari800-1.3.2/src/sndsave.h
@@ -4,7 +4,6 @@
#include "atari.h"
#include <stdio.h>
-extern FILE *sndoutput;
extern int iSoundRate;
typedef int BOOL;
