Index: dpkg-deb/Makefile.in
--- dpkg-deb/Makefile.in.orig	2006-10-13 15:37:53 +0200
+++ dpkg-deb/Makefile.in	2006-11-18 14:11:58 +0100
@@ -140,7 +140,7 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
Index: dpkg-split/Makefile.in
--- dpkg-split/Makefile.in.orig	2006-10-13 15:37:54 +0200
+++ dpkg-split/Makefile.in	2006-11-18 14:11:58 +0100
@@ -141,7 +141,7 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
Index: dselect/Makefile.in
--- dselect/Makefile.in.orig	2006-10-13 15:37:54 +0200
+++ dselect/Makefile.in	2006-11-18 14:11:58 +0100
@@ -156,7 +156,7 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
Index: lib/Makefile.in
--- lib/Makefile.in.orig	2006-10-13 15:37:55 +0200
+++ lib/Makefile.in	2006-11-18 14:11:58 +0100
@@ -77,7 +77,7 @@
 	showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \
 	utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT)
 libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/getopt -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
Index: lib/tarfn.c
--- lib/tarfn.c.orig	2006-06-21 15:41:12 +0200
+++ lib/tarfn.c	2006-11-18 14:11:58 +0100
@@ -60,7 +60,9 @@
 	int	len;
 	char *	str;
 
-	len = strnlen(s, size);
+	len = strlen(s);
+    if (len > size)
+        len = size;
 	str = malloc(len + 1);
 	memcpy(str, s, len);
 	str[len] = 0;
Index: man/Makefile.in
--- man/Makefile.in.orig	2006-10-13 15:37:55 +0200
+++ man/Makefile.in	2006-11-18 14:11:58 +0100
@@ -214,7 +214,7 @@
 target_vendor = @target_vendor@
 
 # po4a must be the first sub-directory because it generates the translations.
-SUBDIRS = C po4a de es fr hu ja pl pt_BR ru sv
+SUBDIRS = C
 all: all-recursive
 
 .SUFFIXES:
Index: scripts/Makefile.in
--- scripts/Makefile.in.orig	2006-10-13 15:37:57 +0200
+++ scripts/Makefile.in	2006-11-18 14:14:34 +0100
@@ -694,11 +694,11 @@
 	$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
-	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
+	$(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives
+	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README
 
 uninstall-local:
-	rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
+	rm -f $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README
 	rm -f $(DESTDIR)$(sbindir)/install-info
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: src/Makefile.in
--- src/Makefile.in.orig	2006-10-13 15:37:58 +0200
+++ src/Makefile.in	2006-11-18 14:11:58 +0100
@@ -82,7 +82,7 @@
 	query.$(OBJEXT)
 dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS)
 dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/getopt -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -147,7 +147,7 @@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+LIBS = $(top_builddir)/getopt/libopt.a @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@