Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20211
Modified Files:
dpkg.info dpkg.patch
Log Message:
* Fix the order to check for deps, dpkg then f-v-p, it was checking
f-v-p first which is wrong. Thanks Snaggle
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dpkg.patch 31 Oct 2012 15:20:36 -0000 1.17
+++ dpkg.patch 21 May 2013 20:49:24 -0000 1.18
@@ -1,6 +1,6 @@
-diff -ruN dpkg-1.16.9.orig/fink/md5sum dpkg-1.16.9/fink/md5sum
---- dpkg-1.16.9.orig/fink/md5sum 1969-12-31 17:00:00.000000000 -0700
-+++ dpkg-1.16.9/fink/md5sum 2012-07-02 16:14:45.000000000 -0600
+diff -ruN dpkg-1.16.10.orig/fink/md5sum dpkg-1.16.10/fink/md5sum
+--- dpkg-1.16.10.orig/fink/md5sum 1969-12-31 17:00:00.000000000 -0700
++++ dpkg-1.16.10/fink/md5sum 2012-07-02 16:14:45.000000000 -0600
@@ -0,0 +1,313 @@
+#!/usr/bin/perl
+use strict;
@@ -315,16 +315,16 @@
+ }
[...1665 lines suppressed...]
-+ $output = _g("<standard output>");
-diff -ruN dpkg-1.16.9.orig/fink/patches/test-fix.patch
dpkg-1.16.9/fink/patches/test-fix.patch
---- dpkg-1.16.9.orig/fink/patches/test-fix.patch 1969-12-31
17:00:00.000000000 -0700
-+++ dpkg-1.16.9/fink/patches/test-fix.patch 2012-10-31 09:11:35.000000000
-0600
++ sub extract_from_shlibs {
++@@ -694,7 +703,7 @@
++ next;
++ }
++ my $depread = defined($4) ? $4 : '';
++- if (($libname eq $2) && ($libversion eq $3)) {
+++ if (($libname eq $2 || $soname eq $2) && ($libversion eq $3)) {
++ # Define dep and end here if the package type explicitly
++ # matches. Otherwise if the packagetype is not specified, use
++ # the dep only as a default that can be overriden by a later
+diff -ruN dpkg-1.16.10.orig/fink/patches/test-fix.patch
dpkg-1.16.10/fink/patches/test-fix.patch
+--- dpkg-1.16.10.orig/fink/patches/test-fix.patch 1969-12-31
17:00:00.000000000 -0700
++++ dpkg-1.16.10/fink/patches/test-fix.patch 2012-10-31 09:11:35.000000000
-0600
@@ -0,0 +1,20 @@
+diff -ruN dpkg-1.16.4.3.orig/src/t/100_dpkg_divert.t
dpkg-1.16.4.3/src/t/100_dpkg_divert.t
+--- dpkg-1.16.4.3.orig/src/t/100_dpkg_divert.t 2012-06-13
23:12:34.000000000 -0600
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- dpkg.info 17 Apr 2013 16:00:11 -0000 1.41
+++ dpkg.info 21 May 2013 20:49:24 -0000 1.42
@@ -36,7 +36,7 @@
Source-MD5: a20a06a5272717274a8b009368f237da
PatchFile: dpkg.patch
-PatchFile-MD5: a9932d2527a62b1fb10196e24116a94c
+PatchFile-MD5: 76944f14e19764a76461b084c0cc8af9
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
