Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32215/main/finkinfo/base
Modified Files: Tag: pangocairo-branch dpkg.info dpkg.patch fink.info Log Message: merge from HEAD (pangocairo-root-21) Index: dpkg.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/dpkg.patch,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- dpkg.patch 20 Dec 2006 18:00:57 -0000 1.2.2.1 +++ dpkg.patch 14 Mar 2007 14:13:06 -0000 1.2.2.2 @@ -2570,3 +2570,17 @@ ohshite(_("failed to exec tar -cf")); } close(p1[0]); +diff -Naur dpkg-1.10.21/lib/mlib.c dpkg-new/lib/mlib.c +--- dpkg-1.10.21/lib/mlib.c 2007-03-10 12:20:35.000000000 -0500 ++++ dpkg-new/lib/mlib.c 2007-03-10 15:13:48.000000000 -0500 +@@ -110,7 +110,9 @@ + if (WIFEXITED(status)) { + n= WEXITSTATUS(status); if (!n) return n; + if(!(flags & PROCNOERR)) { +- if(flags & PROCWARN) ++ /* FINK LOCAL: Tar status 1 is a warning. */ ++ if((flags & PROCWARN) || (n == 1 && strncmp(description, "tar", 3) == 0)) ++ /* FINK LOCAL */ + fprintf(stderr, _("dpkg: warning - %s returned error exit status %d\n"),description,n); + else + ohshit(_("subprocess %s returned error exit status %d"),description,n); Index: fink.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/fink.info,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -d -r1.18.2.2 -r1.18.2.3 --- fink.info 9 Mar 2007 01:13:25 -0000 1.18.2.2 +++ fink.info 14 Mar 2007 14:13:06 -0000 1.18.2.3 @@ -1,5 +1,5 @@ Package: fink -Version: 0.26.2 +Version: 0.26.3 Revision: 31 Depends: base-files Suggests: << @@ -12,7 +12,7 @@ Replaces: gcc3.1 (= 1175-6) Essential: yes Source: mirror:custom:fink/%n-%v.tar.gz -Source-MD5: 6fe4448d5e7fb42e6e2af08d29f1b73f +Source-MD5: 5fa24d5d81c69c42ca8308c6cf488daf NoSetPATH: true CompileScript: << make test PREFIX=%p Index: dpkg.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/base/dpkg.info,v retrieving revision 1.5.2.3 retrieving revision 1.5.2.4 diff -u -d -r1.5.2.3 -r1.5.2.4 --- dpkg.info 16 Jan 2007 16:02:08 -0000 1.5.2.3 +++ dpkg.info 14 Mar 2007 14:13:06 -0000 1.5.2.4 @@ -1,6 +1,6 @@ Package: dpkg Version: 1.10.21 -Revision: 1220 +Revision: 1221 GCC: 4.0 BuildDepends: fink (>= 0.24.12) Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs (>= 5.4-20041023-1006) @@ -12,7 +12,7 @@ Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz Source2-MD5: e2f6581626a22a0de66dce1d81d00de3 PatchFile: %n.patch -PatchFile-MD5: 1932e930ef89ef8e6e65bc7e304dd788 +PatchFile-MD5: 49fc7cb90bb3ae0aa64c359044461699 PatchScript: << cd %b/..; sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p0 cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g' ltmain.sh @@ -82,8 +82,11 @@ Patched to hardcode complete paths to our component executables instead of relying on PATH -Patch 'dpkg -b' tar invovation to avoid warning under tar>=1.16 +Patch 'dpkg -b' tar invocation to avoid warning under tar>=1.16 See: http://permalink.gmane.org/gmane.os.apple.fink.core/1281 + +Patch 'dpkg -b' tar invocation to not die if tar returns exit code 1. +(Exit 1 is a non-fatal error for tar; exit 2 is fatal.) patch written by vasi << # PostInstScript: << ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits