Merge commit 'origin/master' into mdv-gpl3

Conflicts:
	bin/tools/convert.py

bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6
bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p

1 files changed, 23 insertions, 34 deletions

diff --git a/win32/OpenERPServerService.py b/win32/OpenERPServerService.py
index 24df255f1d2..7bf8aefb45f 100644
--- a/win32/OpenERPServerService.py
+++ b/win32/OpenERPServerService.py
@@ -1,36 +1,25 @@
 # -*- encoding: utf-8 -*-
-##############################################################################

-#

-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.

-#

-# $Id$

-#

-# WARNING: This program as such is intended to be used by professional

-# programmers who take the whole responsability of assessing all potential

-# consequences resulting from its eventual inadequacies and bugs

-# End users who are looking for a ready-to-use solution with commercial

-# garantees and support are strongly adviced to contract a Free Software

-# Service Company

-#

-# This program is Free Software; you can redistribute it and/or

-# modify it under the terms of the GNU General Public License

-# as published by the Free Software Foundation; either version 2

-# of the License, or (at your option) any later version.

-#

-# This program is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-#

-# You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-##############################################################################

-#

-# OpenERPServerService.py

-#

-# Script installing OpenERP as Windows service

-

+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 # Win32 python extensions modules

 import win32serviceutil

 import win32service

@@ -87,8 +76,8 @@ class OpenERPServerService(win32serviceutil.ServiceFramework):
         win32event.WaitForSingleObject(ws, win32event.INFINITE)

         self.stopping = True

 

-    def SvcDoRun(self):

-    # Start OpenERP Server itself

+    def SvcDoRun(self):
+        # Start OpenERP Server itself

         self.StartTERP()

         # start the loop waiting for the Service Manager's stop signal

         thread.start_new_thread(self.StartControl, (self.hWaitStop,))