Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv28072
Modified Files:
git-cola.info git-cola.patch
Log Message:
New upstream git-cola 1.7.0.
Index: git-cola.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/git-cola.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- git-cola.patch 24 Jan 2011 13:10:12 -0000 1.2
+++ git-cola.patch 11 Nov 2011 02:21:34 -0000 1.3
@@ -1,7 +1,8 @@
-diff -ru cola-1.4.3.orig/bin/git-cola cola-1.4.3/bin/git-cola
---- cola-1.4.3.orig/bin/git-cola 2010-12-27 22:03:25.000000000 -0500
-+++ cola-1.4.3/bin/git-cola 2011-01-23 19:42:46.000000000 -0500
-@@ -26,6 +26,8 @@
+diff --git a/bin/git-cola b/bin/git-cola
+index 1947dfe..e20dade 100755
+--- a/bin/git-cola
++++ b/bin/git-cola
+@@ -26,6 +26,8 @@ def cola_init():
# Try to detect where it is run from and set prefix and the search path.
# It is assumed that the user installed Cola using the --prefix= option
prefix = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -10,11 +11,32 @@
# Look for modules in the source or install trees
thirdparty = os.path.join(prefix, 'thirdparty')
-@@ -36,6 +38,7 @@
+@@ -36,6 +38,7 @@ def cola_init():
else:
# Install tree: prefer cola
paths_to_try = [os.path.join(prefix, 'share', 'git-cola', 'lib')]
+ paths_to_try = paths_to_try + [os.path.join(prefix, 'lib',
'@PYTHON@', 'site-packages')]
sys.path = paths_to_try + sys.path
- # Setup the path so that git finds us when we run 'git cola'
+ if __name__ == '__main__':
+diff --git a/bin/git-dag b/bin/git-dag
+index e689d6b..fc4115b 100755
+--- a/bin/git-dag
++++ b/bin/git-dag
+@@ -26,6 +26,8 @@ def cola_init():
+ # Try to detect where it is run from and set prefix and the search path.
+ # It is assumed that the user installed Cola using the --prefix= option
+ prefix = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
++ if os.path.islink(__file__):
++ prefix = os.path.dirname(os.path.dirname(os.readlink(__file__)))
+
+ # Look for modules in the source or install trees
+ thirdparty = os.path.join(prefix, 'thirdparty')
+@@ -36,6 +38,7 @@ def cola_init():
+ else:
+ # Install tree: prefer cola
+ paths_to_try = [os.path.join(prefix, 'share', 'git-cola', 'lib')]
++ paths_to_try = paths_to_try + [os.path.join(prefix, 'lib',
'@PYTHON@', 'site-packages')]
+ sys.path = paths_to_try + sys.path
+
+
Index: git-cola.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/git-cola.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- git-cola.info 24 Jan 2011 13:10:12 -0000 1.2
+++ git-cola.info 11 Nov 2011 02:21:34 -0000 1.3
@@ -1,6 +1,6 @@
Info2: <<
Package: git-cola%type_pkg[qt]
-Version: 1.4.3
+Version: 1.7.0
Revision: 1
Type: python (2.7), qt (-mac -x11)
Description: Highly caffinated GUI for git
@@ -10,10 +10,12 @@
<<
Maintainer: Daniel Johnson <[email protected]>
License: GPL2
-Homepage: http://cola.tuxfamily.org/
+Homepage: http://git-cola.github.com/
-Source: http://cola.tuxfamily.org/releases/cola-%v.tar.gz
-Source-MD5: 64d9c3e45a746c8775a0f33f65b91155
+Source: https://nodeload.github.com/git-cola/git-cola/tarball/v1.7.0
+Source-MD5: d9aa884de6cf850cd29582686b6490e7
+SourceRename: %{ni}-%v.tar.gz
+SourceDirectory: git-cola-git-cola-e8c2076
Depends: <<
git (>= 1.7.3.2-1),
@@ -29,7 +31,7 @@
<<
PatchFile: %{ni}.patch
-PatchFile-MD5: 7904fb833832ac4e32f12c62a3747f46
+PatchFile-MD5: dc377f4013a78058dfe7a00acfd21b2b
PatchScript: sed 's|@PYTHON@|python%type_raw[python]|g ' <%{PatchFile} | patch
-p1
CompileScript:
PYTHONPATH=%p/lib/qt4%type_pkg[qt]/lib/python%type_raw[python]/site-packages
make prefix=%p/lib/qt4%type_pkg[qt] PYTHON=python%type_raw[python] standalone=1
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
