diff -u xdigger-1.0.10/debian/control xdigger-1.0.10/debian/control --- xdigger-1.0.10/debian/control +++ xdigger-1.0.10/debian/control @@ -1,7 +1,8 @@ Source: xdigger Section: games Priority: optional -Maintainer: Debian Games Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Games Team Uploaders: Barry deFreese , Ansgar Burchardt Standards-Version: 3.8.0 Build-Depends: debhelper (>=5), xutils-dev, libx11-dev, x11proto-core-dev, libxext-dev, quilt diff -u xdigger-1.0.10/debian/changelog xdigger-1.0.10/debian/changelog --- xdigger-1.0.10/debian/changelog +++ xdigger-1.0.10/debian/changelog @@ -1,3 +1,14 @@ +xdigger (1.0.10-12ubuntu1) intrepid; urgency=low + + * Sync with Debian (LP: #243263), additional changes required. + * debian/patches/warn_unused_result.patch: Patch write() calls to take + a result and open() calls to have third parameter with O_CREAT, fixing + FTBFS. + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Iain Lane Sun, 20 Jul 2008 14:32:55 +0100 + xdigger (1.0.10-12) unstable; urgency=low [ Gonéri Le Bouder ] diff -u xdigger-1.0.10/debian/patches/series xdigger-1.0.10/debian/patches/series --- xdigger-1.0.10/debian/patches/series +++ xdigger-1.0.10/debian/patches/series @@ -4,0 +5 @@ +warn_unused_result.patch only in patch2: unchanged: --- xdigger-1.0.10.orig/debian/patches/warn_unused_result.patch +++ xdigger-1.0.10/debian/patches/warn_unused_result.patch @@ -0,0 +1,34 @@ +Index: xdigger-1.0.10/xdigger.c +=================================================================== +--- xdigger-1.0.10.orig/xdigger.c 2008-06-26 16:04:56.856487285 +0100 ++++ xdigger-1.0.10/xdigger.c 2008-06-26 16:11:12.524722556 +0100 +@@ -307,22 +307,23 @@ + void create_audiofiles() + { + int fd; ++ size_t nbytes; + + Fill_TonBuffer(TON_AUDIO_LOW, TON_AUDIO_HIGH, TON_AUDIO_RATE, True); + +- fd = open("audio/diamond.au", O_CREAT | O_WRONLY); ++ fd = open("audio/diamond.au", O_CREAT | O_WRONLY, S_IWRITE|S_IREAD); + fchmod(fd, 0644); +- write(fd, &ton_buffer[TON_DIAMANT], ton_laenge[TON_DIAMANT]+24); ++ nbytes = write(fd, &ton_buffer[TON_DIAMANT], ton_laenge[TON_DIAMANT]+24); + close(fd); + +- fd = open("audio/stone.au", O_CREAT | O_WRONLY); ++ fd = open("audio/stone.au", O_CREAT | O_WRONLY, S_IWRITE|S_IREAD); + fchmod(fd, 0644); +- write(fd, &ton_buffer[TON_STEINE], ton_laenge[TON_STEINE]+24); ++ nbytes = write(fd, &ton_buffer[TON_STEINE], ton_laenge[TON_STEINE]+24); + close(fd); + +- fd = open("audio/step.au", O_CREAT | O_WRONLY); ++ fd = open("audio/step.au", O_CREAT | O_WRONLY, S_IWRITE|S_IREAD); + fchmod(fd, 0644); +- write(fd, &ton_buffer[TON_SCHRITT], ton_laenge[TON_SCHRITT]+24); ++ nbytes = write(fd, &ton_buffer[TON_SCHRITT], ton_laenge[TON_SCHRITT]+24); + close(fd); + exit(0); + }