? .DS_Store ? .gdb_history ? 10.4 ? gnu.list ? imac.disks.txt ? libtool-1.5.6.tar.gz.sig ? pogma-packagechoice.diff ? unscryp ? 10.3/.DS_Store ? mirror/README,v ? mirror/gnu.diff ? mirror/gnu.new Index: 10.4-transitional/apt.info =================================================================== RCS file: /cvsroot/fink/fink/10.4-transitional/apt.info,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 apt.info --- 10.4-transitional/apt.info 28 Apr 2005 09:52:20 -0000 1.2 +++ 10.4-transitional/apt.info 1 Jul 2005 02:23:07 -0000 @@ -1,9 +1,9 @@ Package: apt Version: 0.5.4 -Revision: 51 +Revision: 52 GCC: 3.3 Depends: %N-shlibs (= %v-%r) -BuildDepends: fink-prebinding, gcc3.3 +BuildDepends: fink-prebinding Source: mirror:sourceforge:fink/%n_%v.tar.gz Source-MD5: 274fb64e2e67318b4c9c94599785c37d SourceDirectory: %n-%v @@ -11,14 +11,12 @@ PatchScript: << sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' <%a/%n.patch | patch -p1 sh patch_flush for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done - for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i ; done -#perl -pi.bak -e 's/socklen_t/int/' methods/ftp.h methods/ftp.cc << NoSetCPPFLAGS: true NoSetLDFLAGS: true -SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings +SetCXXFLAGS: -O2 -DEMULATE_MMAP -D__USE_MISC -fconstant-cfstrings -DHAVE_SOCKLEN_T=1 CompileScript: << - export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c + ./configure %c make -f makefile.wrap NOISY=1 << InstallScript: << Index: 10.4-transitional/apt.patch =================================================================== RCS file: /cvsroot/fink/fink/10.4-transitional/apt.patch,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 apt.patch --- 10.4-transitional/apt.patch 28 Apr 2005 09:52:20 -0000 1.2 +++ 10.4-transitional/apt.patch 1 Jul 2005 02:23:08 -0000 @@ -1,6 +1,6 @@ -diff -ruN apt-0.5.4/apt-inst/makefile apt-0.5.4-patched/apt-inst/makefile ---- apt-0.5.4/apt-inst/makefile Mon Feb 26 23:16:05 2001 -+++ apt-0.5.4-patched/apt-inst/makefile Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-inst/makefile apt-0.5.4/apt-inst/makefile +--- apt-0.5.4.orig/apt-inst/makefile 2001-02-27 13:16:05.000000000 +0900 ++++ apt-0.5.4/apt-inst/makefile 2005-03-08 13:00:37.000000000 +0900 @@ -10,6 +10,7 @@ include ../buildlib/defaults.mak @@ -9,9 +9,9 @@ diff -ruN apt-0.5.4/apt-inst/makefile ap LIBRARY=apt-inst LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER) MAJOR=1.0 -diff -ruN apt-0.5.4/apt-pkg/contrib/mmap.cc apt-0.5.4-patched/apt-pkg/contrib/mmap.cc ---- apt-0.5.4/apt-pkg/contrib/mmap.cc Sun May 27 01:19:30 2001 -+++ apt-0.5.4-patched/apt-pkg/contrib/mmap.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/contrib/mmap.cc apt-0.5.4/apt-pkg/contrib/mmap.cc +--- apt-0.5.4.orig/apt-pkg/contrib/mmap.cc 2001-05-27 14:19:30.000000000 +0900 ++++ apt-0.5.4/apt-pkg/contrib/mmap.cc 2005-03-08 13:00:37.000000000 +0900 @@ -41,7 +41,7 @@ // --------------------------------------------------------------------- /* */ @@ -89,7 +89,7 @@ diff -ruN apt-0.5.4/apt-pkg/contrib/mmap return true; } /*}}}*/ -@@ -133,11 +153,13 @@ +@@ -133,12 +153,14 @@ if ((Flags & UnMapped) == UnMapped) return true; @@ -99,13 +99,14 @@ diff -ruN apt-0.5.4/apt-pkg/contrib/mmap if ((Flags & ReadOnly) != ReadOnly) if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0) return _error->Errno("msync","Unable to write mmap"); -+#endif #endif ++#endif return true; } -diff -ruN apt-0.5.4/apt-pkg/contrib/mmap.h apt-0.5.4-patched/apt-pkg/contrib/mmap.h ---- apt-0.5.4/apt-pkg/contrib/mmap.h Mon May 14 01:16:43 2001 -+++ apt-0.5.4-patched/apt-pkg/contrib/mmap.h Sun Nov 9 14:02:47 2003 + /*}}}*/ +diff -urN apt-0.5.4.orig/apt-pkg/contrib/mmap.h apt-0.5.4/apt-pkg/contrib/mmap.h +--- apt-0.5.4.orig/apt-pkg/contrib/mmap.h 2001-05-14 14:16:43.000000000 +0900 ++++ apt-0.5.4/apt-pkg/contrib/mmap.h 2005-03-08 13:00:38.000000000 +0900 @@ -46,6 +46,7 @@ unsigned long Flags; unsigned long iSize; @@ -114,9 +115,9 @@ diff -ruN apt-0.5.4/apt-pkg/contrib/mmap bool Map(FileFd &Fd); bool Close(bool DoSync = true); -diff -ruN apt-0.5.4/apt-pkg/deb/debindexfile.cc apt-0.5.4-patched/apt-pkg/deb/debindexfile.cc ---- apt-0.5.4/apt-pkg/deb/debindexfile.cc Sun Apr 29 01:13:51 2001 -+++ apt-0.5.4-patched/apt-pkg/deb/debindexfile.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/deb/debindexfile.cc apt-0.5.4/apt-pkg/deb/debindexfile.cc +--- apt-0.5.4.orig/apt-pkg/deb/debindexfile.cc 2001-04-29 14:13:51.000000000 +0900 ++++ apt-0.5.4/apt-pkg/deb/debindexfile.cc 2005-03-08 13:00:38.000000000 +0900 @@ -505,3 +505,11 @@ } @@ -129,10 +130,10 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debindex + (void)_apt_Pkg; + (void)_apt_Status; +} -diff -ruN apt-0.5.4/apt-pkg/deb/debsystem.cc apt-0.5.4-patched/apt-pkg/deb/debsystem.cc ---- apt-0.5.4/apt-pkg/deb/debsystem.cc Sun Apr 29 01:13:51 2001 -+++ apt-0.5.4-patched/apt-pkg/deb/debsystem.cc Sun Nov 9 14:02:47 2003 -@@ -27,6 +27,108 @@ +diff -urN apt-0.5.4.orig/apt-pkg/deb/debsystem.cc apt-0.5.4/apt-pkg/deb/debsystem.cc +--- apt-0.5.4.orig/apt-pkg/deb/debsystem.cc 2001-04-29 14:13:51.000000000 +0900 ++++ apt-0.5.4/apt-pkg/deb/debsystem.cc 2005-03-08 13:50:12.000000000 +0900 +@@ -27,6 +27,109 @@ #include #include /*}}}*/ @@ -203,9 +204,10 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste + 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; + @@ -241,7 +243,7 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste debSystem debSys; -@@ -48,6 +150,8 @@ +@@ -48,6 +151,8 @@ debSystem::~debSystem() { delete StatusFile; @@ -250,7 +252,7 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste } /*}}}*/ // System::Lock - Get the lock /*{{{*/ -@@ -161,8 +265,8 @@ +@@ -161,8 +266,8 @@ which is yet to be determined. The functions in pkgcachegen should be the only users of these */ Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct @@ -261,7 +263,7 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste return true; } -@@ -185,9 +289,9 @@ +@@ -185,9 +290,9 @@ signed debSystem::Score(Configuration const &Cnf) { signed Score = 0; @@ -273,7 +275,7 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste Score += 10; if (FileExists("/etc/debian_version") == true) Score += 10; -@@ -202,6 +306,44 @@ +@@ -202,6 +307,44 @@ if (StatusFile == 0) StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status")); List.push_back(StatusFile); @@ -318,20 +320,20 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste return true; } /*}}}*/ -@@ -216,6 +358,10 @@ - if (StatusFile->FindInCache(*File.Cache()) == File) +@@ -217,6 +360,10 @@ { Found = StatusFile; -+ return true; + return true; + } else if ((FinkStatusFile != 0) && (FinkStatusFile->FindInCache(*File.Cache()) == File)) + { + Found = FinkStatusFile; - return true; ++ return true; } -diff -ruN apt-0.5.4/apt-pkg/deb/debsystem.h apt-0.5.4-patched/apt-pkg/deb/debsystem.h ---- apt-0.5.4/apt-pkg/deb/debsystem.h Sun Apr 29 01:13:51 2001 -+++ apt-0.5.4-patched/apt-pkg/deb/debsystem.h Sun Nov 9 14:02:47 2003 + return false; +diff -urN apt-0.5.4.orig/apt-pkg/deb/debsystem.h apt-0.5.4/apt-pkg/deb/debsystem.h +--- apt-0.5.4.orig/apt-pkg/deb/debsystem.h 2001-04-29 14:13:51.000000000 +0900 ++++ apt-0.5.4/apt-pkg/deb/debsystem.h 2005-03-08 13:00:38.000000000 +0900 @@ -25,6 +25,7 @@ bool CheckUpdates(); @@ -340,9 +342,9 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debsyste public: -diff -ruN apt-0.5.4/apt-pkg/deb/debversion.cc apt-0.5.4-patched/apt-pkg/deb/debversion.cc ---- apt-0.5.4/apt-pkg/deb/debversion.cc Mon May 7 01:14:53 2001 -+++ apt-0.5.4-patched/apt-pkg/deb/debversion.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/deb/debversion.cc apt-0.5.4/apt-pkg/deb/debversion.cc +--- apt-0.5.4.orig/apt-pkg/deb/debversion.cc 2001-05-07 14:14:53.000000000 +0900 ++++ apt-0.5.4/apt-pkg/deb/debversion.cc 2005-03-08 13:00:38.000000000 +0900 @@ -24,6 +24,11 @@ debVersioningSystem debVS; @@ -355,9 +357,9 @@ diff -ruN apt-0.5.4/apt-pkg/deb/debversi // debVS::debVersioningSystem - Constructor /*{{{*/ // --------------------------------------------------------------------- /* */ -diff -ruN apt-0.5.4/apt-pkg/init.cc apt-0.5.4-patched/apt-pkg/init.cc ---- apt-0.5.4/apt-pkg/init.cc Tue Mar 13 01:51:46 2001 -+++ apt-0.5.4-patched/apt-pkg/init.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/init.cc apt-0.5.4/apt-pkg/init.cc +--- apt-0.5.4.orig/apt-pkg/init.cc 2001-03-13 15:51:46.000000000 +0900 ++++ apt-0.5.4/apt-pkg/init.cc 2005-03-08 13:00:38.000000000 +0900 @@ -15,6 +15,8 @@ #include #include @@ -394,9 +396,9 @@ diff -ruN apt-0.5.4/apt-pkg/init.cc apt- Sys = 0; string Label = Cnf.Find("Apt::System",""); if (Label.empty() == false) -diff -ruN apt-0.5.4/apt-pkg/policy.cc apt-0.5.4-patched/apt-pkg/policy.cc ---- apt-0.5.4/apt-pkg/policy.cc Sun May 27 19:40:56 2001 -+++ apt-0.5.4-patched/apt-pkg/policy.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/policy.cc apt-0.5.4/apt-pkg/policy.cc +--- apt-0.5.4.orig/apt-pkg/policy.cc 2001-05-28 08:40:56.000000000 +0900 ++++ apt-0.5.4/apt-pkg/policy.cc 2005-03-08 13:00:38.000000000 +0900 @@ -183,7 +183,7 @@ Pin *P = 0; @@ -415,9 +417,9 @@ diff -ruN apt-0.5.4/apt-pkg/policy.cc ap } else { -diff -ruN apt-0.5.4/apt-pkg/tagfile.cc apt-0.5.4-patched/apt-pkg/tagfile.cc ---- apt-0.5.4/apt-pkg/tagfile.cc Mon May 14 01:56:26 2001 -+++ apt-0.5.4-patched/apt-pkg/tagfile.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/tagfile.cc apt-0.5.4/apt-pkg/tagfile.cc +--- apt-0.5.4.orig/apt-pkg/tagfile.cc 2001-05-14 14:56:26.000000000 +0900 ++++ apt-0.5.4/apt-pkg/tagfile.cc 2005-03-08 13:00:38.000000000 +0900 @@ -197,7 +197,7 @@ return false; @@ -443,9 +445,9 @@ diff -ruN apt-0.5.4/apt-pkg/tagfile.cc a return true; } -diff -ruN apt-0.5.4/apt-pkg/tagfile.h apt-0.5.4-patched/apt-pkg/tagfile.h ---- apt-0.5.4/apt-pkg/tagfile.h Sun Apr 22 01:42:52 2001 -+++ apt-0.5.4-patched/apt-pkg/tagfile.h Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/apt-pkg/tagfile.h apt-0.5.4/apt-pkg/tagfile.h +--- apt-0.5.4.orig/apt-pkg/tagfile.h 2001-04-22 14:42:52.000000000 +0900 ++++ apt-0.5.4/apt-pkg/tagfile.h 2005-03-08 13:00:38.000000000 +0900 @@ -34,7 +34,7 @@ // We have a limit of 256 tags per section. @@ -455,9 +457,9 @@ diff -ruN apt-0.5.4/apt-pkg/tagfile.h ap unsigned int TagCount; -diff -ruN apt-0.5.4/buildlib/environment.mak.in apt-0.5.4-patched/buildlib/environment.mak.in ---- apt-0.5.4/buildlib/environment.mak.in Tue May 29 01:11:03 2001 -+++ apt-0.5.4-patched/buildlib/environment.mak.in Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/buildlib/environment.mak.in apt-0.5.4/buildlib/environment.mak.in +--- apt-0.5.4.orig/buildlib/environment.mak.in 2001-05-29 14:11:03.000000000 +0900 ++++ apt-0.5.4/buildlib/environment.mak.in 2005-03-08 13:00:38.000000000 +0900 @@ -11,8 +11,8 @@ LIBSTDCPP_VER = @LIBSTDCPP_VER@ @@ -490,9 +492,9 @@ diff -ruN apt-0.5.4/buildlib/environment +SONAME_MAGIC=-install_name @PREFIX@/lib/ +LFLAGS_SO=-dynamiclib -diff -ruN apt-0.5.4/buildlib/library.mak apt-0.5.4-patched/buildlib/library.mak ---- apt-0.5.4/buildlib/library.mak Mon Feb 26 23:16:05 2001 -+++ apt-0.5.4-patched/buildlib/library.mak Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/buildlib/library.mak apt-0.5.4/buildlib/library.mak +--- apt-0.5.4.orig/buildlib/library.mak 2001-02-27 13:16:05.000000000 +0900 ++++ apt-0.5.4/buildlib/library.mak 2005-03-08 13:00:38.000000000 +0900 @@ -15,17 +15,17 @@ # See defaults.mak for information about LOCAL @@ -545,9 +547,9 @@ diff -ruN apt-0.5.4/buildlib/library.mak $(filter %.opic,$^) \ $($(@F)-SLIBS) -diff -ruN apt-0.5.4/buildlib/ostable apt-0.5.4-patched/buildlib/ostable ---- apt-0.5.4/buildlib/ostable Tue Feb 20 02:03:17 2001 -+++ apt-0.5.4-patched/buildlib/ostable Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/buildlib/ostable apt-0.5.4/buildlib/ostable +--- apt-0.5.4.orig/buildlib/ostable 2001-02-20 16:03:17.000000000 +0900 ++++ apt-0.5.4/buildlib/ostable 2005-03-08 13:00:38.000000000 +0900 @@ -14,6 +14,7 @@ hp-hpux[^-]* hp-ux sun-solaris[^-]* solaris @@ -556,9 +558,9 @@ diff -ruN apt-0.5.4/buildlib/ostable apt # Catch all .* unknown -diff -ruN apt-0.5.4/cmdline/apt-cache.cc apt-0.5.4-patched/cmdline/apt-cache.cc ---- apt-0.5.4/cmdline/apt-cache.cc Sun Jul 1 20:10:32 2001 -+++ apt-0.5.4-patched/cmdline/apt-cache.cc Sun Nov 9 14:02:47 2003 +diff -urN apt-0.5.4.orig/cmdline/apt-cache.cc apt-0.5.4/cmdline/apt-cache.cc +--- apt-0.5.4.orig/cmdline/apt-cache.cc 2001-07-02 09:10:32.000000000 +0900 ++++ apt-0.5.4/cmdline/apt-cache.cc 2005-03-08 13:00:38.000000000 +0900 @@ -374,8 +374,10 @@ if (ReadPinFile(Plcy) == false) return false; @@ -581,9 +583,9 @@ diff -ruN apt-0.5.4/cmdline/apt-cache.cc // Iterate over all the package files and write them out. char *Buffer = new char[Cache.HeaderP->MaxVerFileSize+10]; -diff -ruN apt-0.5.4/cmdline/apt-get.cc apt-0.5.4-patched/cmdline/apt-get.cc ---- apt-0.5.4/cmdline/apt-get.cc 2001-07-01 18:59:04.000000000 -0400 -+++ apt-0.5.4-patched/cmdline/apt-get.cc 2004-10-12 13:48:09.000000000 -0400 +diff -urN apt-0.5.4.orig/cmdline/apt-get.cc apt-0.5.4/cmdline/apt-get.cc +--- apt-0.5.4.orig/cmdline/apt-get.cc 2001-07-02 07:59:04.000000000 +0900 ++++ apt-0.5.4/cmdline/apt-get.cc 2005-03-08 13:00:38.000000000 +0900 @@ -113,6 +113,8 @@ return true; } @@ -710,9 +712,9 @@ diff -ruN apt-0.5.4/cmdline/apt-get.cc a // Deal with stdout not being a tty if (ttyname(STDOUT_FILENO) == 0 && _config->FindI("quiet",0) < 1) -diff -ruN apt-0.5.4/configure apt-0.5.4-patched/configure ---- apt-0.5.4/configure Sat Aug 18 20:46:43 2001 -+++ apt-0.5.4-patched/configure Sun Nov 9 14:02:48 2003 +diff -urN apt-0.5.4.orig/configure apt-0.5.4/configure +--- apt-0.5.4.orig/configure 2001-08-19 09:46:43.000000000 +0900 ++++ apt-0.5.4/configure 2005-03-08 13:00:38.000000000 +0900 @@ -2394,7 +2394,7 @@ ac_given_srcdir=$srcdir @@ -740,18 +742,18 @@ diff -ruN apt-0.5.4/configure apt-0.5.4- exit 0 EOF chmod +x $CONFIG_STATUS -diff -ruN apt-0.5.4/configure.in apt-0.5.4-patched/configure.in ---- apt-0.5.4/configure.in Mon Jun 18 01:56:32 2001 -+++ apt-0.5.4-patched/configure.in Sun Nov 9 14:02:48 2003 +diff -urN apt-0.5.4.orig/configure.in apt-0.5.4/configure.in +--- apt-0.5.4.orig/configure.in 2001-06-18 14:56:32.000000000 +0900 ++++ apt-0.5.4/configure.in 2005-03-08 13:00:38.000000000 +0900 @@ -163,4 +163,4 @@ rc_LIBSTDCPP_VER ah_GCC3DEP -AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in,make -s dirs) +AC_OUTPUT(environment.mak:buildlib/environment.mak.in makefile.wrap:buildlib/makefile.in,make -f makefile.wrap -s dirs) -diff -ruN apt-0.5.4/doc/apt-cache.8 apt-0.5.4-patched/doc/apt-cache.8 ---- apt-0.5.4/doc/apt-cache.8 2001-08-18 20:48:24.000000000 -0400 -+++ apt-0.5.4-patched/doc/apt-cache.8 2004-10-07 01:08:45.000000000 -0400 +diff -urN apt-0.5.4.orig/doc/apt-cache.8 apt-0.5.4/doc/apt-cache.8 +--- apt-0.5.4.orig/doc/apt-cache.8 2001-08-19 09:48:24.000000000 +0900 ++++ apt-0.5.4/doc/apt-cache.8 2005-03-08 13:00:38.000000000 +0900 @@ -277,16 +277,16 @@ option. The syntax is \fB-o Foo::Bar=bar\fR. .SH "FILES" @@ -772,9 +774,9 @@ diff -ruN apt-0.5.4/doc/apt-cache.8 apt- storage area for state information in transit. Configuration Item: Dir::State::Lists (implicit partial). .SH "SEE ALSO" -diff -ruN apt-0.5.4/doc/apt-cdrom.8 apt-0.5.4-patched/doc/apt-cdrom.8 ---- apt-0.5.4/doc/apt-cdrom.8 2001-08-18 20:48:25.000000000 -0400 -+++ apt-0.5.4-patched/doc/apt-cdrom.8 2004-10-07 01:10:19.000000000 -0400 +diff -urN apt-0.5.4.orig/doc/apt-cdrom.8 apt-0.5.4/doc/apt-cdrom.8 +--- apt-0.5.4.orig/doc/apt-cdrom.8 2001-08-19 09:48:25.000000000 +0900 ++++ apt-0.5.4/doc/apt-cdrom.8 2005-03-08 13:00:38.000000000 +0900 @@ -32,7 +32,7 @@ APT uses a CDROM ID to track which disc is currently in the drive and @@ -784,9 +786,9 @@ diff -ruN apt-0.5.4/doc/apt-cdrom.8 apt- .TP \fBident\fR A debugging tool to report the identity of the current disc as well -diff -ruN apt-0.5.4/doc/apt-config.8 apt-0.5.4-patched/doc/apt-config.8 ---- apt-0.5.4/doc/apt-config.8 2001-08-18 20:48:27.000000000 -0400 -+++ apt-0.5.4-patched/doc/apt-config.8 2004-10-07 01:09:29.000000000 -0400 +diff -urN apt-0.5.4.orig/doc/apt-config.8 apt-0.5.4/doc/apt-config.8 +--- apt-0.5.4.orig/doc/apt-config.8 2001-08-19 09:48:27.000000000 +0900 ++++ apt-0.5.4/doc/apt-config.8 2005-03-08 13:00:38.000000000 +0900 @@ -13,7 +13,7 @@ .PP \fBapt-config\fR is an internal program used by various portions of @@ -796,9 +798,9 @@ diff -ruN apt-0.5.4/doc/apt-config.8 apt easy to use by scripted applications. .PP Unless the \fB-h\fR, or \fB--help\fR option is given one of the -diff -ruN apt-0.5.4/doc/apt-get.8 apt-0.5.4-patched/doc/apt-get.8 ---- apt-0.5.4/doc/apt-get.8 2001-08-18 20:48:25.000000000 -0400 -+++ apt-0.5.4-patched/doc/apt-get.8 2004-10-07 01:16:25.000000000 -0400 +diff -urN apt-0.5.4.orig/doc/apt-get.8 apt-0.5.4/doc/apt-get.8 +--- apt-0.5.4.orig/doc/apt-get.8 2001-08-19 09:48:25.000000000 +0900 ++++ apt-0.5.4/doc/apt-get.8 2005-03-08 13:00:38.000000000 +0900 @@ -20,7 +20,7 @@ \fBupdate\fR update is used to resynchronize the package index files from @@ -927,9 +929,9 @@ diff -ruN apt-0.5.4/doc/apt-get.8 apt-0. storage area for state information in transit. Configuration Item: Dir::State::Lists (implicit partial). .SH "SEE ALSO" -diff -ruN apt-0.5.4/doc/apt_preferences.5 apt-0.5.4-patched/doc/apt_preferences.5 ---- apt-0.5.4/doc/apt_preferences.5 2001-08-18 20:48:28.000000000 -0400 -+++ apt-0.5.4-patched/doc/apt_preferences.5 2004-10-07 01:12:21.000000000 -0400 +diff -urN apt-0.5.4.orig/doc/apt_preferences.5 apt-0.5.4/doc/apt_preferences.5 +--- apt-0.5.4.orig/doc/apt_preferences.5 2001-08-19 09:48:28.000000000 +0900 ++++ apt-0.5.4/doc/apt_preferences.5 2005-03-08 13:00:38.000000000 +0900 @@ -12,7 +12,7 @@ It is meant to be user editable and manipulatable from software. The file consists of a number of records formed like the dpkg status file, space @@ -939,9 +941,9 @@ diff -ruN apt-0.5.4/doc/apt_preferences. .SH "VERSIONING" .PP One purpose of the preferences file is to let the user select which version -diff -ruN apt-0.5.4/doc/sources.list.5 apt-0.5.4-patched/doc/sources.list.5 ---- apt-0.5.4/doc/sources.list.5 2001-08-18 20:48:26.000000000 -0400 -+++ apt-0.5.4-patched/doc/sources.list.5 2004-10-07 01:06:21.000000000 -0400 +diff -urN apt-0.5.4.orig/doc/sources.list.5 apt-0.5.4/doc/sources.list.5 +--- apt-0.5.4.orig/doc/sources.list.5 2001-08-19 09:48:26.000000000 +0900 ++++ apt-0.5.4/doc/sources.list.5 2005-03-08 13:00:38.000000000 +0900 @@ -11,7 +11,7 @@ The package resource list is used to locate archives of the package distribution system in use on the system. At this time, this manual page @@ -963,9 +965,9 @@ diff -ruN apt-0.5.4/doc/sources.list.5 a deb-src type describes a debian distribution's source code in the same form as the deb type. A deb-src line is required to fetch source indexes. -diff -ruN apt-0.5.4/dselect/install apt-0.5.4-patched/dselect/install ---- apt-0.5.4/dselect/install Tue Feb 20 02:03:17 2001 -+++ apt-0.5.4-patched/dselect/install Sun Nov 9 14:02:48 2003 +diff -urN apt-0.5.4.orig/dselect/install apt-0.5.4/dselect/install +--- apt-0.5.4.orig/dselect/install 2001-02-20 16:03:17.000000000 +0900 ++++ apt-0.5.4/dselect/install 2005-03-08 13:00:38.000000000 +0900 @@ -3,8 +3,8 @@ # Get the configuration from /etc/apt/apt.conf CLEAN="prompt" @@ -977,9 +979,9 @@ diff -ruN apt-0.5.4/dselect/install apt- DPKG_OPTS="--admindir=$1" APT_OPT0="-oDir::State::status=$1/status" APT_OPT1="-oDPkg::Options::=$DPKG_OPTS" -diff -ruN apt-0.5.4/dselect/setup apt-0.5.4-patched/dselect/setup ---- apt-0.5.4/dselect/setup Wed Jan 26 23:15:10 2000 -+++ apt-0.5.4-patched/dselect/setup Sun Nov 9 14:36:03 2003 +diff -urN apt-0.5.4.orig/dselect/setup apt-0.5.4/dselect/setup +--- apt-0.5.4.orig/dselect/setup 2000-01-27 13:15:10.000000000 +0900 ++++ apt-0.5.4/dselect/setup 2005-03-08 13:00:38.000000000 +0900 @@ -23,15 +23,17 @@ my $vardir=$ARGV[0]; my $method=$ARGV[1]; @@ -1051,9 +1053,9 @@ diff -ruN apt-0.5.4/dselect/setup apt-0. my $answer = ; chomp ($answer); $answer =~ s/\s+/ /og; -diff -ruN apt-0.5.4/dselect/update apt-0.5.4-patched/dselect/update ---- apt-0.5.4/dselect/update Mon Mar 12 20:45:36 2001 -+++ apt-0.5.4-patched/dselect/update Sun Nov 9 14:02:48 2003 +diff -urN apt-0.5.4.orig/dselect/update apt-0.5.4/dselect/update +--- apt-0.5.4.orig/dselect/update 2001-03-13 10:45:36.000000000 +0900 ++++ apt-0.5.4/dselect/update 2005-03-08 13:00:38.000000000 +0900 @@ -4,13 +4,13 @@ # Get the configuration from /etc/apt/apt.conf CLEAN="prompt" @@ -1072,33 +1074,41 @@ diff -ruN apt-0.5.4/dselect/update apt-0 PROMPT="false" RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \ DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \ -diff -ruN apt-0.5.4/methods/connect.cc apt-0.5.4-patched/methods/connect.cc ---- apt-0.5.4/methods/connect.cc Tue Feb 20 02:03:18 2001 -+++ apt-0.5.4-patched/methods/connect.cc Sun Nov 9 14:02:48 2003 -@@ -90,7 +90,7 @@ +diff -urN apt-0.5.4.orig/methods/connect.cc apt-0.5.4/methods/connect.cc +--- apt-0.5.4.orig/methods/connect.cc 2001-02-20 16:03:18.000000000 +0900 ++++ apt-0.5.4/methods/connect.cc 2005-03-08 13:10:40.000000000 +0900 +@@ -90,7 +90,11 @@ // Check the socket for an error condition unsigned int Err; - unsigned int Len = sizeof(Err); ++#ifndef HAVE_SOCKLEN_T + int Len = sizeof(Err); ++#else ++ socklen_t Len = sizeof(Err); ++#endif if (getsockopt(Fd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0) return _error->Errno("getsockopt","Failed"); -diff -ruN apt-0.5.4/methods/ftp.cc apt-0.5.4-patched/methods/ftp.cc ---- apt-0.5.4/methods/ftp.cc Tue May 22 00:02:00 2001 -+++ apt-0.5.4-patched/methods/ftp.cc Sun Nov 9 14:02:48 2003 -@@ -694,7 +694,7 @@ +diff -urN apt-0.5.4.orig/methods/ftp.cc apt-0.5.4/methods/ftp.cc +--- apt-0.5.4.orig/methods/ftp.cc 2001-05-22 13:02:00.000000000 +0900 ++++ apt-0.5.4/methods/ftp.cc 2005-03-08 13:09:26.000000000 +0900 +@@ -694,7 +694,11 @@ if (WaitFd(DataFd,true,TimeOut) == false) return _error->Error("Could not connect data socket, connection timed out"); unsigned int Err; - unsigned int Len = sizeof(Err); ++#ifndef HAVE_SOCKLEN_T + int Len = sizeof(Err); ++#else ++ socklen_t Len = sizeof(Err); ++#endif if (getsockopt(DataFd,SOL_SOCKET,SO_ERROR,&Err,&Len) != 0) return _error->Errno("getsockopt","Failed"); if (Err != 0) -diff -ruN apt-0.5.4/methods/rfc2553emu.h apt-0.5.4-patched/methods/rfc2553emu.h ---- apt-0.5.4/methods/rfc2553emu.h Sun Jun 18 02:04:45 2000 -+++ apt-0.5.4-patched/methods/rfc2553emu.h Sun Nov 9 14:02:48 2003 +diff -urN apt-0.5.4.orig/methods/rfc2553emu.h apt-0.5.4/methods/rfc2553emu.h +--- apt-0.5.4.orig/methods/rfc2553emu.h 2000-06-18 15:04:45.000000000 +0900 ++++ apt-0.5.4/methods/rfc2553emu.h 2005-03-08 13:00:38.000000000 +0900 @@ -26,6 +26,11 @@ #include #include @@ -1120,19 +1130,19 @@ diff -ruN apt-0.5.4/methods/rfc2553emu.h // getaddrinfo support? #ifndef HAVE_GETADDRINFO // Renamed to advoid type clashing.. (for debugging) -@@ -100,6 +107,9 @@ - // #define NI_NOFQDN (1<<2) +@@ -101,6 +108,9 @@ #define NI_NAMEREQD (1<<3) #define NI_DATAGRAM (1<<4) -+ #endif + #endif + #ifndef NI_DATAGRAM + #define NI_DATAGRAM NI_DGRAM - #endif ++ #endif #define sockaddr_storage sockaddr_in -diff -ruN apt-0.5.4/patch_flush apt-0.5.4-patched/patch_flush ---- apt-0.5.4/patch_flush Wed Dec 31 19:00:00 1969 -+++ apt-0.5.4-patched/patch_flush Sun Nov 9 14:02:48 2003 + #endif +diff -urN apt-0.5.4.orig/patch_flush apt-0.5.4/patch_flush +--- apt-0.5.4.orig/patch_flush 1970-01-01 09:00:00.000000000 +0900 ++++ apt-0.5.4/patch_flush 2005-03-08 13:00:38.000000000 +0900 @@ -0,0 +1,11 @@ +#!/bin/sh +set -e Index: 10.4-transitional/cctools-extra.info =================================================================== RCS file: /cvsroot/fink/fink/10.4-transitional/cctools-extra.info,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 cctools-extra.info --- 10.4-transitional/cctools-extra.info 28 Apr 2005 09:52:20 -0000 1.2 +++ 10.4-transitional/cctools-extra.info 1 Jul 2005 02:23:08 -0000 @@ -9,9 +9,6 @@ SourceDirectory: cctools-%v Patch: %n.patch Essential: yes Depends: base-files -BuildDepends: gcc3.3 -SetCC: gcc-3.3 -SetCXX: g++-3.3 CompileScript: << #!/bin/sh Index: 10.4-transitional/dpkg.info =================================================================== RCS file: /cvsroot/fink/fink/10.4-transitional/dpkg.info,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 dpkg.info --- 10.4-transitional/dpkg.info 30 Jun 2005 19:08:51 -0000 1.3 +++ 10.4-transitional/dpkg.info 1 Jul 2005 02:23:08 -0000 @@ -1,9 +1,8 @@ Package: dpkg Version: 1.10.21 -Revision: 204 +Revision: 217 GCC: 3.3 -Depends: gettext, libiconv, gzip, tar, ncurses (>= 5.3-12) -BuildDepends: gcc3.3 +Depends: gettext, libiconv, gzip, tar, libncurses5-shlibs Essential: yes Maintainer: Fink Core Group Source: mirror:sourceforge:fink/dpkg_%v.tar.gz @@ -14,9 +13,9 @@ SetCFLAGS: -no-cpp-precomp -I%p/include NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 CompileScript: << - %p/bin/fink -y install gettext-bin gettext-dev gettext-tools libiconv-dev ncurses-dev - 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 + %p/bin/fink -y install gettext-bin gettext-dev gettext-tools libiconv-dev libncurses5 + 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: << @@ -50,6 +49,11 @@ Patched to run 'fink-virtual-pkgs' to se Patched to suppress warning about BuildDependsOnly control field. Previous versions by Christoph Pfisterer. + +Patched to not remove Darwin's system-critical symlinks (/etc /tmp /var) + +Patched to hardcode complete paths to our component executables +instead of relying on PATH << # PostInstScript: << Index: 10.4-transitional/dpkg.patch =================================================================== RCS file: /cvsroot/fink/fink/10.4-transitional/dpkg.patch,v retrieving revision 1.2 diff -u -3 -p -u -r1.2 dpkg.patch --- 10.4-transitional/dpkg.patch 28 Apr 2005 09:52:20 -0000 1.2 +++ 10.4-transitional/dpkg.patch 1 Jul 2005 02:23:09 -0000 @@ -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 @@ diff -urN dpkg-1.10.21.orig/Makefile.con 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 @@ diff -urN dpkg-1.10.21.orig/dpkg-deb/Mak + $(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 @@ diff -urN dpkg-1.10.21.orig/dpkg-deb/bui 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 @@ diff -urN dpkg-1.10.21.orig/dpkg-deb/dpk 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 @@ diff -urN dpkg-1.10.21.orig/dselect/Make 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 @@ diff -urN dpkg-1.10.21.orig/dselect/dsel +.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 #include @@ -111,7 +132,7 @@ diff -urN dpkg-1.10.21.orig/dselect/main } #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 @@ diff -urN dpkg-1.10.21.orig/dselect/main + { + 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 @@ diff -urN dpkg-1.10.21.orig/dselect/main + 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 @@ diff -urN dpkg-1.10.21.orig/dselect/main 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 @@ diff -urN dpkg-1.10.21.orig/dselect/main 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 @@ diff -urN dpkg-1.10.21.orig/dselect/pkgd 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 @@ diff -urN dpkg-1.10.21.orig/include/dpkg #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 #include @@ -374,8 +396,8 @@ diff -urN dpkg-1.10.21.orig/lib/nfmalloc #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 @@ diff -urN dpkg-1.10.21.orig/lib/tarfn.c 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 @@ diff -urN dpkg-1.10.21.orig/main/Makefil 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 @@ diff -urN dpkg-1.10.21.orig/main/archive 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/configu 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 @@ diff -urN dpkg-1.10.21.orig/main/dpkg-qu 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 @@ diff -urN dpkg-1.10.21.orig/main/dpkg.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 @@ diff -urN dpkg-1.10.21.orig/main/help.c 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 #include @@ -809,8 +831,8 @@ diff -urN dpkg-1.10.21.orig/main/main.c 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 @@ diff -urN dpkg-1.10.21.orig/main/main.h /* 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 @@ diff -urN dpkg-1.10.21.orig/main/package 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 @@ diff -urN dpkg-1.10.21.orig/man/en/dpkg. .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 @@ diff -urN dpkg-1.10.21.orig/man/en/dsele .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 @@ diff -urN dpkg-1.10.21.orig/man/fr/clean +.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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- +.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 @@ -1001,8 +1023,8 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- +.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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- \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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- 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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- .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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- +.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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg- +.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 @@ diff -urN dpkg-1.10.21.orig/man/fr/dpkg. .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 @@ diff -urN dpkg-1.10.21.orig/man/fr/insta 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 @@ diff -urN dpkg-1.10.21.orig/man/fr/updat .\" .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 @@ diff -urN dpkg-1.10.21.orig/man/ja/clean 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 @@ diff -urN dpkg-1.10.21.orig/man/ja/dpkg- .SH ËÝÌõ¼Ô ´îÀ¥¹À 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 @@ diff -urN dpkg-1.10.21.orig/man/ja/dpkg- 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 @@ diff -urN dpkg-1.10.21.orig/man/ja/dpkg- 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 @@ diff -urN dpkg-1.10.21.orig/man/ja/dpkg- 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 @@ diff -urN dpkg-1.10.21.orig/man/ja/dpkg. ¤É¤¦¤«¡¢¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¤«¤É¤¦¤«¡¢¤Ê¤É¤Î¾ðÊ󤬴ޤޤì¤Æ¤¤¤ë¡£¤¯¤ï¤·¤¯¤Ï¡¢ \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 @@ diff -urN dpkg-1.10.21.orig/man/ja/insta ´Ø¸Í ¹¬°ì .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 @@ diff -urN dpkg-1.10.21.orig/man/ja/updat .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 @@ diff -urN dpkg-1.10.21.orig/man/pt_BR/up .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 @@ diff -urN dpkg-1.10.21.orig/man/ru/dpkg. .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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dpkg- +.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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dpkg- 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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dpkg- 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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dpkg. +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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dpkg. .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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dsele +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 @@ diff -urN dpkg-1.10.21.orig/man/sv/dsele .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 @@ diff -urN dpkg-1.10.21.orig/scripts/clea 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 @@ diff -urN dpkg-1.10.21.orig/scripts/dpkg 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 @@ diff -urN dpkg-1.10.21.orig/scripts/dpkg 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 @@ diff -urN dpkg-1.10.21.orig/scripts/dpkg +.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 @@ diff -urN dpkg-1.10.21.orig/scripts/dpkg +.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 @@ diff -urN dpkg-1.10.21.orig/scripts/dpkg 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 @@ diff -urN dpkg-1.10.21.orig/scripts/inst 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 @@ diff -urN dpkg-1.10.21.orig/scripts/upda .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 @@ diff -urN dpkg-1.10.21.orig/scripts/upda $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 @@ diff -urN dpkg-1.10.21.orig/split/Makefi 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 @@ diff -urN dpkg-1.10.21.orig/split/dpkg-s 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) @@ -2436,3 +2458,69 @@ diff -urN dpkg-1.10.21.orig/utils/Makefi md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a - $(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS) + $(CC) $(LDFLAGS) $(EXEFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS) +diff -Nurd dpkg-1.10.21.orig/main/help.c dpkg-1.10.21/main/help.c +--- dpkg-1.10.21.orig/main/help.c Sat Oct 25 16:03:21 2003 ++++ dpkg-1.10.21/main/help.c Thu Mar 10 03:56:22 2005 +@@ -417,6 +417,26 @@ + + debug(dbg_veryverbose, "isdirectoryinuse `%s' (except %s)", file->name, + pkg ? pkg->name : ""); ++ ++ /* FINK LOCAL begin */ ++ ++ /* ++ * Darwin has symlinks /etc -> /private/etc and /var -> /private/var ++ * instead of actual /etc and /var dirs. If dpkg removes the last ++ * pkg that it has record of having installed a file in one of those ++ * top-level dirs, it will try to remove the dir (since it thinks ++ * it's an empty dir) and it will succeed (since it's just unlinking ++ * a symlink, not trying to remove a dir that is not actually ++ * empty). That's Bad. Here we make sure these top-level dirs are ++ * never thought to be empty. ++ */ ++ if( !strcmp(file->name,"/etc") || !strcmp(file->name,"/tmp") || !strcmp(file->name,"/var") ) { ++ debug(dbg_veryverbose, "isdirectoryinuse precious!"); ++ return 1; ++ } ++ ++ /* FINK LOCAL end */ ++ + for (packageslump= file->packages; packageslump; packageslump= packageslump->more) { + debug(dbg_veryverbose, "isdirectoryinuse packageslump %s ...", + packageslump->pkgs[0] ? packageslump->pkgs[0]->name : ""); +diff -ur 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 2004-04-24 17:14:21.000000000 -0400 ++++ dpkg-1.10.21/include/dpkg.h.in 2005-03-18 01:59:16.000000000 -0500 +@@ -118,13 +118,13 @@ + + #define ARCHIVE_FILENAME_PATTERN "*.deb" + +-#define BACKEND "dpkg-deb" +-#define DPKGQUERY "dpkg-query" +-#define SPLITTER "dpkg-split" +-#define MD5SUM "md5sum" +-#define DSELECT "dselect" +-#define DPKG "dpkg" +-#define DEBSIGVERIFY "/usr/bin/debsig-verify" ++#define BACKEND "@PREFIX@/bin/dpkg-deb" ++#define DPKGQUERY "@PREFIX@/bin/dpkg-query" ++#define SPLITTER "@PREFIX@/bin/dpkg-split" ++#define MD5SUM "@PREFIX@/bin/md5sum" ++#define DSELECT "@PREFIX@/bin/dselect" ++#define DPKG "@PREFIX@/bin/dpkg" ++#define DEBSIGVERIFY "@PREFIX@/bin/debsig-verify" + + #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);