merge stable into default
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Thu, 21 Mar 2013 17:09:18 +0100
changeset 299 bdafb02c1aba
parent 294 4c332a5552be (current diff)
parent 298 e9526bfa5802 (diff)
child 304 2e5c49312081
merge stable into default
--- a/__pkginfo__.py	Fri Sep 21 22:42:10 2012 +0200
+++ b/__pkginfo__.py	Thu Mar 21 17:09:18 2013 +0100
@@ -13,7 +13,7 @@
 author_email = "contact@logilab.fr"
 web = 'http://www.cubicweb.org/project/%s' % distname
 classifiers = [
-    'Environment :: Web Environment'
+    'Environment :: Web Environment', 
     'Framework :: CubicWeb',
     'Programming Language :: Python',
     'Programming Language :: JavaScript',
--- a/data/cubes.blog.css	Fri Sep 21 22:42:10 2012 +0200
+++ b/data/cubes.blog.css	Thu Mar 21 17:09:18 2013 +0100
@@ -31,6 +31,7 @@
   font-family: "Palatino Linotype", Calluna-Exljbris, Georgia, "Times New Roman", Times, serif;
   max-width:56em;
   font-size:120%;
+  overflow-x: hidden;
 }
 div.blogwrapper ul li {
     padding-left:24px;
--- a/setup.py	Fri Sep 21 22:42:10 2012 +0200
+++ b/setup.py	Thu Mar 21 17:09:18 2013 +0100
@@ -41,7 +41,7 @@
 
 # import required features
 from __pkginfo__ import modname, version, license, description, web, \
-     author, author_email
+     author, author_email, classifiers
 
 if exists('README'):
     long_description = file('README').read()
@@ -193,6 +193,7 @@
                  data_files = data_files,
                  ext_modules = ext_modules,
                  cmdclass = cmdclass,
+                 classifiers = classifiers,
                  **kwargs
                  )