From 25237f7178894da666b53d52cd5d47f33523d458 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 9 Sep 2011 16:13:17 +0200
Subject: [PATCH] [IMP] move webrelease into addons/web

bzr revid: al@openerp.com-20110909141317-uvo90sxlg8o5w9dx
---
 addons/web/__openerp__.py                     | 1 -
 webrelease.py => addons/web/common/release.py | 7 +++----
 addons/web/controllers/main.py                | 7 ++++---
 setup.py                                      | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename webrelease.py => addons/web/common/release.py (82%)

diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index 290bca17464..a6e438a75db 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -1,6 +1,5 @@
 {
     "name" : "web",
-    "version" : "2.0",
     "depends" : [],
     'active': True,
     'js' : [
diff --git a/webrelease.py b/addons/web/common/release.py
similarity index 82%
rename from webrelease.py
rename to addons/web/common/release.py
index 77eb46dd2c3..47570c032bb 100644
--- a/webrelease.py
+++ b/addons/web/common/release.py
@@ -1,11 +1,10 @@
-
-name = 'openerp-web-proto'
+name = 'openerp-web'
 version = '6.1.0 alpha'
 description = "Web Client of OpenERP, the Enterprise Management Software"
 long_description = "OpenERP Web is the web client of the OpenERP, a free enterprise management software"
-author = "OpenERP S.A."
+author = "OpenERP SA"
 author_email = "info@openerp.com"
 support_email = 'support@openerp.com'
 url = "http://www.openerp.com/"
 download_url = ''
-license = "OEPL"
+license = "AGPL"
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 415db15509d..c85072d625b 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -12,17 +12,18 @@ import textwrap
 import xmlrpclib
 import time
 import zlib
-import webrelease
 from xml.etree import ElementTree
 from cStringIO import StringIO
 
+from babel.messages.pofile import read_po
+
 import web.common.dispatch as openerpweb
 import web.common.ast
 import web.common.nonliterals
+import web.common.release
 openerpweb.ast = web.common.ast
 openerpweb.nonliterals = web.common.nonliterals
 
-from babel.messages.pofile import read_po
 
 # Should move to openerpweb.Xml2Json
 class Xml2Json:
@@ -195,7 +196,7 @@ class WebClient(openerpweb.Controller):
     @openerpweb.jsonrequest
     def version_info(self, req):
         return {
-            "version": webrelease.version
+            "version": web.common.release.version
         }
 
 class Database(openerpweb.Controller):
diff --git a/setup.py b/setup.py
index cbbd4697687..45be08ff42b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import re
 import sys
 from setuptools import setup
 
-execfile('webrelease.py')
+execfile('addons/web/common/release.py')
 
 version_dash_incompatible = False
 if 'bdist_rpm' in sys.argv: