Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8104
Modified Files:
dpkg.info dpkg.patch
Log Message:
Sync from 10.4T so we don't lose these patches.
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/dpkg.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dpkg.patch 21 Mar 2005 02:40:37 -0000 1.7
+++ dpkg.patch 23 Jun 2005 19:20:00 -0000 1.8
@@ -1,6 +1,27 @@
+diff -ruN dpkg-1.10.21/include/parsedump.h
dpkg-1.10.21-patched/include/parsedump.h
+--- dpkg-1.10.21/include/parsedump.h 2002-05-06 12:18:16.000000000 -0400
++++ dpkg-1.10.21-patched/include/parsedump.h 2005-06-09 20:47:46.000000000
-0400
+@@ -30,7 +30,6 @@
+ const char *canon;
+ };
+
+-extern const struct fieldinfo fieldinfos[];
+ extern const struct nickname nicknames[];
+ extern const int nfields; /* = elements in fieldinfos, including the
sentinels */
+
+@@ -68,6 +67,8 @@
+ unsigned int integer;
+ };
+
++extern const struct fieldinfo fieldinfos[];
++
+ void parseerr(FILE *file, const char *filename, int lno, FILE *warnto, int
*warncount,
+ const struct pkginfo *pigp, int warnonly,
+ const char *fmt, ...) PRINTFFORMAT(8,9);
+
diff -urN dpkg-1.10.21.orig/Makefile.conf.in dpkg-1.10.21/Makefile.conf.in
---- dpkg-1.10.21.orig/Makefile.conf.in Sun Sep 14 08:43:49 2003
-+++ dpkg-1.10.21/Makefile.conf.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/Makefile.conf.in 2003-09-14 08:43:49.000000000 +0900
++++ dpkg-1.10.21/Makefile.conf.in 2005-03-18 22:13:37.000000000 +0900
@@ -60,13 +60,13 @@
CPPFLAGS = @CPPFLAGS@
@@ -18,8 +39,8 @@
NLS_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
-I../intl
NLS_LIBS = @INTLLIBS@
diff -urN dpkg-1.10.21.orig/dpkg-deb/Makefile.in
dpkg-1.10.21/dpkg-deb/Makefile.in
---- dpkg-1.10.21.orig/dpkg-deb/Makefile.in Mon May 20 13:40:29 2002
-+++ dpkg-1.10.21/dpkg-deb/Makefile.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/dpkg-deb/Makefile.in 2002-05-20 13:40:29.000000000
+0900
++++ dpkg-1.10.21/dpkg-deb/Makefile.in 2005-03-18 22:13:37.000000000 +0900
@@ -51,5 +51,5 @@
dpkg-deb-static: LDFLAGS += -static
dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC)
@@ -28,8 +49,8 @@
+ $(CC) $(LDFLAGS) $(EXEFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
diff -urN dpkg-1.10.21.orig/dpkg-deb/build.c dpkg-1.10.21/dpkg-deb/build.c
---- dpkg-1.10.21.orig/dpkg-deb/build.c Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/dpkg-deb/build.c Thu Jun 3 00:38:10 2004
+--- dpkg-1.10.21.orig/dpkg-deb/build.c 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/dpkg-deb/build.c 2005-03-18 22:13:37.000000000 +0900
@@ -275,9 +275,11 @@
warns++;
}
@@ -43,8 +64,8 @@
checkversion(checkedinfo->available.version.version,"(upstream)
version",&errs);
checkversion(checkedinfo->available.version.revision,"Debian
revision",&errs);
diff -urN dpkg-1.10.21.orig/dpkg-deb/dpkg-deb.1
dpkg-1.10.21/dpkg-deb/dpkg-deb.1
---- dpkg-1.10.21.orig/dpkg-deb/dpkg-deb.1 Thu Aug 2 09:59:31 2001
-+++ dpkg-1.10.21/dpkg-deb/dpkg-deb.1 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/dpkg-deb/dpkg-deb.1 2001-08-02 09:59:31.000000000
+0900
++++ dpkg-1.10.21/dpkg-deb/dpkg-deb.1 2005-03-18 22:13:37.000000000 +0900
@@ -244,7 +244,8 @@
Copyright (C)1995-1996
by him and released under the GNU General Public Licence; there is NO
@@ -57,8 +78,8 @@
for details.
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/dselect/Makefile.in
dpkg-1.10.21/dselect/Makefile.in
---- dpkg-1.10.21.orig/dselect/Makefile.in Mon Sep 15 07:28:18 2003
-+++ dpkg-1.10.21/dselect/Makefile.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/dselect/Makefile.in 2003-09-15 07:28:18.000000000
+0900
++++ dpkg-1.10.21/dselect/Makefile.in 2005-03-18 22:13:37.000000000 +0900
@@ -47,7 +47,7 @@
done
@@ -69,8 +90,8 @@
basecmds.o: helpmsgs.h
curkeys.o: curkeys.h
diff -urN dpkg-1.10.21.orig/dselect/dselect.8 dpkg-1.10.21/dselect/dselect.8
---- dpkg-1.10.21.orig/dselect/dselect.8 Sun Sep 14 10:49:08 2003
-+++ dpkg-1.10.21/dselect/dselect.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/dselect/dselect.8 2003-09-14 10:49:08.000000000
+0900
++++ dpkg-1.10.21/dselect/dselect.8 2005-03-18 22:13:37.000000000 +0900
@@ -34,7 +34,7 @@
of \fBdselect\fP or show additional information about the program.
.SH OPTIONS
@@ -97,8 +118,8 @@
+.br
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/dselect/main.cc dpkg-1.10.21/dselect/main.cc
---- dpkg-1.10.21.orig/dselect/main.cc Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/dselect/main.cc Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/dselect/main.cc 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/dselect/main.cc 2005-03-18 22:17:07.000000000 +0900
@@ -43,6 +43,11 @@
#include <dpkg-db.h>
#include <version.h>
@@ -111,7 +132,7 @@
}
#include "dselect.h"
#include "bindings.h"
-@@ -466,6 +471,154 @@
+@@ -466,6 +471,155 @@
return urqr_quitmenu;
/* fixme: check packages OK */
}
@@ -176,8 +197,8 @@
+ {
+ pkg = fink_virt_pkg;
+ if (NULL != pkg->pkgname) free(pkg->pkgname);
-+ if (NULL != pkg->version.version)
free(pkg->version.version);
-+ if (NULL != pkg->version.revision)
free(pkg->version.revision);
++ if (NULL != pkg->version.version)
free((void*)pkg->version.version);
++ if (NULL != pkg->version.revision)
free((void*)pkg->version.revision);
+ fink_virt_pkg = pkg->next;
+ free(pkg);
+ }
@@ -229,9 +250,10 @@
+ goto BAIL;
+
+ /* Try to read the system version from it. */
-+ status = CFDictionaryGetValueIfPresent( propertyList,
-+ CFSTR("ProductVersion"),
-+ (void*)&string);
++ status = CFDictionaryGetValueIfPresent(
++ (CFDictionaryRef)propertyList,
++ (const void*)CFSTR("ProductVersion"),
++ (const void**)&string);
+ if (!status)
+ goto BAIL;
+
@@ -266,7 +288,7 @@
int main(int, const char *const *argv) {
jmp_buf ejbuf;
-@@ -473,7 +626,9 @@
+@@ -473,7 +627,9 @@
setlocale(LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
@@ -278,8 +300,8 @@
cursesoff();
error_unwind(ehflag_bombout); exit(2);
diff -urN dpkg-1.10.21.orig/dselect/pkgdepcon.cc
dpkg-1.10.21/dselect/pkgdepcon.cc
---- dpkg-1.10.21.orig/dselect/pkgdepcon.cc Sun Oct 26 23:02:05 2003
-+++ dpkg-1.10.21/dselect/pkgdepcon.cc Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/dselect/pkgdepcon.cc 2003-10-26 23:02:05.000000000
+0900
++++ dpkg-1.10.21/dselect/pkgdepcon.cc 2005-03-18 22:13:37.000000000 +0900
@@ -198,12 +198,20 @@
return 2;
@@ -350,8 +372,8 @@
return 0;
}
diff -urN dpkg-1.10.21.orig/include/dpkg.h.in dpkg-1.10.21/include/dpkg.h.in
---- dpkg-1.10.21.orig/include/dpkg.h.in Sun Apr 25 06:14:21 2004
-+++ dpkg-1.10.21/include/dpkg.h.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/include/dpkg.h.in 2004-04-25 06:14:21.000000000
+0900
++++ dpkg-1.10.21/include/dpkg.h.in 2005-03-18 22:13:37.000000000 +0900
@@ -96,7 +96,7 @@
#define SHELLENV "SHELL"
#define DEFAULTSHELL "sh"
@@ -362,8 +384,8 @@
#define IMETHODMAXLEN 50
#define IOPTIONMAXLEN IMETHODMAXLEN
diff -urN dpkg-1.10.21.orig/lib/nfmalloc.c dpkg-1.10.21/lib/nfmalloc.c
---- dpkg-1.10.21.orig/lib/nfmalloc.c Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/lib/nfmalloc.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/lib/nfmalloc.c 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/lib/nfmalloc.c 2005-03-18 22:13:37.000000000 +0900
@@ -26,7 +26,7 @@
#include <dpkg.h>
#include <dpkg-db.h>
@@ -374,8 +396,8 @@
#define obstack_chunk_alloc m_malloc
#define obstack_chunk_free free
diff -urN dpkg-1.10.21.orig/lib/tarfn.c dpkg-1.10.21/lib/tarfn.c
---- dpkg-1.10.21.orig/lib/tarfn.c Tue Mar 9 02:31:16 2004
-+++ dpkg-1.10.21/lib/tarfn.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/lib/tarfn.c 2004-03-09 02:31:16.000000000 +0900
++++ dpkg-1.10.21/lib/tarfn.c 2005-03-18 22:13:37.000000000 +0900
@@ -57,8 +57,12 @@
{
int len;
@@ -392,8 +414,8 @@
memcpy(str, s, len);
str[len] = 0;
diff -urN dpkg-1.10.21.orig/main/Makefile.in dpkg-1.10.21/main/Makefile.in
---- dpkg-1.10.21.orig/main/Makefile.in Sun Aug 25 04:54:19 2002
-+++ dpkg-1.10.21/main/Makefile.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/Makefile.in 2002-08-25 04:54:19.000000000 +0900
++++ dpkg-1.10.21/main/Makefile.in 2005-03-18 22:13:37.000000000 +0900
@@ -63,10 +63,10 @@
dpkg-static: LDFLAGS += -static
dpkg-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
@@ -408,8 +430,8 @@
enquiry.o: archtable.h
diff -urN dpkg-1.10.21.orig/main/archives.c dpkg-1.10.21/main/archives.c
---- dpkg-1.10.21.orig/main/archives.c Sun Apr 25 19:41:54 2004
-+++ dpkg-1.10.21/main/archives.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/archives.c 2004-04-25 19:41:54.000000000 +0900
++++ dpkg-1.10.21/main/archives.c 2005-03-18 22:13:37.000000000 +0900
@@ -553,12 +553,10 @@
debug(dbg_eachfiledetail,"tarobject SymbolicLink creating");
#ifdef HAVE_LCHOWN
@@ -437,8 +459,8 @@
debug(dbg_eachfiledetail,"tarobject nondirectory, `link' backup");
if (link(fnamevb.buf,fnametmpvb.buf))
diff -urN dpkg-1.10.21.orig/main/configure.c dpkg-1.10.21/main/configure.c
---- dpkg-1.10.21.orig/main/configure.c Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/main/configure.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/configure.c 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/main/configure.c 2005-03-18 22:13:37.000000000 +0900
@@ -476,9 +476,10 @@
static void suspend(void) {
const char* s;
@@ -466,8 +488,8 @@
diff -urN dpkg-1.10.21.orig/main/dpkg-query.8 dpkg-1.10.21/main/dpkg-query.8
---- dpkg-1.10.21.orig/main/dpkg-query.8 Sun Sep 14 10:49:08 2003
-+++ dpkg-1.10.21/main/dpkg-query.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/dpkg-query.8 2003-09-14 10:49:08.000000000
+0900
++++ dpkg-1.10.21/main/dpkg-query.8 2005-03-18 22:13:37.000000000 +0900
@@ -14,7 +14,7 @@
.TP
\fB-l\fP | \fB--list\fP \fIpackage-name-pattern\fP ...
@@ -504,8 +526,8 @@
This is free software; see the GNU General Public Licence version 2 or
later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/main/dpkg.8 dpkg-1.10.21/main/dpkg.8
---- dpkg-1.10.21.orig/main/dpkg.8 Sun Sep 21 10:43:40 2003
-+++ dpkg-1.10.21/main/dpkg.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/dpkg.8 2003-09-21 10:43:40.000000000 +0900
++++ dpkg-1.10.21/main/dpkg.8 2005-03-18 22:13:37.000000000 +0900
@@ -154,7 +154,7 @@
file). \fB-P\fP or \fB--purge\fP removes everything, including configuration
files. If \fB-a\fP or \fB--pending\fP is given instead of a package
@@ -604,8 +626,8 @@
contributed to \fBdpkg\fP .
.fi
diff -urN dpkg-1.10.21.orig/main/help.c dpkg-1.10.21/main/help.c
---- dpkg-1.10.21.orig/main/help.c Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/main/help.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/help.c 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/main/help.c 2005-03-18 22:13:37.000000000 +0900
@@ -69,11 +69,18 @@
void checkpath(void) {
@@ -628,8 +650,8 @@
struct stat stab;
diff -urN dpkg-1.10.21.orig/main/main.c dpkg-1.10.21/main/main.c
---- dpkg-1.10.21.orig/main/main.c Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/main/main.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/main.c 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/main/main.c 2005-03-18 22:13:37.000000000 +0900
@@ -38,6 +38,12 @@
#include <version.h>
#include <myopt.h>
@@ -809,8 +831,8 @@
actionfunction(argv);
diff -urN dpkg-1.10.21.orig/main/main.h dpkg-1.10.21/main/main.h
---- dpkg-1.10.21.orig/main/main.h Mon May 20 14:56:02 2002
-+++ dpkg-1.10.21/main/main.h Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/main.h 2002-05-20 14:56:02.000000000 +0900
++++ dpkg-1.10.21/main/main.h 2005-03-18 22:13:37.000000000 +0900
@@ -93,6 +93,11 @@
extern const char *instdir;
extern struct packageinlist *ignoredependss;
@@ -824,8 +846,8 @@
/* from filesdb.c */
diff -urN dpkg-1.10.21.orig/main/packages.c dpkg-1.10.21/main/packages.c
---- dpkg-1.10.21.orig/main/packages.c Sun Oct 26 05:03:21 2003
-+++ dpkg-1.10.21/main/packages.c Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/main/packages.c 2003-10-26 05:03:21.000000000 +0900
++++ dpkg-1.10.21/main/packages.c 2005-03-18 22:13:37.000000000 +0900
@@ -331,6 +331,30 @@
return thisf;
}
@@ -897,8 +919,8 @@
debug(dbg_depcondetail," break cycle so ok and found");
found= 3; break;
diff -urN dpkg-1.10.21.orig/man/en/dpkg.cfg.5 dpkg-1.10.21/man/en/dpkg.cfg.5
---- dpkg-1.10.21.orig/man/en/dpkg.cfg.5 Sun Feb 10 09:37:01 2002
-+++ dpkg-1.10.21/man/en/dpkg.cfg.5 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/en/dpkg.cfg.5 2002-02-10 09:37:01.000000000
+0900
++++ dpkg-1.10.21/man/en/dpkg.cfg.5 2005-03-18 22:13:37.000000000 +0900
@@ -8,10 +8,11 @@
here. Comments are allowed by starting a line with a hash sign
("\fB#\fR").
@@ -914,8 +936,8 @@
.SH SEE ALSO
.BR dpkg (8)
diff -urN dpkg-1.10.21.orig/man/en/dselect.cfg.5
dpkg-1.10.21/man/en/dselect.cfg.5
---- dpkg-1.10.21.orig/man/en/dselect.cfg.5 Sat Feb 16 23:10:50 2002
-+++ dpkg-1.10.21/man/en/dselect.cfg.5 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/en/dselect.cfg.5 2002-02-16 23:10:50.000000000
+0900
++++ dpkg-1.10.21/man/en/dselect.cfg.5 2005-03-18 22:13:37.000000000 +0900
@@ -8,10 +8,11 @@
here. Comments are allowed by starting a line with a hash sign
("\fB#\fR").
@@ -931,8 +953,8 @@
.SH SEE ALSO
.BR dselect (8)
diff -urN dpkg-1.10.21.orig/man/fr/cleanup-info.8
dpkg-1.10.21/man/fr/cleanup-info.8
---- dpkg-1.10.21.orig/man/fr/cleanup-info.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/fr/cleanup-info.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/cleanup-info.8 2002-02-03 00:57:09.000000000
+0900
++++ dpkg-1.10.21/man/fr/cleanup-info.8 2005-03-18 22:13:37.000000000 +0900
@@ -38,7 +38,7 @@
Affiche la version et se termine normalement.
.SH FICHIERS
@@ -952,8 +974,8 @@
+.PP
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-deb.1 dpkg-1.10.21/man/fr/dpkg-deb.1
---- dpkg-1.10.21.orig/man/fr/dpkg-deb.1 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/fr/dpkg-deb.1 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-deb.1 2002-02-03 00:57:09.000000000
+0900
++++ dpkg-1.10.21/man/fr/dpkg-deb.1 2005-03-18 22:13:37.000000000 +0900
@@ -245,9 +245,11 @@
Le copyright (C) date de 1995-1996 et ils ont paru sous la licence
« GNU General Public Licence » ; il n'y a PAS de garantie.
@@ -971,8 +993,8 @@
+.PP
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-divert.8
dpkg-1.10.21/man/fr/dpkg-divert.8
---- dpkg-1.10.21.orig/man/fr/dpkg-divert.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/fr/dpkg-divert.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-divert.8 2002-02-03 00:57:09.000000000
+0900
++++ dpkg-1.10.21/man/fr/dpkg-divert.8 2005-03-18 22:13:37.000000000 +0900
@@ -41,7 +41,7 @@
.TP
.I --admindir <répertoire>
@@ -1001,8 +1023,8 @@
+.PP
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-query.8
dpkg-1.10.21/man/fr/dpkg-query.8
---- dpkg-1.10.21.orig/man/fr/dpkg-query.8 Thu Mar 11 09:03:19 2004
-+++ dpkg-1.10.21/man/fr/dpkg-query.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-query.8 2004-03-11 09:03:19.000000000
+0900
++++ dpkg-1.10.21/man/fr/dpkg-query.8 2005-03-18 22:13:37.000000000 +0900
@@ -15,7 +15,7 @@
\fB-l\fP | \fB--list\fP \fIpaquet-nom-motif\fP ...
Liste les paquets correspondant au motif donné. Quand on ne donne aucun
@@ -1031,8 +1053,8 @@
\fB--showformat=\fP\fIformat\fR
On se sert de cette option pour préciser le format de la sortie que produit la
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-scanpackages.8
dpkg-1.10.21/man/fr/dpkg-scanpackages.8
---- dpkg-1.10.21.orig/man/fr/dpkg-scanpackages.8 Thu Mar 11 09:03:19 2004
-+++ dpkg-1.10.21/man/fr/dpkg-scanpackages.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-scanpackages.8 2004-03-11
09:03:19.000000000 +0900
++++ dpkg-1.10.21/man/fr/dpkg-scanpackages.8 2005-03-18 22:13:37.000000000
+0900
@@ -43,7 +43,7 @@
.PP
.I rep-de-binaires
@@ -1043,8 +1065,8 @@
Il vaut mieux qu'elle soit relative à la racine de l'archive Debian\ ;
ainsi chaque champ «\ Filename\ » dans le nouveau fichier «\ Packages\ »
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-source.1
dpkg-1.10.21/man/fr/dpkg-source.1
---- dpkg-1.10.21.orig/man/fr/dpkg-source.1 Thu Mar 11 09:03:19 2004
-+++ dpkg-1.10.21/man/fr/dpkg-source.1 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-source.1 2004-03-11 09:03:19.000000000
+0900
++++ dpkg-1.10.21/man/fr/dpkg-source.1 2005-03-18 22:13:37.000000000 +0900
@@ -58,13 +58,13 @@
lit les informations concernant les dépendances envers les bibliothèques
partagées dans les fichiers suivants :
@@ -1073,8 +1095,8 @@
.SH TRADUCTION
Philippe Batailler, Octobre 2003.
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-split.8
dpkg-1.10.21/man/fr/dpkg-split.8
---- dpkg-1.10.21.orig/man/fr/dpkg-split.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/fr/dpkg-split.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-split.8 2002-02-03 00:57:09.000000000
+0900
++++ dpkg-1.10.21/man/fr/dpkg-split.8 2005-03-18 22:13:37.000000000 +0900
@@ -162,7 +162,7 @@
.BI --depotdir " répertoire"
Indique un répertoire différent pour la file comprenant les parties en attente
@@ -1106,8 +1128,8 @@
+.PP
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/man/fr/dpkg-statoverride.8
dpkg-1.10.21/man/fr/dpkg-statoverride.8
---- dpkg-1.10.21.orig/man/fr/dpkg-statoverride.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/fr/dpkg-statoverride.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg-statoverride.8 2002-02-03
00:57:09.000000000 +0900
++++ dpkg-1.10.21/man/fr/dpkg-statoverride.8 2005-03-18 22:13:37.000000000
+0900
@@ -55,10 +55,10 @@
.TP
.I --admindir
@@ -1131,8 +1153,8 @@
+.PP
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/man/fr/dpkg.8 dpkg-1.10.21/man/fr/dpkg.8
---- dpkg-1.10.21.orig/man/fr/dpkg.8 Thu Mar 11 09:03:19 2004
-+++ dpkg-1.10.21/man/fr/dpkg.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/dpkg.8 2004-03-11 09:03:19.000000000 +0900
++++ dpkg-1.10.21/man/fr/dpkg.8 2005-03-18 22:13:37.000000000 +0900
@@ -165,7 +165,7 @@
configuration. Si l'on donne l'option \fB-a\fP ou \fB--pending\fP à la
place d'un nom de paquet, tous les paquets non dépaquetés, mais qui sont
@@ -1207,8 +1229,8 @@
.fi
.SH "TRADUCTION"
diff -urN dpkg-1.10.21.orig/man/fr/install-info.8
dpkg-1.10.21/man/fr/install-info.8
---- dpkg-1.10.21.orig/man/fr/install-info.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/fr/install-info.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/install-info.8 2002-02-03 00:57:09.000000000
+0900
++++ dpkg-1.10.21/man/fr/install-info.8 2005-03-18 22:13:37.000000000 +0900
@@ -157,7 +157,7 @@
dans
.IR rep-info .
@@ -1228,8 +1250,8 @@
Copyright 1994, Ian Jackson.
.B install\-info
diff -urN dpkg-1.10.21.orig/man/fr/update-alternatives.8
dpkg-1.10.21/man/fr/update-alternatives.8
---- dpkg-1.10.21.orig/man/fr/update-alternatives.8 Thu Mar 11 09:03:19 2004
-+++ dpkg-1.10.21/man/fr/update-alternatives.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/fr/update-alternatives.8 2004-03-11
09:03:19.000000000 +0900
++++ dpkg-1.10.21/man/fr/update-alternatives.8 2005-03-18 22:13:37.000000000
+0900
@@ -4,7 +4,7 @@
.\" it under the terms of the GNU General Public License as published
.\" by the Free Software Foundation; either version 2 of the License, or
@@ -1325,8 +1347,8 @@
.\" .SH REMERCIEMENTS
.SH "VOIR AUSSI"
diff -urN dpkg-1.10.21.orig/man/ja/cleanup-info.8
dpkg-1.10.21/man/ja/cleanup-info.8
---- dpkg-1.10.21.orig/man/ja/cleanup-info.8 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/cleanup-info.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/cleanup-info.8 2004-04-26 01:14:26.000000000
+0900
++++ dpkg-1.10.21/man/ja/cleanup-info.8 2005-03-18 22:13:37.000000000 +0900
@@ -37,7 +37,7 @@
¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·¡¢Àµ¾ï½ªÎ»¤¹¤ë¡£
.SH ¥Õ¥¡¥¤¥ë
@@ -1346,8 +1368,8 @@
This is free software; see the GNU General Public Licence
version 2 or later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/man/ja/dpkg-deb.1 dpkg-1.10.21/man/ja/dpkg-deb.1
---- dpkg-1.10.21.orig/man/ja/dpkg-deb.1 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/dpkg-deb.1 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/dpkg-deb.1 2004-04-26 01:14:26.000000000
+0900
++++ dpkg-1.10.21/man/ja/dpkg-deb.1 2005-03-18 22:13:37.000000000 +0900
@@ -260,9 +260,9 @@
¤È¤³¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤Ï Ian Jackson ¤¬ºîÀ®¤·¤¿¡£¤³¤ì¤é¤ÎÃøºî¸¢¤ÏÈà¤Ë
¤¢¤ê(Copyright (C)1995-1996)¡¢GNU °ìÈ̸øÍ»ÈÍѵöÂú¤Ë¤è¤êÈÒÉÛ¤µ¤ì¤ë¡£
@@ -1377,8 +1399,8 @@
.SH ËÝÌõ¼Ô
´îÀ¥¹À <[EMAIL PROTECTED]>
diff -urN dpkg-1.10.21.orig/man/ja/dpkg-divert.8
dpkg-1.10.21/man/ja/dpkg-divert.8
---- dpkg-1.10.21.orig/man/ja/dpkg-divert.8 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/dpkg-divert.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/dpkg-divert.8 2004-04-26 01:14:26.000000000
+0900
++++ dpkg-1.10.21/man/ja/dpkg-divert.8 2005-03-18 22:13:37.000000000 +0900
@@ -86,6 +86,7 @@
overriding a package's version of a file" ¤ò»²¾È¤Î¤³¤È¡£
.SH Ãø¼Ô
@@ -1388,8 +1410,8 @@
This is free software; see the GNU General Public Licence
version 2 or later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/man/ja/dpkg-scanpackages.8
dpkg-1.10.21/man/ja/dpkg-scanpackages.8
---- dpkg-1.10.21.orig/man/ja/dpkg-scanpackages.8 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/dpkg-scanpackages.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/dpkg-scanpackages.8 2004-04-26
01:14:26.000000000 +0900
++++ dpkg-1.10.21/man/ja/dpkg-scanpackages.8 2005-03-18 22:13:37.000000000
+0900
@@ -103,6 +103,8 @@
.I newmaintainer
¤Î¾ì¹ç¤ÏÃÖ´¹¤µ¤ì¤ë¡£
@@ -1400,8 +1422,8 @@
Debian ¥ß¥é¡¼¤Î
.I indices
diff -urN dpkg-1.10.21.orig/man/ja/dpkg-statoverride.8
dpkg-1.10.21/man/ja/dpkg-statoverride.8
---- dpkg-1.10.21.orig/man/ja/dpkg-statoverride.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/ja/dpkg-statoverride.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/dpkg-statoverride.8 2002-02-03
00:57:09.000000000 +0900
++++ dpkg-1.10.21/man/ja/dpkg-statoverride.8 2005-03-18 22:13:37.000000000
+0900
@@ -99,14 +99,14 @@
.TP
.I --admindir
@@ -1430,8 +1452,8 @@
This is free software; see the GNU General Public Licence version 2 or
later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/man/ja/dpkg.8 dpkg-1.10.21/man/ja/dpkg.8
---- dpkg-1.10.21.orig/man/ja/dpkg.8 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/dpkg.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/dpkg.8 2004-04-26 01:14:26.000000000 +0900
++++ dpkg-1.10.21/man/ja/dpkg.8 2005-03-18 22:13:37.000000000 +0900
@@ -188,7 +188,7 @@
\fB--remove\fP ¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤ò½ü¤¤¤¿¤¹¤Ù¤Æ¤òºï½ü¤¹¤ë(ÀßÄê¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤Ï¡¢
\fIconffiles\fP ¥³¥ó¥È¥í¡¼¥ë¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë)¡£
@@ -1497,8 +1519,8 @@
¤É¤¦¤«¡¢¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¤«¤É¤¦¤«¡¢¤Ê¤É¤Î¾ðÊ󤬴ޤޤì¤Æ¤¤¤ë¡£¤¯¤ï¤·¤¯¤Ï¡¢
\fB ¥Ñ¥Ã¥±¡¼¥¸¤Ë´Ø¤¹¤ë¾ðÊó\fP ¤Î¹à¤ò»²¾È¤¹¤ë¤³¤È¡£
diff -urN dpkg-1.10.21.orig/man/ja/install-info.8
dpkg-1.10.21/man/ja/install-info.8
---- dpkg-1.10.21.orig/man/ja/install-info.8 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/install-info.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/install-info.8 2004-04-26 01:14:26.000000000
+0900
++++ dpkg-1.10.21/man/ja/install-info.8 2005-03-18 22:13:37.000000000 +0900
@@ -292,12 +292,12 @@
.\"O be located in
.\"O .IR infodir .
@@ -1524,8 +1546,8 @@
´Ø¸Í ¹¬°ì <[EMAIL PROTECTED]>
.SH ËÝÌõ¼ÔÃí
diff -urN dpkg-1.10.21.orig/man/ja/update-alternatives.8
dpkg-1.10.21/man/ja/update-alternatives.8
---- dpkg-1.10.21.orig/man/ja/update-alternatives.8 Mon Apr 26 01:14:26 2004
-+++ dpkg-1.10.21/man/ja/update-alternatives.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ja/update-alternatives.8 2004-04-26
01:14:26.000000000 +0900
++++ dpkg-1.10.21/man/ja/update-alternatives.8 2005-03-18 22:13:37.000000000
+0900
@@ -4,7 +4,7 @@
.\" it under the terms of the GNU General Public License as published
.\" by the Free Software Foundation; either version 2 of the License, or
@@ -1622,8 +1644,8 @@
.BR ln (1),
FHS, the Filesystem Hierarchy Standard.
diff -urN dpkg-1.10.21.orig/man/pt_BR/update-alternatives.8
dpkg-1.10.21/man/pt_BR/update-alternatives.8
---- dpkg-1.10.21.orig/man/pt_BR/update-alternatives.8 Sun Feb 3 02:58:58 2002
-+++ dpkg-1.10.21/man/pt_BR/update-alternatives.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/pt_BR/update-alternatives.8 2002-02-03
02:58:58.000000000 +0900
++++ dpkg-1.10.21/man/pt_BR/update-alternatives.8 2005-03-18
22:13:37.000000000 +0900
@@ -4,7 +4,7 @@
.\" sob os termos da Lincença Pública Geral GNU como publicado pela
.\" Free Software Foundation; versão 2 da Licença ou (a sua escolha)
@@ -1720,8 +1742,8 @@
.SH "VEJA TAMBÉM"
.BR ln (1),
diff -urN dpkg-1.10.21.orig/man/ru/dpkg.8 dpkg-1.10.21/man/ru/dpkg.8
---- dpkg-1.10.21.orig/man/ru/dpkg.8 Sun Feb 3 00:57:09 2002
-+++ dpkg-1.10.21/man/ru/dpkg.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/ru/dpkg.8 2002-02-03 00:57:09.000000000 +0900
++++ dpkg-1.10.21/man/ru/dpkg.8 2005-03-18 22:13:37.000000000 +0900
@@ -232,7 +232,7 @@
ÉÌÉ
.B --pending,
@@ -1837,8 +1859,8 @@
.SH ðåòå÷ïä
diff -urN dpkg-1.10.21.orig/man/sv/dpkg-deb.1 dpkg-1.10.21/man/sv/dpkg-deb.1
---- dpkg-1.10.21.orig/man/sv/dpkg-deb.1 Sun Feb 3 02:46:49 2002
-+++ dpkg-1.10.21/man/sv/dpkg-deb.1 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dpkg-deb.1 2002-02-03 02:46:49.000000000
+0900
++++ dpkg-1.10.21/man/sv/dpkg-deb.1 2005-03-18 22:13:37.000000000 +0900
@@ -248,8 +248,9 @@
och denna manualsida skrevs av Ian Jackson.
De är upphovsrättsskyddade 1995-1996 av honom och släppta under
@@ -1852,8 +1874,8 @@
+.B @PREFIX@/share/common-licenses/GPL
för detaljer.
diff -urN dpkg-1.10.21.orig/man/sv/dpkg-query.8
dpkg-1.10.21/man/sv/dpkg-query.8
---- dpkg-1.10.21.orig/man/sv/dpkg-query.8 Sun Feb 3 02:56:49 2002
-+++ dpkg-1.10.21/man/sv/dpkg-query.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dpkg-query.8 2002-02-03 02:56:49.000000000
+0900
++++ dpkg-1.10.21/man/sv/dpkg-query.8 2005-03-18 22:13:37.000000000 +0900
@@ -16,7 +16,7 @@
\fB-l\fP | \fB--list\fP \fIpaketnamnsmönster\fP ...
Lista paket som matchar det givna mönstret.
@@ -1890,8 +1912,8 @@
Detta är fri programvara; se GNU General Public License version 2 eller
senare för kopieringsvillkor. Det finns INGEN garanti.
diff -urN dpkg-1.10.21.orig/man/sv/dpkg-split.8
dpkg-1.10.21/man/sv/dpkg-split.8
---- dpkg-1.10.21.orig/man/sv/dpkg-split.8 Sat Feb 16 23:04:24 2002
-+++ dpkg-1.10.21/man/sv/dpkg-split.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dpkg-split.8 2002-02-16 23:04:24.000000000
+0900
++++ dpkg-1.10.21/man/sv/dpkg-split.8 2005-03-18 22:13:37.000000000 +0900
@@ -169,7 +169,7 @@
Anger en alternativ katalog för kön av delar som väntar på automatisk
sammanslagning.
@@ -1925,8 +1947,8 @@
Denna manualsida översattes av Peter Karlsson.
diff -urN dpkg-1.10.21.orig/man/sv/dpkg.8 dpkg-1.10.21/man/sv/dpkg.8
---- dpkg-1.10.21.orig/man/sv/dpkg.8 Mon May 27 02:54:33 2002
-+++ dpkg-1.10.21/man/sv/dpkg.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dpkg.8 2002-05-27 02:54:33.000000000 +0900
++++ dpkg-1.10.21/man/sv/dpkg.8 2005-03-18 22:13:37.000000000 +0900
@@ -157,7 +157,7 @@
\fB-P\fP eller \fB--purge\fP tar bort allting, inklusive
konfigurationsfiler.
@@ -2036,8 +2058,8 @@
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
.fi
diff -urN dpkg-1.10.21.orig/man/sv/dpkg.cfg.5 dpkg-1.10.21/man/sv/dpkg.cfg.5
---- dpkg-1.10.21.orig/man/sv/dpkg.cfg.5 Sat Feb 16 23:14:15 2002
-+++ dpkg-1.10.21/man/sv/dpkg.cfg.5 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dpkg.cfg.5 2002-02-16 23:14:15.000000000
+0900
++++ dpkg-1.10.21/man/sv/dpkg.cfg.5 2005-03-18 22:13:37.000000000 +0900
@@ -10,10 +10,11 @@
Kommentarer är tillåtna genom att inleda en rad med nummertecken
("\fB#\fR").
@@ -2053,8 +2075,8 @@
.SH SE ÄVEN
.BR dpkg (8)
diff -urN dpkg-1.10.21.orig/man/sv/dselect.8 dpkg-1.10.21/man/sv/dselect.8
---- dpkg-1.10.21.orig/man/sv/dselect.8 Sun Feb 3 02:46:49 2002
-+++ dpkg-1.10.21/man/sv/dselect.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dselect.8 2002-02-03 02:46:49.000000000 +0900
++++ dpkg-1.10.21/man/sv/dselect.8 2005-03-18 22:13:37.000000000 +0900
@@ -39,7 +39,7 @@
programmet.
.SH FLAGGOR
@@ -2081,8 +2103,8 @@
+Paths modified by Carsten Klapp to reflect fink distribution,
+December 2002.
diff -urN dpkg-1.10.21.orig/man/sv/dselect.cfg.5
dpkg-1.10.21/man/sv/dselect.cfg.5
---- dpkg-1.10.21.orig/man/sv/dselect.cfg.5 Sat Feb 16 23:14:15 2002
-+++ dpkg-1.10.21/man/sv/dselect.cfg.5 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/man/sv/dselect.cfg.5 2002-02-16 23:14:15.000000000
+0900
++++ dpkg-1.10.21/man/sv/dselect.cfg.5 2005-03-18 22:13:37.000000000 +0900
@@ -10,10 +10,11 @@
Kommentarer är tillåtna genom att inleda en rad med nummertecken
("\fB#\fR").
@@ -2098,15 +2120,15 @@
.SH SE ÄVEN
.BR dselect (8)
diff -urN dpkg-1.10.21.orig/origin.fink dpkg-1.10.21/origin.fink
---- dpkg-1.10.21.orig/origin.fink Thu Jan 1 09:00:00 1970
-+++ dpkg-1.10.21/origin.fink Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/origin.fink 1970-01-01 09:00:00.000000000 +0900
++++ dpkg-1.10.21/origin.fink 2005-03-18 22:13:37.000000000 +0900
@@ -0,0 +1,3 @@
+Vendor: Fink
+Vendor-URL: http://fink.sourceforge.net/
+Bugs: http://fink.sourceforge.net/
diff -urN dpkg-1.10.21.orig/scripts/cleanup-info.8
dpkg-1.10.21/scripts/cleanup-info.8
---- dpkg-1.10.21.orig/scripts/cleanup-info.8 Mon Dec 6 02:49:04 1999
-+++ dpkg-1.10.21/scripts/cleanup-info.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/cleanup-info.8 1999-12-06 02:49:04.000000000
+0900
++++ dpkg-1.10.21/scripts/cleanup-info.8 2005-03-18 22:13:37.000000000
+0900
@@ -34,7 +34,7 @@
Output version and exit successfully.
.SH FILES
@@ -2125,8 +2147,8 @@
This is free software; see the GNU General Public Licence
version 2 or later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/scripts/dpkg-divert.8
dpkg-1.10.21/scripts/dpkg-divert.8
---- dpkg-1.10.21.orig/scripts/dpkg-divert.8 Mon Apr 26 02:10:57 2004
-+++ dpkg-1.10.21/scripts/dpkg-divert.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/dpkg-divert.8 2004-04-26 02:10:57.000000000
+0900
++++ dpkg-1.10.21/scripts/dpkg-divert.8 2005-03-18 22:13:37.000000000 +0900
@@ -37,7 +37,7 @@
.SH OPTIONS
.TP
@@ -2154,8 +2176,8 @@
This is free software; see the GNU General Public Licence
version 2 or later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/scripts/dpkg-name.sh
dpkg-1.10.21/scripts/dpkg-name.sh
---- dpkg-1.10.21.orig/scripts/dpkg-name.sh Sun Dec 24 21:34:20 2000
-+++ dpkg-1.10.21/scripts/dpkg-name.sh Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/dpkg-name.sh 2000-12-24 21:34:20.000000000
+0900
++++ dpkg-1.10.21/scripts/dpkg-name.sh 2005-03-18 22:13:37.000000000 +0900
@@ -10,6 +10,7 @@
license () {
echo "# ${prog} ${version} -- ${purpose}
@@ -2174,8 +2196,8 @@
stderr () {
diff -urN dpkg-1.10.21.orig/scripts/dpkg-scanpackages.8
dpkg-1.10.21/scripts/dpkg-scanpackages.8
---- dpkg-1.10.21.orig/scripts/dpkg-scanpackages.8 Tue Oct 28 01:50:00 2003
-+++ dpkg-1.10.21/scripts/dpkg-scanpackages.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/dpkg-scanpackages.8 2003-10-28
01:50:00.000000000 +0900
++++ dpkg-1.10.21/scripts/dpkg-scanpackages.8 2005-03-18 22:13:37.000000000
+0900
@@ -41,7 +41,7 @@
.PP
.I binarydir
@@ -2195,8 +2217,8 @@
+.SH AUTHOR
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/scripts/dpkg-source.1
dpkg-1.10.21/scripts/dpkg-source.1
---- dpkg-1.10.21.orig/scripts/dpkg-source.1 Sun Sep 14 10:49:08 2003
-+++ dpkg-1.10.21/scripts/dpkg-source.1 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/dpkg-source.1 2003-09-14 10:49:08.000000000
+0900
++++ dpkg-1.10.21/scripts/dpkg-source.1 2005-03-18 22:13:37.000000000 +0900
@@ -806,6 +806,7 @@
.BR pgp (1).
.SH AUTHOR
@@ -2216,8 +2238,8 @@
+.B @PREFIX@/share/common-licenses/GPL
for details.
diff -urN dpkg-1.10.21.orig/scripts/dpkg-statoverride.8
dpkg-1.10.21/scripts/dpkg-statoverride.8
---- dpkg-1.10.21.orig/scripts/dpkg-statoverride.8 Sun Mar 4 23:39:06 2001
-+++ dpkg-1.10.21/scripts/dpkg-statoverride.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/dpkg-statoverride.8 2001-03-04
23:39:06.000000000 +0900
++++ dpkg-1.10.21/scripts/dpkg-statoverride.8 2005-03-18 22:13:37.000000000
+0900
@@ -51,10 +51,10 @@
.TP
.I --admindir
@@ -2240,8 +2262,8 @@
This is free software; see the GNU General Public Licence version 2 or
later for copying conditions. There is NO warranty.
diff -urN dpkg-1.10.21.orig/scripts/install-info.8
dpkg-1.10.21/scripts/install-info.8
---- dpkg-1.10.21.orig/scripts/install-info.8 Thu Jan 31 23:00:59 2002
-+++ dpkg-1.10.21/scripts/install-info.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/install-info.8 2002-01-31 23:00:59.000000000
+0900
++++ dpkg-1.10.21/scripts/install-info.8 2005-03-18 22:13:37.000000000
+0900
@@ -156,7 +156,7 @@
be located in
.IR infodir .
@@ -2261,8 +2283,8 @@
Copyright 1994, Ian Jackson.
.B install\-info
diff -urN dpkg-1.10.21.orig/scripts/update-alternatives.8
dpkg-1.10.21/scripts/update-alternatives.8
---- dpkg-1.10.21.orig/scripts/update-alternatives.8 Mon Sep 15 06:54:42 2003
-+++ dpkg-1.10.21/scripts/update-alternatives.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/update-alternatives.8 2003-09-15
06:54:42.000000000 +0900
++++ dpkg-1.10.21/scripts/update-alternatives.8 2005-03-18 22:13:37.000000000
+0900
@@ -4,7 +4,7 @@
.\" it under the terms of the GNU General Public License as published
.\" by the Free Software Foundation; either version 2 of the License, or
@@ -2366,8 +2388,8 @@
.BR ln (1),
FHS, the Filesystem Hierarchy Standard.
diff -urN dpkg-1.10.21.orig/scripts/update-alternatives.pl
dpkg-1.10.21/scripts/update-alternatives.pl
---- dpkg-1.10.21.orig/scripts/update-alternatives.pl Wed Sep 17 02:51:15 2003
-+++ dpkg-1.10.21/scripts/update-alternatives.pl Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/scripts/update-alternatives.pl 2003-09-17
02:51:15.000000000 +0900
++++ dpkg-1.10.21/scripts/update-alternatives.pl 2005-03-18
22:13:37.000000000 +0900
@@ -59,7 +59,7 @@
sub quit { print STDERR "update-alternatives: @_\n"; exit(2); }
sub badusage { print STDERR "update-alternatives: @_\n\n"; &usageversion;
exit(2); }
@@ -2378,8 +2400,8 @@
$testmode= 0;
$verbosemode= 0;
diff -urN dpkg-1.10.21.orig/split/Makefile.in dpkg-1.10.21/split/Makefile.in
---- dpkg-1.10.21.orig/split/Makefile.in Mon May 20 13:40:29 2002
-+++ dpkg-1.10.21/split/Makefile.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/split/Makefile.in 2002-05-20 13:40:29.000000000
+0900
++++ dpkg-1.10.21/split/Makefile.in 2005-03-18 22:13:37.000000000 +0900
@@ -42,7 +42,7 @@
$(INSTALL_DATA) $(srcdir)/dpkg-split.8 $(DESTDIR)/$(man8dir)
@@ -2390,8 +2412,8 @@
split.o: split.c
$(CC) $(ALL_CFLAGS) -DMKSPLITSCRIPT=\"$(dpkglibdir)/mksplit\" -c $<
diff -urN dpkg-1.10.21.orig/split/dpkg-split.8 dpkg-1.10.21/split/dpkg-split.8
---- dpkg-1.10.21.orig/split/dpkg-split.8 Thu Jan 31 23:00:59 2002
-+++ dpkg-1.10.21/split/dpkg-split.8 Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/split/dpkg-split.8 2002-01-31 23:00:59.000000000
+0900
++++ dpkg-1.10.21/split/dpkg-split.8 2005-03-18 22:13:37.000000000 +0900
@@ -162,7 +162,7 @@
.BI --depotdir " directory"
Specifies an alternative directory for the queue of parts awaiting
@@ -2422,8 +2444,8 @@
for details.
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/utils/Makefile.in dpkg-1.10.21/utils/Makefile.in
---- dpkg-1.10.21.orig/utils/Makefile.in Sun Aug 25 04:54:19 2002
-+++ dpkg-1.10.21/utils/Makefile.in Wed Jun 2 22:18:56 2004
+--- dpkg-1.10.21.orig/utils/Makefile.in 2002-08-25 04:54:19.000000000
+0900
++++ dpkg-1.10.21/utils/Makefile.in 2005-03-18 22:13:37.000000000 +0900
@@ -72,9 +72,9 @@
$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
@@ -2490,3 +2512,15 @@
#define TAR "tar"
#define GZIP "gzip"
+diff -ruN dpkg-1.10.21/lib/mlib.c dpkg-1.10.21-patched/lib/mlib.c
+--- dpkg-1.10.21/lib/mlib.c 2004-03-08 12:13:09.000000000 -0500
++++ dpkg-1.10.21-patched/lib/mlib.c 2005-06-20 04:10:00.000000000 -0400
+@@ -189,7 +189,7 @@
+ switch(data->type) {
+ case BUFFER_WRITE_BUF:
+ memcpy(data->data.ptr, buf, length);
+- (char*)data->data.ptr += length;
++ data->data.ptr = (char*)data->data.ptr + length;
+ break;
+ case BUFFER_WRITE_VBUF:
+ varbufaddbuf((struct varbuf *)data->data.ptr, buf, length);
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/base/dpkg.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dpkg.info 21 Mar 2005 02:40:36 -0000 1.18
+++ dpkg.info 23 Jun 2005 19:20:00 -0000 1.19
@@ -1,9 +1,8 @@
Package: dpkg
Version: 1.10.21
-Revision: 215
+Revision: 217
GCC: 3.3
Depends: gettext, libiconv, gzip, tar, libncurses5-shlibs
-BuildDepends: gcc3.3
Essential: yes
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
@@ -15,8 +14,8 @@
SetMAKEFLAGS: -j1
CompileScript: <<
%p/bin/fink -y install gettext-bin gettext-dev gettext-tools libiconv-dev
libncurses5
- export CC=gcc-3.3; export CXX=g++-3.3; PERL=/usr/bin/perl ./configure
--build=%m-apple-darwin %c
- make EXEFLAGS=-force_flat_namespace CC=gcc-3.3 CXX=g++-3.3
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ make EXEFLAGS=-force_flat_namespace
<<
ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b
InstallScript: <<
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
