Removed more patches applied upstream.

diff --git a/distrib/debian/patches/libatalk.patch b/distrib/debian/patches/libatalk.patch
deleted file mode 100644 (file)
index 000ab74..0000000
--- a/distrib/debian/patches/libatalk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- netatalk.cvs/libatalk/dummy.c
-+++ netatalk.debian/libatalk/dummy.c
-@@ -0,0 +1,1 @@
-+
---- netatalk.cvs/libatalk/Makefile.am
-+++ netatalk.debian/libatalk/Makefile.am
-@@ -1,19 +1,11 @@
- # Makefile.am for libatalk/
- 
--# FIXME: Included manually, because for some strange reason automake doesn't.
--# (srittau)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
--
- SUBDIRS = adouble asp atp compat dsi nbp netddp util
- 
- lib_LTLIBRARIES = libatalk.la
- 
- LIBATALK_DEPS = asp/libasp.la atp/libatp.la nbp/libnbp.la adouble/libadouble.la dsi/libdsi.la util/libutil.la compat/libcompat.la netddp/libnetddp.la asp/libasp.la
- 
--libatalk_la_SOURCES =
-+libatalk_la_SOURCES = dummy.c
- libatalk_la_LIBADD  = ${LIBATALK_DEPS}
- libatalk_la_LDFLAGS = -static
--
--#libatalk.a: ${LIBATALK_DEPS}
--#     ${LIBTOOL} --mode=link ${LIBATALK_DEPS} -o libatalk.a

diff --git a/distrib/debian/patches/megatron.patch b/distrib/debian/patches/megatron.patch
deleted file mode 100644 (file)
index dcdd03f..0000000
--- a/distrib/debian/patches/megatron.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- netatalk.cvs/bin/megatron/macbin.c
-+++ netatalk.debian/bin/megatron/macbin.c
-@@ -18,6 +18,12 @@
- #include <netatalk/endian.h>
- #include "megatron.h"
- 
-+/* This allows megatron to generate .bin files that won't choke other
-+   well-known converter apps.  It also makes sure that checksums
-+   always match. (RLB) */
-+#define MACBINARY_PLAY_NICE_WITH_OTHERS
-+
-+
- /*    String used to indicate standard input instead of a disk
-       file.  Should be a string not normally used for a file
-  */
-@@ -237,7 +243,10 @@
-     int                       writelen;
-     int                       cc = 0;
-     off_t             pos;
--    u_char            padchar = 0;
-+    u_char            padchar = 0x7f; /* Not sure why, but it seems
-+                                         this must be 0x7f to match
-+                                         other converters, not
-+                                         0. (RLB) */
- 
- #if DEBUG >= 3
-     fprintf( stderr, "bin_write: fork is %s\n", forkname[ fork ] );
-@@ -352,8 +361,14 @@
-     fh->mod_date = AD_DATE_FROM_UNIX(fh->mod_date);
-     fh->backup_date = AD_DATE_START;
-     memcpy( &fh->finder_info, head_buf +  65, 8 );
-+
-+#ifndef MACBINARY_PLAY_NICE_WITH_OTHERS /* (RLB) */
-     memcpy( &fh->finder_info.fdFlags, head_buf + 73, 1 );
-     fh->finder_info.fdFlags &= mask;
-+#else
-+    memcpy( &fh->finder_info.fdFlags, head_buf + 73, 2 );
-+#endif
-+
-     memcpy(&fh->finder_info.fdLocation, head_buf + 75, 4 );
-     memcpy(&fh->finder_info.fdFldr, head_buf +  79, 2 );
-     memcpy(&fh->forklen[ DATA ],  head_buf + 83, 4 );
-@@ -370,6 +385,7 @@
- #if DEBUG >= 5
-     {
-       short           flags;
-+      long            flags_long;
- 
-       fprintf( stderr, "Values read by bin_header_read\n" );
-       fprintf( stderr, "name length\t\t%d\n", head_buf[ 1 ] );
-@@ -383,6 +399,13 @@
-       memcpy( &flags, &fh->finder_info.fdFlags, sizeof( flags ));
-       flags = ntohs( flags );
-       fprintf( stderr, "flags\t\t\t%x\n", flags );
-+
-+      /* Show fdLocation too (RLB) */
-+      memcpy( &flags_long, &fh->finder_info.fdLocation,
-+              sizeof( flags_long ));
-+      flags_long = ntohl( flags_long );
-+      fprintf( stderr, "location flags\t\t%lx\n", flags_long );
-+
-       fprintf( stderr, "data fork length\t%ld\n", bin.forklen[DATA] );
-       fprintf( stderr, "resource fork length\t%ld\n", bin.forklen[RESOURCE] );
-       fprintf( stderr, "\n" );
-@@ -411,7 +434,13 @@
-     head_buf[ 1 ] = (u_char)strlen( fh->name );
-     memcpy( head_buf + 2, fh->name, head_buf[ 1 ] );
-     memcpy( head_buf + 65, &fh->finder_info, 8 );
--    memcpy( head_buf + 73, &fh->finder_info.fdFlags, 1);
-+
-+#ifndef MACBINARY_PLAY_NICE_WITH_OTHERS /* (RLB) */
-+    memcpy( head_buf + 73, &fh->finder_info.fdFlags, 1 );
-+#else
-+    memcpy( head_buf + 73, &fh->finder_info.fdFlags, 2 );
-+#endif
-+
-     memcpy( head_buf + 75, &fh->finder_info.fdLocation, 4 );
-     memcpy( head_buf + 79, &fh->finder_info.fdFldr, 2 );
-     memcpy( head_buf + 83, &fh->forklen[ DATA ], 4 );
-@@ -440,11 +469,25 @@
- 
- #if DEBUG >= 5
-     {
-+      short flags;
-+      long  flags_long;
-+
-       fprintf( stderr, "Values written by bin_header_write\n" );
-       fprintf( stderr, "name length\t\t%d\n", head_buf[ 1 ] );
-       fprintf( stderr, "file name\t\t%s\n", (char *)&head_buf[ 2 ] );
-       fprintf( stderr, "type\t\t\t%.4s\n", (char *)&head_buf[ 65 ] );
-       fprintf( stderr, "creator\t\t\t%.4s\n", (char *)&head_buf[ 69 ] );
-+
-+      memcpy( &flags, &fh->finder_info.fdFlags, sizeof( flags ));
-+      flags = ntohs( flags );
-+      fprintf( stderr, "flags\t\t\t%x\n", flags );
-+
-+      /* Show fdLocation too (RLB) */
-+      memcpy( &flags_long, &fh->finder_info.fdLocation,
-+              sizeof( flags_long ));
-+      flags_long = ntohl( flags_long );
-+      fprintf( stderr, "location flags\t\t%lx\n", flags_long );
-+
-       fprintf( stderr, "data fork length\t%ld\n", bin.forklen[DATA] );
-       fprintf( stderr, "resource fork length\t%ld\n", bin.forklen[RESOURCE] );
-       fprintf( stderr, "\n" );