Hello,
I'm doing an NMU of apple2 to fix the build failure and other
long-standing bugs; diff attached.
Thanks,
Matej
diff -u apple2-0.7.4/debian/changelog apple2-0.7.4/debian/changelog
--- apple2-0.7.4/debian/changelog
+++ apple2-0.7.4/debian/changelog
@@ -1,3 +1,20 @@
+apple2 (0.7.4-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Replace build dependency on xlibs-dev with libx11-dev, libxt-dev
+ (the latter only because of AC_PATH_XTRA). Closes: #346845.
+ * src/disk.c, src/vidsup.c: Lvalue casts are a no-no with gcc 4.0.
+ Closes: #349113.
+ * Use `Depends: debconf | debconf-2.0' to allow for cdebconf.
+ Closes: #331743.
+ * debian/po/de.po: Apply corrections from Jens Seidel. Closes: #314121.
+ * debian/po/it.po: Add translation by Luca Bruno. Closes: #325628.
+ * debian/po/pt.po: Add translation by Marco Ferra. Closes: #341556.
+ * debian/po/sv.po: Add translation by Daniel Nylander. Closes: #330345.
+ * debian/changelog: Remove obsolete Emacs local variables.
+
+ -- Matej Vela <[EMAIL PROTECTED]> Thu, 26 Jan 2006 09:01:56 +0100
+
apple2 (0.7.4-3.1) unstable; urgency=low
* Non-maintainer upload for fixing longstanding l10n bugs
@@ -121,4 +137,0 @@
-
-Local variables:
-mode: debian-changelog
-End:
diff -u apple2-0.7.4/debian/po/de.po apple2-0.7.4/debian/po/de.po
--- apple2-0.7.4/debian/po/de.po
+++ apple2-0.7.4/debian/po/de.po
@@ -45 +45 @@
-"stellen Sie sicher, dass diese nur f�¼r zuverl�¤sige Benutzer ausf�¼hrbar
sind."
+"stellen Sie sicher, dass diese nur f�¼r zuverl�¤ssige Benutzer ausf�¼hrbar
sind."
diff -u apple2-0.7.4/debian/po/zh_TW.po apple2-0.7.4/debian/po/zh_TW.po
--- apple2-0.7.4/debian/po/zh_TW.po
+++ apple2-0.7.4/debian/po/zh_TW.po
@@ -29,9 +29,15 @@
+#. Description
#: ../xapple2.templates:3
msgid "If you want sound the xapple2 binaries must run suid root."
msgstr "如果您希望 xapple2 二進制檔案能使用音效，必須以 suid root 啟動。"
#. Type: note
+#. Description
#: ../xapple2.templates:3
-msgid "The binaries aren't suid root for security reasons, it has not been
proven suid safe - do not allow untrusted users (with shell access) to run it
if you choose to make it suid."
-msgstr "由於安全性考量，該二進制檔案不是 suid root 權限，使用 suid 並不安全 — 如果您選擇以 suid
啟動，請禁止不可信任的帳號(shell 存取)執行它。"
-
+msgid ""
+"The binaries aren't suid root for security reasons, it has not been proven "
+"suid safe - do not allow untrusted users (with shell access) to run it if "
+"you choose to make it suid."
+msgstr ""
+"由於安全性考量，該二進制檔案不是 suid root 權限，使用 suid 並不安全 — 如果您"
+"選擇以 suid 啟動，請禁止不可信任的帳號(shell 存取)執行它。"
diff -u apple2-0.7.4/debian/control apple2-0.7.4/debian/control
--- apple2-0.7.4/debian/control
+++ apple2-0.7.4/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Tom Lear <[EMAIL PROTECTED]>
Standards-Version: 3.6.1.1
-Build-Depends: debhelper (>= 4.1.16), libsvga1-dev, xlibs-dev
+Build-Depends: debhelper (>= 4.1.16), libsvga1-dev, libx11-dev, libxt-dev
Package: apple2
Architecture: i386
@@ -34,7 +34,7 @@
Package: xapple2
Architecture: i386
-Depends: apple2 (= ${Source-Version}), ${shlibs:Depends}, debconf (>= 1.2.0)
+Depends: apple2 (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Apple ][ Emulator
This is a fully-functional 100% Apple ][ emulator for X windows.
.
only in patch2:
unchanged:
--- apple2-0.7.4.orig/src/disk.c
+++ apple2-0.7.4/src/disk.c
@@ -193,7 +193,7 @@
fseek(disk6.disk[disk6.drive].fp, PHASE_BYTES *
disk6.disk[disk6.drive].phase, SEEK_SET);
disk6.disk[disk6.drive].phase_change = 0;
}
- ch = (unsigned char) disk6.disk_byte = fgetc(disk6.disk[disk6.drive].fp);
+ disk6.disk_byte = ch = fgetc(disk6.disk[disk6.drive].fp);
/* track revolves... */
if (ftell(disk6.disk[disk6.drive].fp) == (PHASE_BYTES *
(disk6.disk[disk6.drive].phase + 2)))
fseek(disk6.disk[disk6.drive].fp, -2 * PHASE_BYTES, SEEK_CUR);
only in patch2:
unchanged:
--- apple2-0.7.4.orig/src/vidsup.c
+++ apple2-0.7.4/src/vidsup.c
@@ -438,7 +438,7 @@
/* hires page offsets. initialize to invalid values. */
for (i = 0; i < 8192; i++) {
- (long)(video__screen_addresses[i]) = -1;
+ ((int *) video__screen_addresses)[i] = -1;
}
for (y = 0; y < 24; y++) {
only in patch2:
unchanged:
--- apple2-0.7.4.orig/debian/po/it.po
+++ apple2-0.7.4/debian/po/it.po
@@ -0,0 +1,34 @@
+# Italian translation of apple2_0.7.4-3.1_it.po
+# Luca Bruno, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apple2_0.7.4-3.1_it\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-23 16:28-0800\n"
+"PO-Revision-Date: 2005-08-21 21:07+0200\n"
+"Last-Translator: Luca Bruno <[EMAIL PROTECTED]>\n"
+"Language-Team: Italian <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../xapple2.templates:3
+msgid "If you want sound the xapple2 binaries must run suid root."
+msgstr ""
+"Se si vuole il sonoro, i programmi di xapple2 devono essere eseguiti con "
+"suid root."
+
+#. Type: note
+#. Description
+#: ../xapple2.templates:3
+msgid ""
+"The binaries aren't suid root for security reasons, it has not been proven "
+"suid safe - do not allow untrusted users (with shell access) to run it if "
+"you choose to make it suid."
+msgstr ""
+"I programmi non sono impostati suid root per motivi di sicurezza, poich�¨ non
"
+"�¨ assicurato che siano sicuri come suid - non permetterne l'esecuzione a "
+"utenti non fidati (con accesso di shell) se si �¨ scelto di renderlo suid."
only in patch2:
unchanged:
--- apple2-0.7.4.orig/debian/po/sv.po
+++ apple2-0.7.4/debian/po/sv.po
@@ -0,0 +1,41 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apple2 0.7.4-3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-23 16:28-0800\n"
+"PO-Revision-Date: 2005-09-27 18:53-0700\n"
+"Last-Translator: Daniel Nylander <[EMAIL PROTECTED]>\n"
+"Language-Team: Swedish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../xapple2.templates:3
+msgid "If you want sound the xapple2 binaries must run suid root."
+msgstr "Om du vill ha ljud i xapple2 m�ste bin�rerna vara suid-root."
+
+#. Type: note
+#. Description
+#: ../xapple2.templates:3
+msgid ""
+"The binaries aren't suid root for security reasons, it has not been proven "
+"suid safe - do not allow untrusted users (with shell access) to run it if "
+"you choose to make it suid."
+msgstr ""
+"Bin�rerna �r inte suid-root av s�kerhetssk�l, de har inte ansetts som suid "
+"s�kra - till�t inte otill�tna anv�ndare (med shell access) att starta den om "
+"du v�ljer att g�ra den suid."
only in patch2:
unchanged:
--- apple2-0.7.4.orig/debian/po/pt.po
+++ apple2-0.7.4/debian/po/pt.po
@@ -0,0 +1,31 @@
+# 2005-11-13 - Marco Ferra <[EMAIL PROTECTED]> (initial translation)
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apple2 0.7.4-3.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-03-23 16:28-0800\n"
+"PO-Revision-Date: 2005-11-13 21:58+0100\n"
+"Last-Translator: Marco Ferra <[EMAIL PROTECTED]>\n"
+"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../xapple2.templates:3
+msgid "If you want sound the xapple2 binaries must run suid root."
+msgstr "Se quer som usando os bin�¡rios do xapple2 tem de os correr com root
suid."
+
+#. Type: note
+#. Description
+#: ../xapple2.templates:3
+msgid ""
+"The binaries aren't suid root for security reasons, it has not been proven "
+"suid safe - do not allow untrusted users (with shell access) to run it if "
+"you choose to make it suid."
+msgstr ""
+"Os bin�¡rios n�£o est�£o com root suid pois ainda n�£o foi provado que sejam "
+"seguros do ponto de vista do suid - n�£o deve permitir que os utilizadores em
"
+"que n�£o confia (com acesso � shell) n�£o os corram se os colocar como suid."
