head 1.12; access; symbols OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_HEAD:1.1; locks; strict; comment @# @; 1.12 date 2009.10.21.16.22.23; author rse; state Exp; branches; next 1.11; commitid euXXyLGzxUBe8q8u; 1.11 date 2009.07.09.09.33.48; author rse; state Exp; branches; next 1.10; commitid UNvU3OJVNKUjd1Vt; 1.10 date 2009.05.21.17.53.21; author rse; state Exp; branches; next 1.9; commitid pi4q4NAMUGwmyLOt; 1.9 date 2009.03.03.20.05.24; author rse; state Exp; branches; next 1.8; commitid F0lk2DwTPxW5PCEt; 1.8 date 2008.04.01.20.03.10; author rse; state Exp; branches; next 1.7; commitid WaM17MfvQiEWBrXs; 1.7 date 2008.01.23.20.03.02; author rse; state Exp; branches; next 1.6; commitid VM1f0dqElSPoPzOs; 1.6 date 2008.01.22.16.04.20; author rse; state Exp; branches; next 1.5; commitid DXZVixetYxTvxqOs; 1.5 date 2007.12.28.09.34.45; author rse; state Exp; branches; next 1.4; commitid oQXGvOKlCDHGbbLs; 1.4 date 2007.12.05.07.23.34; author rse; state Exp; branches; next 1.3; commitid 5az46uGxVtXvcdIs; 1.3 date 2007.09.07.08.26.45; author rse; state Exp; branches; next 1.2; commitid l1VMVDSZX86zpMws; 1.2 date 2007.05.09.05.45.19; author rse; state Exp; branches; next 1.1; commitid VekeHJpsxgRjpdhs; 1.1 date 2006.11.18.13.17.48; author rse; state Exp; branches; next ; commitid sO1uJj3inVbkr9Vr; desc @@ 1.12 log @upgrading package: dpkg 1.15.3.1 -> 1.15.4.1 @ text @Index: lib/dpkg/dpkg-db.h --- lib/dpkg/dpkg-db.h.orig 2009-07-08 11:06:36 +0200 +++ lib/dpkg/dpkg-db.h 2009-07-09 11:29:46 +0200 @@@@ -29,6 +29,7 @@@@ #include #include +#include struct versionrevision { unsigned long epoch; Index: lib/dpkg/tarfn.c --- lib/dpkg/tarfn.c.orig 2009-07-08 11:06:36 +0200 +++ lib/dpkg/tarfn.c 2009-07-09 11:29:46 +0200 @@@@ -66,7 +66,9 @@@@ int len; char * str; - len = strnlen(s, size); + len = strlen(s); + if (len > size) + len = size; str = m_malloc(len + 1); memcpy(str, s, len); str[len] = '\0'; Index: man/Makefile.in --- man/Makefile.in.orig 2009-07-08 11:28:41 +0200 +++ man/Makefile.in 2009-07-09 11:29:46 +0200 @@@@ -197,7 +197,7 @@@@ top_srcdir = @@top_srcdir@@ # Extract the list of languages from the po4a config file. -LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg` +LINGUAS = dist_man_MANS = deb-control.5 deb-version.5 deb-shlibs.5 \ deb-substvars.5 deb-symbols.5 deb-triggers.5 deb-old.5 \ deb-override.5 deb.5 dpkg-architecture.1 dpkg-buildpackage.1 \ @@@@ -523,7 +523,7 @@@@ all-local: all-local-@@USE_NLS@@ all-local-no: -all-local-yes: man.stamp +all-local-yes: # FIXME: Use a stamp file until po4a supports them internally. man.stamp: Index: scripts/Makefile.in --- scripts/Makefile.in.orig 2009-07-08 11:28:41 +0200 +++ scripts/Makefile.in 2009-07-09 11:29:46 +0200 @@@@ -739,8 +739,8 @@@@ $(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 # Ideally we'd use 'sed -i', but unfortunately that's not portable. install-data-hook: @ 1.11 log @upgrading package: dpkg 1.15.3 -> 1.15.3.1 @ text @d1 3 a3 3 Index: lib/dpkg-db.h --- lib/dpkg-db.h.orig 2009-07-08 11:06:36 +0200 +++ lib/dpkg-db.h 2009-07-09 11:29:46 +0200 d12 3 a14 3 Index: lib/tarfn.c --- lib/tarfn.c.orig 2009-07-08 11:06:36 +0200 +++ lib/tarfn.c 2009-07-09 11:29:46 +0200 @ 1.10 log @upgrading package: dpkg 1.15.0 -> 1.15.1 @ text @d2 2 a3 2 --- lib/dpkg-db.h.orig 2009-05-12 20:30:33 +0200 +++ lib/dpkg-db.h 2009-05-21 19:07:17 +0200 d13 2 a14 2 --- lib/tarfn.c.orig 2009-05-02 17:20:48 +0200 +++ lib/tarfn.c 2009-05-21 19:07:17 +0200 d25 1 a25 1 str[len] = 0; d27 2 a28 2 --- man/Makefile.in.orig 2009-05-21 06:49:55 +0200 +++ man/Makefile.in 2009-05-21 19:50:34 +0200 d48 3 a50 3 --- scripts/Makefile.in.orig 2009-05-21 06:49:55 +0200 +++ scripts/Makefile.in 2009-05-21 19:07:17 +0200 @@@@ -736,8 +736,8 @@@@ @ 1.9 log @upgrading package: dpkg 1.14.25 -> 1.15.0 @ text @a0 38 Index: dselect/Makefile.in --- dselect/Makefile.in.orig 2009-03-02 05:14:32 +0100 +++ dselect/Makefile.in 2009-03-03 20:47:50 +0100 @@@@ -642,8 +642,8 @@@@ curkeys.$(OBJEXT): curkeys.h curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl - cursesfile=`echo '#include ' | \ - $(CPP) - | grep 'curses.h' | head -n 1 | \ + cursesfile=`echo '#include ' | \ + $(CPP) $(CPPFLAGS) - | grep 'curses.h' | head -n 1 | \ sed -e 's/^[^"]*"//; s/".*$$//'`; \ if [ "$$cursesfile" = "" ]; then \ echo "can't find curses file"; exit 1; \ Index: dselect/dselect.h --- dselect/dselect.h.orig 2009-03-01 04:15:03 +0100 +++ dselect/dselect.h 2009-03-03 20:47:50 +0100 @@@@ -30,7 +30,7 @@@@ #include #undef ERR -#include +#include struct helpmenuentry { char key; Index: dselect/main.cc --- dselect/main.cc.orig 2009-03-01 04:15:03 +0100 +++ dselect/main.cc 2009-03-03 20:47:50 +0100 @@@@ -43,7 +43,7 @@@@ #include #endif -#include +#include #include #include d2 2 a3 2 --- lib/dpkg-db.h.orig 2009-03-01 04:15:03 +0100 +++ lib/dpkg-db.h 2009-03-03 21:01:27 +0100 d13 2 a14 2 --- lib/tarfn.c.orig 2009-03-01 04:15:03 +0100 +++ lib/tarfn.c 2009-03-03 20:47:50 +0100 d27 3 a29 3 --- man/Makefile.in.orig 2009-03-02 05:14:32 +0100 +++ man/Makefile.in 2009-03-03 20:47:50 +0100 @@@@ -190,7 +190,7 @@@@ d33 1 a33 1 -LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg) d35 4 a38 4 dist_man_MANS = \ 822-date.1 \ deb-control.5 \ @@@@ -543,7 +543,7 @@@@ d48 2 a49 2 --- scripts/Makefile.in.orig 2009-03-02 05:14:32 +0100 +++ scripts/Makefile.in 2009-03-03 20:47:50 +0100 @ 1.8 log @upgrading package: dpkg 1.14.16.6 -> 1.14.17 @ text @a0 27 Index: dpkg-deb/Makefile.in --- dpkg-deb/Makefile.in.orig 2008-03-30 11:58:18 +0200 +++ dpkg-deb/Makefile.in 2008-04-01 21:56:55 +0200 @@@@ -213,8 +213,7 @@@@ main.c dpkg_deb_LDADD = \ - ../libcompat/libcompat.a \ - $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) + $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a all: all-am Index: dpkg-split/Makefile.in --- dpkg-split/Makefile.in.orig 2008-03-30 11:58:18 +0200 +++ dpkg-split/Makefile.in 2008-04-01 21:57:43 +0200 @@@@ -217,9 +217,8 @@@@ split.c dpkg_split_LDADD = \ - ../libcompat/libcompat.a \ $(LIBINTL) \ - ../lib/libdpkg.a + ../lib/libdpkg.a ../libcompat/libcompat.a pkglib_SCRIPTS = mksplit EXTRA_DIST = mksplit.pl d2 3 a4 15 --- dselect/Makefile.in.orig 2008-03-30 11:58:18 +0200 +++ dselect/Makefile.in 2008-04-01 21:56:55 +0200 @@@@ -249,10 +249,9 @@@@ pkgtop.cc dselect_LDADD = \ - ../libcompat/libcompat.a \ $(LIBINTL) \ $(CURSES_LIBS) \ - ../lib/libdpkg.a + ../lib/libdpkg.a ../libcompat/libcompat.a EXTRA_DIST = keyoverride mkcurkeys.pl CLEANFILES = curkeys.h @@@@ -640,8 +639,8 @@@@ d9 1 a9 1 - $(CC) -E - | grep 'curses.h' | head -n 1 | \ d11 1 a11 1 + $(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \ d16 3 a18 3 --- dselect/dselect.h.orig 2008-03-30 11:57:41 +0200 +++ dselect/dselect.h 2008-04-01 21:56:55 +0200 @@@@ -28,7 +28,7 @@@@ d28 5 a32 5 --- dselect/main.cc.orig 2008-03-30 11:57:41 +0200 +++ dselect/main.cc 2008-04-01 21:56:55 +0200 @@@@ -37,7 +37,7 @@@@ #include #include a36 1 extern "C" { d38 12 d51 3 a53 3 --- lib/tarfn.c.orig 2008-03-30 10:58:51 +0200 +++ lib/tarfn.c 2008-04-01 21:56:55 +0200 @@@@ -62,7 +62,9 @@@@ d65 3 a67 3 --- man/Makefile.in.orig 2008-03-30 11:58:18 +0200 +++ man/Makefile.in 2008-04-01 21:56:55 +0200 @@@@ -189,7 +189,7 @@@@ d75 2 a76 2 cleanup-info.8 \ @@@@ -540,7 +540,7 @@@@ d86 3 a88 3 --- scripts/Makefile.in.orig 2008-03-30 11:58:19 +0200 +++ scripts/Makefile.in 2008-04-01 21:56:55 +0200 @@@@ -757,8 +757,8 @@@@ a98 36 Index: src/Makefile.in --- src/Makefile.in.orig 2008-03-30 11:58:19 +0200 +++ src/Makefile.in 2008-04-01 21:56:55 +0200 @@@@ -239,8 +239,8 @@@@ update.c dpkg_LDADD = \ - ../libcompat/libcompat.a \ - $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) + \ + $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a dpkg_query_SOURCES = \ errors.c \ @@@@ -248,17 +248,17 @@@@ query.c dpkg_query_LDADD = \ - ../libcompat/libcompat.a \ + \ $(LIBINTL) \ - ../lib/libdpkg.a + ../lib/libdpkg.a ../libcompat/libcompat.a dpkg_trigger_SOURCES = \ trigcmd.c dpkg_trigger_LDADD = \ - ../libcompat/libcompat.a \ + \ $(LIBINTL) \ - ../lib/libdpkg.a + ../lib/libdpkg.a ../libcompat/libcompat.a all: all-am @ 1.7 log @upgrading package: dpkg 1.14.16.1 -> 1.14.16.4 @ text @d2 12 a13 11 --- dpkg-deb/Makefile.in.orig 2008-01-23 07:46:59 +0100 +++ dpkg-deb/Makefile.in 2008-01-23 20:52:54 +0100 @@@@ -111,7 +111,7 @@@@ LIBICONV = @@LIBICONV@@ LIBINTL = @@LIBINTL@@ LIBOBJS = @@LIBOBJS@@ -LIBS = @@LIBS@@ +LIBS = $(top_builddir)/getopt/libopt.a @@LIBS@@ LTLIBICONV = @@LTLIBICONV@@ LTLIBINTL = @@LTLIBINTL@@ LTLIBOBJS = @@LTLIBOBJS@@ d15 13 a27 11 --- dpkg-split/Makefile.in.orig 2008-01-23 07:46:59 +0100 +++ dpkg-split/Makefile.in 2008-01-23 20:52:54 +0100 @@@@ -112,7 +112,7 @@@@ LIBICONV = @@LIBICONV@@ LIBINTL = @@LIBINTL@@ LIBOBJS = @@LIBOBJS@@ -LIBS = @@LIBS@@ +LIBS = $(top_builddir)/getopt/libopt.a @@LIBS@@ LTLIBICONV = @@LTLIBICONV@@ LTLIBINTL = @@LTLIBINTL@@ LTLIBOBJS = @@LTLIBOBJS@@ d29 49 a77 23 --- dselect/Makefile.in.orig 2008-01-23 07:47:00 +0100 +++ dselect/Makefile.in 2008-01-23 20:52:54 +0100 @@@@ -130,7 +130,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 2008-01-23 07:47:02 +0100 +++ lib/Makefile.in 2008-01-23 20:56:26 +0100 @@@@ -63,7 +63,7 @@@@ showcright.$(OBJEXT) showpkg.$(OBJEXT) tarfn.$(OBJEXT) \ utils.$(OBJEXT) varbuf.$(OBJEXT) vercmp.$(OBJEXT) libdpkg_a_OBJECTS = $(am_libdpkg_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ -I$(top_builddir)/getopt depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ d79 3 a81 3 --- lib/tarfn.c.orig 2008-01-23 07:34:44 +0100 +++ lib/tarfn.c 2008-01-23 20:52:54 +0100 @@@@ -60,7 +60,9 @@@@ d89 1 a89 1 str = malloc(len + 1); d93 3 a95 3 --- man/Makefile.in.orig 2008-01-23 07:47:02 +0100 +++ man/Makefile.in 2008-01-23 20:52:54 +0100 @@@@ -186,7 +186,7 @@@@ d104 1 a104 1 @@@@ -537,7 +537,7 @@@@ d114 3 a116 3 --- scripts/Makefile.in.orig 2008-01-23 07:47:02 +0100 +++ scripts/Makefile.in 2008-01-23 20:52:54 +0100 @@@@ -737,8 +737,8 @@@@ d128 35 a162 20 --- src/Makefile.in.orig 2008-01-23 07:47:02 +0100 +++ src/Makefile.in 2008-01-23 20:56:44 +0100 @@@@ -68,7 +68,7 @@@@ query.$(OBJEXT) dpkg_query_OBJECTS = $(am_dpkg_query_OBJECTS) dpkg_query_DEPENDENCIES = $(am__DEPENDENCIES_1) ../lib/libdpkg.a -DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ -I$(top_builddir)/getopt depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@@@ -118,7 +118,7 @@@@ LIBICONV = @@LIBICONV@@ LIBINTL = @@LIBINTL@@ LIBOBJS = @@LIBOBJS@@ -LIBS = @@LIBS@@ +LIBS = $(top_builddir)/getopt/libopt.a @@LIBS@@ LTLIBICONV = @@LTLIBICONV@@ LTLIBINTL = @@LTLIBINTL@@ LTLIBOBJS = @@LTLIBOBJS@@ @ 1.6 log @upgrading package: dpkg 1.14.15 -> 1.14.16.1 @ text @d2 3 a4 3 --- dpkg-deb/Makefile.in.orig 2008-01-21 12:56:03 +0100 +++ dpkg-deb/Makefile.in 2008-01-22 17:01:02 +0100 @@@@ -116,7 +116,7 @@@@ d14 3 a16 3 --- dpkg-split/Makefile.in.orig 2008-01-21 12:56:04 +0100 +++ dpkg-split/Makefile.in 2008-01-22 17:01:15 +0100 @@@@ -117,7 +117,7 @@@@ d26 3 a28 3 --- dselect/Makefile.in.orig 2008-01-21 12:56:04 +0100 +++ dselect/Makefile.in 2008-01-22 17:01:33 +0100 @@@@ -132,7 +132,7 @@@@ d38 3 a40 3 --- lib/Makefile.in.orig 2008-01-21 12:56:04 +0100 +++ lib/Makefile.in 2008-01-22 17:01:58 +0100 @@@@ -67,7 +67,7 @@@@ d44 2 a45 2 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/getopt d50 2 a51 2 --- lib/tarfn.c.orig 2008-01-21 12:39:01 +0100 +++ lib/tarfn.c 2008-01-22 16:58:27 +0100 d64 4 a67 4 --- man/Makefile.in.orig 2008-01-21 12:56:04 +0100 +++ man/Makefile.in 2008-01-22 16:58:27 +0100 @@@@ -190,7 +190,7 @@@@ target_vendor = @@target_vendor@@ d75 1 a75 1 @@@@ -533,7 +533,7 @@@@ d85 3 a87 3 --- scripts/Makefile.in.orig 2008-01-21 12:56:05 +0100 +++ scripts/Makefile.in 2008-01-22 16:58:27 +0100 @@@@ -731,8 +731,8 @@@@ d99 3 a101 3 --- src/Makefile.in.orig 2008-01-21 12:56:05 +0100 +++ src/Makefile.in 2008-01-22 17:02:19 +0100 @@@@ -72,7 +72,7 @@@@ d105 2 a106 2 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/getopt d110 1 a110 1 @@@@ -123,7 +123,7 @@@@ @ 1.5 log @upgrading package: dpkg 1.14.12 -> 1.14.14 @ text @d2 5 a6 4 --- dpkg-deb/Makefile.in.orig 2007-12-27 12:09:26 +0100 +++ dpkg-deb/Makefile.in 2007-12-28 10:28:09 +0100 @@@@ -141,7 +141,7 @@@@ LIBMULTITHREAD = @@LIBMULTITHREAD@@ a7 1 LIBPTH = @@LIBPTH@@ a9 1 LIBTHREAD = @@LIBTHREAD@@ d12 1 d14 5 a18 4 --- dpkg-split/Makefile.in.orig 2007-12-27 12:09:26 +0100 +++ dpkg-split/Makefile.in 2007-12-28 10:28:09 +0100 @@@@ -142,7 +142,7 @@@@ LIBMULTITHREAD = @@LIBMULTITHREAD@@ a19 1 LIBPTH = @@LIBPTH@@ a21 1 LIBTHREAD = @@LIBTHREAD@@ d24 1 d26 5 a30 4 --- dselect/Makefile.in.orig 2007-12-27 12:09:27 +0100 +++ dselect/Makefile.in 2007-12-28 10:28:09 +0100 @@@@ -160,7 +160,7 @@@@ LIBMULTITHREAD = @@LIBMULTITHREAD@@ a31 1 LIBPTH = @@LIBPTH@@ a33 1 LIBTHREAD = @@LIBTHREAD@@ d36 1 d38 3 a40 3 --- lib/Makefile.in.orig 2007-12-27 12:09:27 +0100 +++ lib/Makefile.in 2007-12-28 10:28:09 +0100 @@@@ -74,7 +74,7 @@@@ d44 2 a45 2 -DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ -I$(top_builddir)/getopt d50 2 a51 2 --- lib/tarfn.c.orig 2007-12-02 21:44:40 +0100 +++ lib/tarfn.c 2007-12-28 10:28:09 +0100 d64 4 a67 4 --- man/Makefile.in.orig 2007-12-27 12:09:27 +0100 +++ man/Makefile.in 2007-12-28 10:30:56 +0100 @@@@ -223,7 +223,7 @@@@ top_srcdir = @@top_srcdir@@ d75 1 a75 1 @@@@ -574,7 +574,7 @@@@ d85 3 a87 3 --- scripts/Makefile.in.orig 2007-12-27 12:09:27 +0100 +++ scripts/Makefile.in 2007-12-28 10:28:09 +0100 @@@@ -786,8 +786,8 @@@@ d99 3 a101 3 --- src/Makefile.in.orig 2007-12-27 12:09:27 +0100 +++ src/Makefile.in 2007-12-28 10:28:09 +0100 @@@@ -79,7 +79,7 @@@@ d105 2 a106 2 -DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)@@am__isrc@@ -I$(top_builddir)/getopt d110 3 a112 2 @@@@ -148,7 +148,7 @@@@ LIBMULTITHREAD = @@LIBMULTITHREAD@@ a113 1 LIBPTH = @@LIBPTH@@ a115 1 LIBTHREAD = @@LIBTHREAD@@ d118 1 @ 1.4 log @upgrading package: dpkg 1.14.7 -> 1.14.12 @ text @d2 2 a3 2 --- dpkg-deb/Makefile.in.orig 2007-11-29 05:58:44 +0100 +++ dpkg-deb/Makefile.in 2007-12-05 08:20:37 +0100 d14 2 a15 2 --- dpkg-split/Makefile.in.orig 2007-11-29 05:58:44 +0100 +++ dpkg-split/Makefile.in 2007-12-05 08:20:37 +0100 d26 2 a27 2 --- dselect/Makefile.in.orig 2007-11-29 05:58:44 +0100 +++ dselect/Makefile.in 2007-12-05 08:20:37 +0100 d38 2 a39 2 --- lib/Makefile.in.orig 2007-11-29 05:58:45 +0100 +++ lib/Makefile.in 2007-12-05 08:21:48 +0100 d50 2 a51 2 --- lib/tarfn.c.orig 2007-11-29 04:57:25 +0100 +++ lib/tarfn.c 2007-12-05 08:20:37 +0100 d64 2 a65 2 --- man/Makefile.in.orig 2007-11-29 05:58:45 +0100 +++ man/Makefile.in 2007-12-05 08:20:37 +0100 d75 2 a76 2 @@@@ -570,7 +570,7 @@@@ uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 d78 3 a80 3 -all-local: man.stamp +all-local: d85 3 a87 3 --- scripts/Makefile.in.orig 2007-11-29 05:58:45 +0100 +++ scripts/Makefile.in 2007-12-05 08:20:37 +0100 @@@@ -783,8 +783,8 @@@@ d99 2 a100 2 --- src/Makefile.in.orig 2007-11-29 05:58:45 +0100 +++ src/Makefile.in 2007-12-05 08:22:07 +0100 @ 1.3 log @upgrading package: dpkg 1.14.5 -> 1.14.6 @ text @d2 3 a4 3 --- dpkg-deb/Makefile.in.orig 2007-09-05 07:15:07 +0200 +++ dpkg-deb/Makefile.in 2007-09-07 10:24:33 +0200 @@@@ -146,7 +146,7 @@@@ d14 3 a16 3 --- dpkg-split/Makefile.in.orig 2007-09-05 07:15:07 +0200 +++ dpkg-split/Makefile.in 2007-09-07 10:24:33 +0200 @@@@ -147,7 +147,7 @@@@ d26 3 a28 3 --- dselect/Makefile.in.orig 2007-09-05 07:15:08 +0200 +++ dselect/Makefile.in 2007-09-07 10:24:33 +0200 @@@@ -162,7 +162,7 @@@@ d38 3 a40 3 --- lib/Makefile.in.orig 2007-09-05 07:15:08 +0200 +++ lib/Makefile.in 2007-09-07 10:24:33 +0200 @@@@ -78,7 +78,7 @@@@ d44 2 a45 2 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/getopt -I$(top_builddir) d50 2 a51 2 --- lib/tarfn.c.orig 2007-08-07 05:33:47 +0200 +++ lib/tarfn.c 2007-09-07 10:24:33 +0200 d64 4 a67 4 --- man/Makefile.in.orig 2007-09-05 07:15:08 +0200 +++ man/Makefile.in 2007-09-07 10:24:33 +0200 @@@@ -227,7 +227,7 @@@@ target_vendor = @@target_vendor@@ d75 2 a76 2 @@@@ -564,7 +564,7 @@@@ uninstall-man8 d85 3 a87 3 --- scripts/Makefile.in.orig 2007-09-05 07:15:09 +0200 +++ scripts/Makefile.in 2007-09-07 10:25:15 +0200 @@@@ -746,8 +746,8 @@@@ d99 3 a101 3 --- src/Makefile.in.orig 2007-09-05 07:15:09 +0200 +++ src/Makefile.in 2007-09-07 10:24:33 +0200 @@@@ -83,7 +83,7 @@@@ d105 2 a106 2 -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/getopt -I$(top_builddir) d110 1 a110 1 @@@@ -153,7 +153,7 @@@@ @ 1.2 log @upgrading package: dpkg 1.13.25 -> 1.14.1 @ text @d2 2 a3 2 --- dpkg-deb/Makefile.in.orig 2007-05-08 17:24:58 +0200 +++ dpkg-deb/Makefile.in 2007-05-09 07:42:20 +0200 d14 2 a15 2 --- dpkg-split/Makefile.in.orig 2007-05-08 17:24:58 +0200 +++ dpkg-split/Makefile.in 2007-05-09 07:42:20 +0200 d26 2 a27 2 --- dselect/Makefile.in.orig 2007-05-08 17:24:59 +0200 +++ dselect/Makefile.in 2007-05-09 07:42:20 +0200 d38 2 a39 2 --- lib/Makefile.in.orig 2007-05-08 17:24:59 +0200 +++ lib/Makefile.in 2007-05-09 07:42:20 +0200 d50 2 a51 2 --- lib/tarfn.c.orig 2006-06-21 15:41:12 +0200 +++ lib/tarfn.c 2007-05-09 07:42:20 +0200 d64 3 a66 3 --- man/Makefile.in.orig 2007-05-08 17:24:59 +0200 +++ man/Makefile.in 2007-05-09 07:43:14 +0200 @@@@ -226,7 +226,7 @@@@ d75 2 a76 2 @@@@ -562,7 +562,7 @@@@ uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 d85 3 a87 3 --- scripts/Makefile.in.orig 2007-05-08 17:25:00 +0200 +++ scripts/Makefile.in 2007-05-09 07:42:20 +0200 @@@@ -707,11 +707,11 @@@@ d96 2 a97 6 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. d99 2 a100 2 --- src/Makefile.in.orig 2007-05-08 17:25:00 +0200 +++ src/Makefile.in 2007-05-09 07:42:20 +0200 @ 1.1 log @new package: dpkg 1.13.24 (Debian Package Management Toolchain) @ text @d2 4 a5 5 --- 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@@ d7 1 d10 1 a12 1 LTLIBOBJS = @@LTLIBOBJS@@ d14 4 a17 5 --- 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@@ d19 1 d22 1 a24 1 LTLIBOBJS = @@LTLIBOBJS@@ d26 4 a29 5 --- 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@@ d31 1 d34 1 a36 1 LTLIBOBJS = @@LTLIBOBJS@@ d38 3 a40 3 --- 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 @@@@ d51 1 a51 1 +++ lib/tarfn.c 2006-11-18 14:11:58 +0100 d64 3 a66 3 --- 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 @@@@ d69 9 a77 4 # 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 d79 5 a83 1 .SUFFIXES: d85 3 a87 3 --- 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 @@@@ d103 3 a105 3 --- 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 @@@@ d114 2 a115 3 @@@@ -147,7 +147,7 @@@@ LIBICONV = @@LIBICONV@@ LIBINTL = @@LIBINTL@@ d117 1 d120 1 a122 1 LTLIBOBJS = @@LTLIBOBJS@@ @