Package: atari-fdisk
Version: 0.7.1-5.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my atari-fdisk 0.7.1-5.2 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -Nru /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/changelog
/tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/changelog
--- /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/changelog 2004-08-19
08:06:13.000000000 +0200
+++ /tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/changelog 2006-10-23
20:32:43.000000000 +0200
@@ -1,3 +1,15 @@
+atari-fdisk (0.7.1-5.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS due to kernel syscall macros (Closes: #392554, #393024).
+ * Add amd64 as a supported arch (Closes: #248795).
+ * Remove XSI:ism in postinst (Closes: #254777).
+ * Add XB-Subarchitecture: atari q40 for udeb (Closes: #250582).
+ * Fix FSF's address.
+ * Use dpkg --print-architecture instead of --print-gnu-build-architecture.
+
+ -- Luk Claes <[EMAIL PROTECTED]> Mon, 23 Oct 2006 20:31:47 +0200
+
atari-fdisk (0.7.1-5.1) unstable; urgency=high
* NMU
diff -Nru /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/control
/tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/control
--- /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/control 2004-08-19
08:00:20.000000000 +0200
+++ /tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/control 2006-10-23
20:31:45.000000000 +0200
@@ -18,12 +18,13 @@
Section: debian-installer
Priority: standard
Architecture: m68k
+XB-Subarchitecture: atari q40
Depends: ${shlibs:Depends}
Description: Partition editor for Atari
atari-fdisk udeb package
Package: atari-fdisk-cross
-Architecture: alpha arm hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sh
sparc
+Architecture: alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel powerpc
s390 sh sparc
Section: otherosfs
Priority: extra
Depends: ${shlibs:Depends}
diff -Nru /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/copyright
/tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/copyright
--- /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/copyright 2003-09-22
22:22:26.000000000 +0200
+++ /tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/copyright 2006-10-23
20:33:43.000000000 +0200
@@ -21,7 +21,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff -Nru /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/postinst
/tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/postinst
--- /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/postinst 2003-09-22
22:22:26.000000000 +0200
+++ /tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/postinst 2006-10-23
20:30:49.000000000 +0200
@@ -22,7 +22,7 @@
Motorola) # MVME
;;
esac
- if [ -n "$machine" -a -f /sbin/$machine-fdisk ]; then
+ if [ -n "$machine" ] && [ -f /sbin/$machine-fdisk ]; then
ln -sf $machine-fdisk /sbin/fdisk
else
echo "No native fdisk for this machine type!"
diff -Nru /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/rules
/tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/rules
--- /tmp/iLNelM3ITg/atari-fdisk-0.7.1/debian/rules 2004-02-29
17:55:11.000000000 +0100
+++ /tmp/cDyaqEu26D/atari-fdisk-0.7.1/debian/rules 2006-10-23
20:32:53.000000000 +0200
@@ -4,7 +4,7 @@
#export DH_VERBOSE=1
-BUILDARCH = $(shell dpkg --print-gnu-build-architecture)
+BUILDARCH = $(shell dpkg --print-architecture)
packn = atari-fdisk
packu = atari-fdisk-udeb
diff -Nru /tmp/iLNelM3ITg/atari-fdisk-0.7.1/disk.c
/tmp/cDyaqEu26D/atari-fdisk-0.7.1/disk.c
--- /tmp/iLNelM3ITg/atari-fdisk-0.7.1/disk.c 2003-09-22 22:27:09.000000000
+0200
+++ /tmp/cDyaqEu26D/atari-fdisk-0.7.1/disk.c 2006-10-23 20:35:51.000000000
+0200
@@ -65,7 +65,7 @@
#include <string.h>
#include <unistd.h>
#ifdef __linux__
-#include <asm/unistd.h>
+#include <sys/syscall.h>
#endif
#include <fcntl.h>
#include <errno.h>
@@ -87,10 +87,9 @@
* know about the loff_t type.
*/
-#ifdef __NR__llseek
+#ifdef SYS__llseek
-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
- loff_t *, res, uint, wh );
+#define _llseek(fd, hi, lo, res, wh) syscall(SYS__llseek, fd, hi, lo, res, wh)
/* seek to a sector */
int sseek( unsigned int fd, unsigned long s )
