[Python-apps-commits] r7952 - in packages/openerp6/trunk (8 files)

[xnox-guest at users.alioth.debian.org]

    Date: Tuesday, December 13, 2011 @ 19:30:06
  Author: xnox-guest
Revision: 7952

Updates

Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/control
  packages/openerp6/trunk/debian/copyright
  packages/openerp6/trunk/debian/openerp6-web.links
  packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch
  packages/openerp6/trunk/debian/patches/02_web/03_wsgi-x-location.patch
  packages/openerp6/trunk/debian/patches/02_web/04_fix-popup-namespace.patch
  packages/openerp6/trunk/debian/rules

Modified: packages/openerp6/trunk/debian/control
===================================================================
--- packages/openerp6/trunk/debian/control	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/control	2011-12-13 19:30:06 UTC (rev 7952)
@@ -18,7 +18,7 @@
  ${python:Depends}, ${misc:Depends}, adduser, python, python-dateutil, python-libxslt1,
  python-lxml, python-psycopg2, python-pydot, python-pychart, python-reportlab,
  python-tz, python-pyparsing, python-yaml, python-mako, dbconfig-common,
- postgresql-client (>=8.2), ucf, ssl-cert, openerp6-addons
+ postgresql-client (>=8.2), ucf, ssl-cert
 Conflicts: openerp-server
 Replaces: openerp-server
 Recommends:
@@ -43,7 +43,7 @@
  libjs-mootools, python-beaker (>= 1.1), python-cherrypy3 (>= 3.1.2),
  python-dateutil, python-feedparser, python-formencode (>= 1.2.2),
  python-mako (>= 0.2.5), python-pybabel (>= 0.9.4), python-pyparsing,
- python-simplejson (>= 2.0.9), ckeditor, libapache2-mod-wsgi
+ python-simplejson (>= 2.0.9), ckeditor, libapache2-mod-wsgi, libjs-jquery-form
 Recommends: openerp6-server
 Suggests: openerp6-client
 Replaces: openerp-web
@@ -62,7 +62,7 @@
 Package: openerp6-client
 Architecture: all
 Depends:
- ${misc:Depends}, python, python-glade2, python-gtk2, python-pydot, python-tz,
+ ${misc:Depends}, ${python:Depends}, python-glade2, python-gtk2, python-pydot, python-tz,
  python-lxml,
  python-hippocanvas, python-matplotlib
 Recommends:

Modified: packages/openerp6/trunk/debian/copyright
===================================================================
--- packages/openerp6/trunk/debian/copyright	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/copyright	2011-12-13 19:30:06 UTC (rev 7952)
@@ -1,7 +1,7 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OpenERP S.A.
 Upstream-Contact: OpenERP <support at openerp.com>
-Upstream-Homepage: http://www.openerp.com/
-Maintainer-Contact: Debian Open Object Maintainers <gnunet at lists.debian-maintainers.org>
-Maintainer-Homepage: http://open-object.debian-maintainers.org/
+Source: http://www.openerp.com/downloads
 
 Files: *
 Copyright: (C) 2004-2010 OpenERP SA. (www.openerp.com)

Modified: packages/openerp6/trunk/debian/openerp6-web.links
===================================================================
--- packages/openerp6/trunk/debian/openerp6-web.links	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/openerp6-web.links	2011-12-13 19:30:06 UTC (rev 7952)
@@ -1,3 +1,4 @@
+/usr/share/javascript/jquery-form/jquery.form.js /usr/share/openerp6/web/openobject/static/javascript/jQuery/jquery.form.js
 /usr/share/javascript/mochikit/MochiKit.js /usr/share/openerp6/web/openobject/static/javascript/MochiKit.js
 /usr/share/javascript/mootools/mootools.js /usr/share/openerp6/web/addons/view_diagram/static/javascript/draw2d/mootools.js
 /usr/share/javascript/ckeditor /usr/share/openerp6/web/addons/widget_ckeditor/static/javascript/ck_editor

Modified: packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/patches/01_server/move_pixmaps.patch	2011-12-13 19:30:06 UTC (rev 7952)
@@ -1,3 +1,4 @@
+Move pixmpas to openerp-server root
 Index: b/bin/addons/base/res/res_company.py
 ===================================================================
 --- a/bin/addons/base/res/res_company.py

Modified: packages/openerp6/trunk/debian/patches/02_web/03_wsgi-x-location.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/03_wsgi-x-location.patch	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/patches/02_web/03_wsgi-x-location.patch	2011-12-13 19:30:06 UTC (rev 7952)
@@ -1,4 +1,3 @@
-------------------------------------------------------------
 revno: 4517
 committer: Tristan Hill <tristan.hill at credativ.co.uk>
 branch nick: web

Modified: packages/openerp6/trunk/debian/patches/02_web/04_fix-popup-namespace.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/02_web/04_fix-popup-namespace.patch	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/patches/02_web/04_fix-popup-namespace.patch	2011-12-13 19:30:06 UTC (rev 7952)
@@ -1,3 +1,4 @@
+Fix incorrect url redirect
 --- a/web/addons/openerp/controllers/actions.py
 +++ b/web/addons/openerp/controllers/actions.py
 @@ -366,7 +366,7 @@

Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules	2011-12-13 17:30:41 UTC (rev 7951)
+++ packages/openerp6/trunk/debian/rules	2011-12-13 19:30:06 UTC (rev 7952)
@@ -25,6 +25,8 @@
 	-name LICENSE -or \
 	-name openerp_plugin.jar -or \
 	-name feedparser.py -or \
+	-name ocrbb.ttf -or \
+	-name pychart -or \
 	-name '*.pyd' -or \
 	-name '*.exe' -or \
 	-name ck_editor \