Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv30334/10.4/unstable/main/finkinfo/crypto
Modified Files:
monotone-10.6.info monotone.patch
Log Message:
Fix bash-completion script to bail on bash3, remove depend on bash4.
Bump gettext depends from 3 to 8.
Index: monotone-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/monotone-10.6.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- monotone-10.6.info 25 May 2011 21:31:01 -0000 1.6
+++ monotone-10.6.info 28 May 2011 02:10:18 -0000 1.7
@@ -1,17 +1,17 @@
Package: monotone
Version: 1.0
-Revision: 2
+Revision: 3
Source: http://www.monotone.ca/downloads/%v/monotone-%v.tar.bz2
Source-MD5: 6a0b5d8560f08d76a950172f9ed0feff
-#PatchFile: %n.patch
-#PatchFile-MD5: 3057175fa149abcb8b86edd981b4e060
+PatchFile: %n.patch
+PatchFile-MD5: a62e2135cf09a13c24811c902b4cc8c7
#PatchScript: sed -e 's|@SW@|%p|g' < %{PatchFile} | patch -p1
Distribution: 10.6
BuildDepends:<<
fink (>= 0.24.12),
boost1.41.cmake,
botan (>=1.8.1-1),
- libgettext3-dev (>= 0.14.5-2),
+ libgettext8-dev (>= 0.17-19),
libiconv-dev (>= 1.12-3),
libidn (>= 1.12-1),
lua51-dev (>= 5.1.4-1),
@@ -19,9 +19,9 @@
sqlite3-dev (>= 3.6.9-1004)
<<
Depends: <<
- bash (>=4.2-1),
+ bash-completion,
botan-shlibs (>= 1.8.1-1),
- libgettext3-shlibs (>= 0.14.5-2),
+ libgettext8-shlibs (>= 0.17-19),
libiconv (>= 1.12-3),
libidn-shlibs (>= 1.12-1),
lua51-shlibs (>= 5.1.4-1),
Index: monotone.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/monotone.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- monotone.patch 22 Oct 2010 13:39:58 -0000 1.2
+++ monotone.patch 28 May 2011 02:10:19 -0000 1.3
@@ -1,28 +1,19 @@
-diff -ru monotone-0.48/database.cc monotone-0.48-patched/database.cc
---- monotone-0.48/database.cc 2010-06-13 12:46:00.000000000 -0500
-+++ monotone-0.48-patched/database.cc 2010-10-22 07:35:24.000000000 -0500
-@@ -1489,12 +1489,19 @@
- vector<string> row;
- for (int col = 0; col < ncol; col++)
- {
-+ // We never store NULLs, so we should never see one.
-+ int const datatype = sqlite3_column_type(i->second.stmt(), col);
-+ E(datatype != SQLITE_NULL, origin::database,
-+ F("null result in query: %s") % query.sql_cmd);
- const char * value = (const
char*)sqlite3_column_blob(i->second.stmt(), col);
- int bytes = sqlite3_column_bytes(i->second.stmt(), col);
-- E(value, origin::database,
-- F("null result in query: %s") % query.sql_cmd);
-- row.push_back(string(value, value + bytes));
-- //L(FL("row %d col %d value='%s'") % nrow % col % value);
-+ if (value) {
-+ row.push_back(string(value, value + bytes));
-+ } else {
-+ // sqlite3_column_blob() returns null for zero-length
-+ I(bytes == 0);
-+ row.push_back(string());
-+ }
- }
- res.push_back(row);
- }
-Only in monotone-0.48-patched/: database.cc.orig
+diff -ru monotone-1.0/extra/shell/monotone.bash_completion.in
monotone-1.0-patched/extra/shell/monotone.bash_completion.in
+--- monotone-1.0/extra/shell/monotone.bash_completion.in 2011-03-26
01:40:57.000000000 -0500
++++ monotone-1.0-patched/extra/shell/monotone.bash_completion.in
2011-05-27 20:56:32.000000000 -0500
+@@ -26,6 +26,9 @@
+ # If you do it, be careful to set your locale to "C" and be sure the right
+ # mtn is used (you can use the environment variable MTN to point at the right
+ # one).
++
++if [ ${BASH_VERSINFO[0]} -ge 4 ]; then
++
+ # BEGIN ----------------------------------------------------------------------
+ @generated-command-list@
+ # END ------------------------------------------------------------------------
+@@ -396,3 +399,5 @@
+ }
+
+ complete -F _monotone mtn
++
++fi
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
