Move some libraries into conflict.

These libraries require a bit of buildkit trickery to package correectly, but
so they need to be moved into the same requires file (ie - conflict) in order
that the buildkit command can be shared across both the lucid build and the
precise build.

build.sh

@@ -48,8 +48,6 @@ echo "Building the packages ..."
 buildkit pkg python -p $CKAN_PACKAGE_VERSION \
                     --delete "solrpy" \
                     --distro-dep "python-solr" \
-                    --delete "repoze.who-friendlyform" \
-                    --rename "repoze.who.plugins.openid -> repoze.who-plugins" \
                     --rename "babel -> pybabel" \
                     --author-email="$EMAIL" \
                     --author-name="$NAME" \

requires/lucid_conflict.txt

@@ -14,3 +14,6 @@ tempita==0.5.1
 zope.interface==4.0.1
 routes==1.13
 paste==1.7.5.1
+repoze.who.plugins.openid==0.5.3
+repoze.who==1.0.19
+repoze.who-friendlyform==1.0.8

requires/lucid_present.txt

@@ -11,12 +11,9 @@ psycopg2==2.0.13
 # with pylons 0.9.7 (change to imports of Multidict)
 webob==1.0.8
 Pylons==0.9.7
-repoze.who==1.0.19
 # These are both combined into the python-repoze.who-plugins package
-repoze.who.plugins.openid==0.5.3
 # Actually from python-repoze.who-plugins but the openid plugin in the same
 # package is too old
-repoze.who-friendlyform==1.0.8
 pastescript==1.7.3
 
 # NOTE: Developers, please do not edit the versions, these versions are fixed

requires/precise_conflict.txt

@@ -15,3 +15,4 @@ Pylons==0.9.7
 repoze.who==1.0.19
 repoze.who.plugins.openid==0.5.3
 repoze.who-friendlyform==1.0.8
+babel==0.9.6