michael@49: Index: dpkg-deb/Makefile.in
michael@49: --- dpkg-deb/Makefile.in.orig	2008-03-30 11:58:18 +0200
michael@49: +++ dpkg-deb/Makefile.in	2008-04-01 21:56:55 +0200
michael@49: @@ -213,8 +213,7 @@
michael@49:  	main.c
michael@49:  
michael@49:  dpkg_deb_LDADD = \
michael@49: -	../libcompat/libcompat.a \
michael@49: -	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
michael@49: +	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a
michael@49:  
michael@49:  all: all-am
michael@49:  
michael@49: Index: dpkg-split/Makefile.in
michael@49: --- dpkg-split/Makefile.in.orig	2008-03-30 11:58:18 +0200
michael@49: +++ dpkg-split/Makefile.in	2008-04-01 21:57:43 +0200
michael@49: @@ -217,9 +217,8 @@
michael@49:  	split.c
michael@49:  
michael@49:  dpkg_split_LDADD = \
michael@49: -	../libcompat/libcompat.a \
michael@49:  	$(LIBINTL) \
michael@49: -	../lib/libdpkg.a
michael@49: +	../lib/libdpkg.a ../libcompat/libcompat.a
michael@49:  
michael@49:  pkglib_SCRIPTS = mksplit
michael@49:  EXTRA_DIST = mksplit.pl
michael@49: Index: dselect/Makefile.in
michael@49: --- dselect/Makefile.in.orig	2008-03-30 11:58:18 +0200
michael@49: +++ dselect/Makefile.in	2008-04-01 21:56:55 +0200
michael@49: @@ -249,10 +249,9 @@
michael@49:  	pkgtop.cc
michael@49:  
michael@49:  dselect_LDADD = \
michael@49: -	../libcompat/libcompat.a \
michael@49:  	$(LIBINTL) \
michael@49:  	$(CURSES_LIBS) \
michael@49: -	../lib/libdpkg.a
michael@49: +	../lib/libdpkg.a ../libcompat/libcompat.a
michael@49:  
michael@49:  EXTRA_DIST = keyoverride mkcurkeys.pl
michael@49:  CLEANFILES = curkeys.h
michael@49: @@ -640,8 +639,8 @@
michael@49:  
michael@49:  curkeys.$(OBJEXT): curkeys.h
michael@49:  curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
michael@49: -	cursesfile=`echo '#include <ncursesw/curses.h>' | \
michael@49: -		$(CC) -E - | grep 'curses.h' | head -n 1 | \
michael@49: +	cursesfile=`echo '#include <ncurses/curses.h>' | \
michael@49: +		$(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \
michael@49:  		sed -e 's/^[^"]*"//; s/".*$$//'`; \
michael@49:  	if [ "$$cursesfile" = "" ]; then \
michael@49:  		echo "can't find curses file"; exit 1; \
michael@49: Index: dselect/dselect.h
michael@49: --- dselect/dselect.h.orig	2008-03-30 11:57:41 +0200
michael@49: +++ dselect/dselect.h	2008-04-01 21:56:55 +0200
michael@49: @@ -28,7 +28,7 @@
michael@49:  
michael@49:  #include <signal.h>
michael@49:  #undef ERR
michael@49: -#include <ncursesw/curses.h>
michael@49: +#include <ncurses/curses.h>
michael@49:  
michael@49:  struct helpmenuentry {
michael@49:    char key;
michael@49: Index: dselect/main.cc
michael@49: --- dselect/main.cc.orig	2008-03-30 11:57:41 +0200
michael@49: +++ dselect/main.cc	2008-04-01 21:56:55 +0200
michael@49: @@ -37,7 +37,7 @@
michael@49:  #include <ctype.h>
michael@49:  #include <assert.h>
michael@49:  
michael@49: -#include <ncursesw/term.h>
michael@49: +#include <ncurses/term.h>
michael@49:  
michael@49:  extern "C" {
michael@49:  #include <dpkg.h>
michael@49: Index: lib/tarfn.c
michael@49: --- lib/tarfn.c.orig	2008-03-30 10:58:51 +0200
michael@49: +++ lib/tarfn.c	2008-04-01 21:56:55 +0200
michael@49: @@ -62,7 +62,9 @@
michael@49:  	int	len;
michael@49:  	char *	str;
michael@49:  
michael@49: -	len = strnlen(s, size);
michael@49: +	len = strlen(s);
michael@49: +    if (len > size)
michael@49: +        len = size;
michael@49:  	str = m_malloc(len + 1);
michael@49:  	memcpy(str, s, len);
michael@49:  	str[len] = 0;
michael@49: Index: man/Makefile.in
michael@49: --- man/Makefile.in.orig	2008-03-30 11:58:18 +0200
michael@49: +++ man/Makefile.in	2008-04-01 21:56:55 +0200
michael@49: @@ -189,7 +189,7 @@
michael@49:  top_srcdir = @top_srcdir@
michael@49:  
michael@49:  # Extract the list of languages from the po4a config file.
michael@49: -LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg)
michael@49: +LINGUAS =
michael@49:  dist_man_MANS = \
michael@49:  	822-date.1 \
michael@49:  	cleanup-info.8 \
michael@49: @@ -540,7 +540,7 @@
michael@49:  all-local: all-local-@USE_NLS@
michael@49:  
michael@49:  all-local-no:
michael@49: -all-local-yes: man.stamp
michael@49: +all-local-yes:
michael@49:  
michael@49:  # FIXME: Use a stamp file until po4a supports them internally.
michael@49:  man.stamp:
michael@49: Index: scripts/Makefile.in
michael@49: --- scripts/Makefile.in.orig	2008-03-30 11:58:19 +0200
michael@49: +++ scripts/Makefile.in	2008-04-01 21:56:55 +0200
michael@49: @@ -757,8 +757,8 @@
michael@49:  	$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
michael@49:  
michael@49:  install-data-local:
michael@49: -	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
michael@49: -	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
michael@49: +	$(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives
michael@49: +	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README
michael@49:  
michael@49:  # Ideally we'd use 'sed -i', but unfortunately that's not portable.
michael@49:  install-data-hook:
michael@49: Index: src/Makefile.in
michael@49: --- src/Makefile.in.orig	2008-03-30 11:58:19 +0200
michael@49: +++ src/Makefile.in	2008-04-01 21:56:55 +0200
michael@49: @@ -239,8 +239,8 @@
michael@49:  	update.c
michael@49:  
michael@49:  dpkg_LDADD = \
michael@49: -	../libcompat/libcompat.a \
michael@49: -	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
michael@49: +	\
michael@49: +	$(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a 
michael@49:  
michael@49:  dpkg_query_SOURCES = \
michael@49:  	errors.c \
michael@49: @@ -248,17 +248,17 @@
michael@49:  	query.c
michael@49:  
michael@49:  dpkg_query_LDADD = \
michael@49: -	../libcompat/libcompat.a \
michael@49: +	\
michael@49:  	$(LIBINTL) \
michael@49: -	../lib/libdpkg.a
michael@49: +	../lib/libdpkg.a ../libcompat/libcompat.a 
michael@49:  
michael@49:  dpkg_trigger_SOURCES = \
michael@49:  	trigcmd.c
michael@49:  
michael@49:  dpkg_trigger_LDADD = \
michael@49: -	../libcompat/libcompat.a \
michael@49: +	\
michael@49:  	$(LIBINTL) \
michael@49: -	../lib/libdpkg.a
michael@49: +	../lib/libdpkg.a ../libcompat/libcompat.a 
michael@49:  
michael@49:  all: all-am
michael@49: