[Python-apps-commits] r7886 - in packages/openerp6/trunk (7 files)

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

    Date: Tuesday, November 29, 2011 @ 20:12:02
  Author: xnox-guest
Revision: 7886

More updates

Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/openerp6-server.templates
  packages/openerp6/trunk/debian/patches/01_server/fix-yaml-import.patch
  packages/openerp6/trunk/debian/patches/02_web/04_fix-popup-namespace.patch
  packages/openerp6/trunk/debian/patches/series
  packages/openerp6/trunk/debian/po/POTFILES.in
  packages/openerp6/trunk/debian/po/templates.pot

Modified: packages/openerp6/trunk/debian/openerp6-server.templates
===================================================================
--- packages/openerp6/trunk/debian/openerp6-server.templates	2011-11-29 20:11:58 UTC (rev 7885)
+++ packages/openerp6/trunk/debian/openerp6-server.templates	2011-11-29 20:12:02 UTC (rev 7886)
@@ -1,6 +1,6 @@
 Template: openerp-server/password
 Type: string
-Default: admin
+_Default: admin
 _Description: Superadmin password for Open ERP server v${VER}:
  This password is used by Open ERP to allow administration of Open ERP
  instances. Users need to know this password if they want to install and

Modified: packages/openerp6/trunk/debian/patches/01_server/fix-yaml-import.patch
===================================================================
--- packages/openerp6/trunk/debian/patches/01_server/fix-yaml-import.patch	2011-11-29 20:11:58 UTC (rev 7885)
+++ packages/openerp6/trunk/debian/patches/01_server/fix-yaml-import.patch	2011-11-29 20:12:02 UTC (rev 7886)
@@ -6,8 +6,8 @@
 X-Bzr-Revision-Id: dmitrijs.ledkovs at credativ.co.uk-20111013162021-i5z9cgbkslez34sn
 
 === modified file 'bin/tools/yaml_import.py'
---- old/bin/tools/yaml_import.py	2011-06-05 11:35:20 +0000
-+++ new/bin/tools/yaml_import.py	2011-10-13 16:20:21 +0000
+--- a/bin/tools/yaml_import.py
++++ b/bin/tools/yaml_import.py
 @@ -163,6 +163,8 @@
              self.logger.log(logging.ERROR, 'id: %s is to long (max: 64)', id)
  
@@ -17,4 +17,3 @@
          if not xml_id:
              raise YamlImportException("The xml_id should be a non empty string.")
          if isinstance(xml_id, types.IntType):
-

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-11-29 20:11:58 UTC (rev 7885)
+++ packages/openerp6/trunk/debian/patches/02_web/04_fix-popup-namespace.patch	2011-11-29 20:12:02 UTC (rev 7886)
@@ -8,4 +8,4 @@
 +        url = '/openerp/?' + urllib.urlencode({'next': url})
          
      cherrypy.response.headers['X-Target'] = action['target']
-     cherrypy.response.headers['Location'] = url
+     cherrypy.response.headers['X-Location'] = url

Modified: packages/openerp6/trunk/debian/patches/series
===================================================================
--- packages/openerp6/trunk/debian/patches/series	2011-11-29 20:11:58 UTC (rev 7885)
+++ packages/openerp6/trunk/debian/patches/series	2011-11-29 20:12:02 UTC (rev 7886)
@@ -2,11 +2,11 @@
 01_server/config-comments.patch
 01_server/fix-yaml-import.patch
 01_server/manpage-whatis.patch
-02_web/config-changes.patch
-02_web/fix-popup-namespace.patch
-02_web/fix-refresh-loop.patch
-02_web/tinydict-getstate.patch
-02_web/wsgi-x-location.patch
+02_web/01_tinydict-getstate.patch
+02_web/02_config-changes.patch
+02_web/03_wsgi-x-location.patch
+02_web/04_fix-popup-namespace.patch
+02_web/05_fix-refresh-loop.patch
 stable_updates/addons.patch
 stable_updates/client.patch
 stable_updates/server.patch

Modified: packages/openerp6/trunk/debian/po/POTFILES.in
===================================================================
--- packages/openerp6/trunk/debian/po/POTFILES.in	2011-11-29 20:11:58 UTC (rev 7885)
+++ packages/openerp6/trunk/debian/po/POTFILES.in	2011-11-29 20:12:02 UTC (rev 7886)
@@ -1 +1 @@
-[type: gettext/rfc822deb] templates
+[type: gettext/rfc822deb] openerp6-server.templates

Modified: packages/openerp6/trunk/debian/po/templates.pot
===================================================================
--- packages/openerp6/trunk/debian/po/templates.pot	2011-11-29 20:11:58 UTC (rev 7885)
+++ packages/openerp6/trunk/debian/po/templates.pot	2011-11-29 20:12:02 UTC (rev 7886)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: openerp6-server at packages.debian.org\n"
-"POT-Creation-Date: 2011-11-23 04:27+0000\n"
+"Report-Msgid-Bugs-To: openerp6 at packages.debian.org\n"
+"POT-Creation-Date: 2011-11-26 23:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,14 +18,20 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: string
+#. Default
+#: ../openerp6-server.templates:1001
+msgid "admin"
+msgstr ""
+
+#. Type: string
 #. Description
-#: ../templates:1001
+#: ../openerp6-server.templates:1002
 msgid "Superadmin password for Open ERP server v${VER}:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../templates:1001
+#: ../openerp6-server.templates:1002
 msgid ""
 "This password is used by Open ERP to allow administration of Open ERP "
 "instances. Users need to know this password if they want to install and "
@@ -35,6 +41,6 @@
 
 #. Type: string
 #. Description
-#: ../templates:1001
+#: ../openerp6-server.templates:1002
 msgid "This password is stored in the openerp-server config file."
 msgstr ""