[ckan-changes] commit/ckan: thejimmyg: [packaging] adding in a dependency on the conflicting requirements #1168 for the build and test system

[Bitbucket]

1 new changeset in ckan:

http://bitbucket.org/okfn/ckan/changeset/be399dffca43/
changeset:   be399dffca43
branch:      release-v1.4.1
user:        thejimmyg
date:        2011-06-11 13:23:31
summary:     [packaging] adding in a dependency on the conflicting requirements #1168 for the build and test system
affected #:  1 file (138 bytes)

--- a/requires/lucid_missing.txt	Fri Jun 10 22:31:04 2011 +0100
+++ b/requires/lucid_missing.txt	Sat Jun 11 12:23:31 2011 +0100
@@ -13,6 +13,8 @@
 -e git+https://github.com/wwaites/autoneg.git@b4c727b164f411cc9d60#egg=autoneg
 # flup>=0.5
 -e hg+http://hg.saddi.com/flup@301a58656bfb#egg=flup
+# All the conflicting dependencies from the lucid_conflict.txt file
+-e hg+https://bitbucket.org/okfn/ckan-deps@e6f853c0f500#egg=ckan-deps
 
 # NOTE: Developers, our build script for the Debian packages relies on the 
 #       requirements above being specified as editable resources with their

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.