Merge commit '1b1682894f7c199bc6be' into deb-scripts
Conflicts: debian/rules bzr revid: p_christ@hol.gr-20101019103607-dztha2agnnlt8jzx
This commit is contained in:
P. Christeas
commit
4f4164b7f3
|
|
@ -0,0 +1,37 @@
|
|||
Package Repositories
|
||||
--------------------
|
||||
|
||||
Backports for the current stable debian distribution as well as snapshots of
|
||||
unreleased versions may be available in repositories listed on the maintainers
|
||||
homepage. The current URL of the maintainer homepage can be seen in
|
||||
debian/copyright.
|
||||
|
||||
|
||||
Source Access
|
||||
-------------
|
||||
|
||||
You can obtain the sources of this package with:
|
||||
|
||||
$ apt-get source ${PACKAGE}
|
||||
|
||||
whereas '${PACKAGE}' has to be replaced with the actual name of the package.
|
||||
|
||||
This package is maintained with the Git version control system. The current git
|
||||
source tree can be obtained with:
|
||||
|
||||
$ git clone ${GIT_URI}
|
||||
|
||||
whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
|
||||
repository. The current Git URI can be seen in debian/control in the extracted
|
||||
package sources.
|
||||
|
||||
More information about Git can be found in the git-core package.
|
||||
|
||||
This package may use the Quilt patch system to manage all modifications to the
|
||||
upstream source. Changes, if any, are stored in the source package as diffs in
|
||||
debian/diff and are applied during the build. Current modifications can be
|
||||
applied to the source tree with:
|
||||
|
||||
$ QUILT_PATCHES=debian/patches quilt push -a
|
||||
|
||||
More information about Quilt can be found in the quilt package.
|
||||
|
|
@ -1,3 +1,139 @@
|
|||
openerp-server (5.0.14-1) experimental; urgency=low
|
||||
|
||||
* Updating to standards version 3.9.1.
|
||||
* Merging upstream version 5.0.14.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Wed, 15 Sep 2010 00:22:00 +0200
|
||||
|
||||
openerp-server (5.0.13-1) experimental; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.13.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Mon, 13 Sep 2010 09:14:10 +0200
|
||||
|
||||
openerp-server (5.0.12-2) unstable; urgency=low
|
||||
|
||||
* Removing debhelper auto install overrides.
|
||||
* Updating clean target in rules.
|
||||
* Reverting to manual setup.py call, updated for version 5.0.12.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sat, 14 Aug 2010 18:53:43 +0200
|
||||
|
||||
openerp-server (5.0.12-1) unstable; urgency=low
|
||||
|
||||
* Updating standards version to 3.9.0.
|
||||
* Merging upstream version 5.0.12.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sun, 18 Jul 2010 19:46:39 +0200
|
||||
|
||||
openerp-server (5.0.11-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.11.
|
||||
* Adding patch from Timothy E. Harris <maintainer@mepiscommunity.org>
|
||||
to prevents creating a new database if the locale is not a UTF-8 one
|
||||
(Closes: #584976).
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Tue, 08 Jun 2010 11:42:23 +0200
|
||||
|
||||
openerp-server (5.0.10-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.10.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Fri, 07 May 2010 15:02:31 +0200
|
||||
|
||||
openerp-server (5.0.9-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.9.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Fri, 16 Apr 2010 06:47:02 +0200
|
||||
|
||||
openerp-server (5.0.8-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.8.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Wed, 14 Apr 2010 20:19:21 +0200
|
||||
|
||||
openerp-server (5.0.7-2) unstable; urgency=low
|
||||
|
||||
* Updating python build-depends.
|
||||
* Adding patch to fix bad whatis entry in openerp-server manpage.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Wed, 07 Apr 2010 00:09:23 +0200
|
||||
|
||||
openerp-server (5.0.7-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.7 (Closes: #573716):
|
||||
* Updating copyright file.
|
||||
* Resorting the dh call to more common order.
|
||||
* Updating README.source.
|
||||
* Dropping python-lxml patch, went upstream.
|
||||
* Dropping postgresql-8.4.patch, went upstream.
|
||||
* Adding some more python module build-depends to avoid some chicken-
|
||||
egg problem with the new setup.py and quilt.
|
||||
* Adding dependency to remote_fs in init script.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sat, 13 Mar 2010 13:55:50 +0100
|
||||
|
||||
openerp-server (5.0.6-4) unstable; urgency=low
|
||||
|
||||
* Adding explicit debian source version 1.0 until switch to 3.0.
|
||||
* Updating year in copyright file.
|
||||
* Updating to standards 3.8.4.
|
||||
* Adding patch from Toni Mueller <support@oeko.net> to fix SQL for
|
||||
postgresql 8.4 (Closes: #568119).
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sat, 06 Feb 2010 10:22:05 +0100
|
||||
|
||||
openerp-server (5.0.6-3) unstable; urgency=low
|
||||
|
||||
[ Daniel Baumann ]
|
||||
* Setting last-translator for German debconf templates to me, no
|
||||
intention do deal with debian-l10n-german in the future anymore.
|
||||
|
||||
[ Mathias Behrle ]
|
||||
* Removing deprecated option -q for PostgreSQL client commands
|
||||
(Closes: #548875).
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sat, 31 Oct 2009 09:20:27 +0100
|
||||
|
||||
openerp-server (5.0.6-2) unstable; urgency=low
|
||||
|
||||
* Minimizing rules file.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sun, 18 Oct 2009 21:19:57 +0200
|
||||
|
||||
openerp-server (5.0.6-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.6.
|
||||
* Rediffing python-lxml.patch.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Sat, 17 Oct 2009 08:32:56 +0200
|
||||
|
||||
openerp-server (5.0.5-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.5.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Mon, 21 Sep 2009 20:38:00 +0200
|
||||
|
||||
openerp-server (5.0.4-1) unstable; urgency=medium
|
||||
|
||||
* Merging upstream version 5.0.4:
|
||||
- fixes a security problem.
|
||||
* No longer calling debconf-updatepo in clean target of rules.
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Mon, 21 Sep 2009 00:01:13 +0200
|
||||
|
||||
openerp-server (5.0.3-0-2) unstable; urgency=low
|
||||
|
||||
* Adding README.source.
|
||||
* Moving maintainer homepage from control to copyright.
|
||||
* Updating README.source.
|
||||
* Adding patch from upstream to use python-lxml instead of python-xml,
|
||||
thanks to Alan Bell <alan.bell@theopenlearningcentre.com> (Closes:
|
||||
#543947).
|
||||
|
||||
-- Daniel Baumann <daniel@debian.org> Wed, 16 Sep 2009 21:18:30 +0200
|
||||
|
||||
openerp-server (5.0.3-0-1) unstable; urgency=low
|
||||
|
||||
* Merging upstream version 5.0.3-0.
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@ Section: net
|
|||
Priority: optional
|
||||
Maintainer: Debian Open Object Maintainers <open-object@lists.debian-maintainers.org>
|
||||
Uploaders: Daniel Baumann <daniel@debian.org>
|
||||
Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt
|
||||
Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2
|
||||
Standards-Version: 3.8.3
|
||||
Build-Depends: debhelper (>= 7.0.50~), python, quilt (>= 0.46-7)
|
||||
Build-Depends-Indep:
|
||||
python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2,
|
||||
python-reportlab
|
||||
Standards-Version: 3.9.1
|
||||
Homepage: http://www.openerp.com/
|
||||
Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git
|
||||
Vcs-Git: git://git.debian-maintainers.org/git/open-object/openerp-server.git
|
||||
XSBC-Maintainer-Homepage: http://open-object.debian-maintainers.org/
|
||||
|
||||
Package: openerp-server
|
||||
Section: net
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
Author: Tiny.be <info@tiny.be>
|
||||
Download: http://www.openerp.com/
|
||||
Upstream-Contact: n/a
|
||||
Upstream-Homepage: http://www.openerp.com/
|
||||
Maintainer-Contact: Debian Open Object Maintainers <gnunet@lists.debian-maintainers.org>
|
||||
Maintainer-Homepage: http://open-object.debian-maintainers.org/
|
||||
|
||||
Files: *
|
||||
Copyright: (C) 2004-2009 Tiny.be <info@tiny.be>
|
||||
Copyright: (C) 2004-2010 Tiny.be <info@tiny.be>
|
||||
License: GPL-3+
|
||||
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
|
||||
|
|
@ -226,7 +228,7 @@ License: other
|
|||
permission.
|
||||
|
||||
Files: debian/*
|
||||
Copyright: (C) 2005-2009 Daniel Baumann <daniel@debian.org>
|
||||
Copyright: (C) 2005-2010 Daniel Baumann <daniel@debian.org>
|
||||
License: GPL-3+
|
||||
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
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ explanation how to achieve this (you need to execute all commands as root):
|
|||
|
||||
1. Creating the database user
|
||||
|
||||
# su - postgres -c "createuser -q --createdb --no-createrole --pwprompt openerp"
|
||||
# su - postgres -c "createuser --createdb --no-createrole --pwprompt openerp"
|
||||
|
||||
Note: If you want to run the database as another user than 'openerp', you
|
||||
need to replace 'openerp' above with the user you want instead, and you
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
### BEGIN INIT INFO
|
||||
# Provides: openerp-server
|
||||
# Required-Start: $syslog
|
||||
# Required-Stop: $syslog
|
||||
# Required-Start: $remote_fs $syslog
|
||||
# Required-Stop: $remote_fs $syslog
|
||||
# Should-Start: $network
|
||||
# Should-Stop: $network
|
||||
# Default-Start: 2 3 4 5
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
Author: Daniel Baumann <daniel@debian.org>
|
||||
Description: Fixing bad whatis entry in openerp-server manpage.
|
||||
|
||||
diff -Naurp openerp-server.orig/man/openerp-server.1 openerp-server/man/openerp-server.1
|
||||
--- openerp-server.orig/man/openerp-server.1 2009-11-23 09:53:42.000000000 +0100
|
||||
+++ openerp-server/man/openerp-server.1 2010-04-07 00:06:02.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
|
||||
.TH OPENERP "1" "March 2009" "OpenERP Server 5.0.0" "User Commands"
|
||||
.SH NAME
|
||||
-OpenERP \- manual page for OpenERP Server 5.0.0
|
||||
+openerp-server \- manual page for OpenERP Server 5.0.0
|
||||
.SH SYNOPSIS
|
||||
.B openerp-server.py
|
||||
[\fIoptions\fR]
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
Author: Timothy E. Harris <maintainer@mepiscommunity.org>
|
||||
Description:
|
||||
Fix bug that prevents creating a new database if the locale is not a UTF-8 one
|
||||
(Closes: #584976).
|
||||
|
||||
diff -Naurp openerp-server.orig/bin/service/web_services.py openerp-server/bin/service/web_services.py
|
||||
--- openerp-server.orig/bin/service/web_services.py 2010-03-30 11:24:21.000000000 +0000
|
||||
+++ openerp-server/bin/service/web_services.py 2010-06-08 09:39:10.000000000 +0000
|
||||
@@ -38,6 +38,7 @@ import release
|
||||
import sql_db
|
||||
import tools
|
||||
import locale
|
||||
+import re
|
||||
from cStringIO import StringIO
|
||||
|
||||
logging.basicConfig()
|
||||
@@ -64,11 +65,15 @@ class db(netsvc.Service):
|
||||
self._pg_psw_env_var_is_set = False # on win32, pg_dump need the PGPASSWORD env var
|
||||
|
||||
def _create_empty_database(self, name):
|
||||
+ if re.search('utf|UTF', locale.getdefaultlocale()[1]):
|
||||
+ db_encoding = 'unicode'
|
||||
+ else:
|
||||
+ db_encoding = 'LATIN1'
|
||||
db = sql_db.db_connect('template1')
|
||||
cr = db.cursor()
|
||||
try:
|
||||
cr.autocommit(True) # avoid transaction block
|
||||
- cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "template0" """ % name)
|
||||
+ cr.execute("""CREATE DATABASE "%s" ENCODING '%s' TEMPLATE "template0" """ %(name, db_encoding))
|
||||
finally:
|
||||
cr.close()
|
||||
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
Author: Toni Mueller <support@oeko.net>
|
||||
Description: Fixes SQL for postgresql 8.4 (Closes: #568119).
|
||||
|
||||
diff -Naurp openerp-server.orig/bin/service/web_services.py openerp-server/bin/service/web_services.py
|
||||
--- openerp-server.orig/bin/service/web_services.py 2009-11-27 17:41:16.000000000 +0100
|
||||
+++ openerp-server/bin/service/web_services.py 2010-02-06 10:18:46.000000000 +0100
|
||||
@@ -75,7 +75,7 @@ class db(netsvc.Service):
|
||||
cr = db.serialized_cursor()
|
||||
try:
|
||||
cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ?
|
||||
- cr.execute('CREATE DATABASE "%s" ENCODING \'unicode\'' % db_name)
|
||||
+ cr.execute('CREATE DATABASE "%s" ENCODING \'unicode\' TEMPLATE template0' % db_name)
|
||||
finally:
|
||||
cr.close()
|
||||
sql_db.close_db('template1')
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
01-autobuild.patch
|
||||
02-migrate.patch
|
||||
03-shebang.patch
|
||||
04-manpage.patch
|
||||
05-db-encoding.patch
|
||||
|
|
|
|||
|
|
@ -1,77 +1,29 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
SHELL := sh -e
|
||||
%:
|
||||
dh --with quilt ${@}
|
||||
|
||||
include /usr/share/quilt/quilt.make
|
||||
override_dh_auto_clean:
|
||||
dh_auto_clean
|
||||
|
||||
update:
|
||||
# Needs: shell-helper
|
||||
rm -rf build
|
||||
|
||||
cd debian; \
|
||||
debconf-create-preseed *.config; \
|
||||
|
||||
for FILE in debian/*.preseed; \
|
||||
do \
|
||||
grep -v preseed $$FILE > $$FILE.tmp; \
|
||||
mv $$FILE.tmp $$FILE; \
|
||||
echo $$FILE >> debian/`basename $$FILE .preseed`.examples; \
|
||||
done
|
||||
|
||||
clean: clean-patched unpatch
|
||||
clean-patched: patch
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
rm -f build-stamp
|
||||
|
||||
NO_CHECK_MODULES=1 python setup.py clean
|
||||
rm -rf build openerp-server
|
||||
-find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
|
||||
|
||||
debconf-updatepo
|
||||
|
||||
dh_clean
|
||||
|
||||
build:
|
||||
|
||||
install: patch
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_prep
|
||||
dh_installdirs
|
||||
|
||||
NO_CHECK_MODULES=1 python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
|
||||
override_dh_auto_install:
|
||||
NO_CHECK_MODULES=1 python setup.py install --install-layout=deb --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
|
||||
|
||||
# Adjusting program location
|
||||
sed -i -e 's|cd .*python.*/site-packages|cd /usr/lib|' debian/openerp-server/usr/bin/openerp-server
|
||||
mv debian/openerp-server/usr/lib/python*/site-packages/openerp-server debian/openerp-server/usr/lib
|
||||
rm -rf debian/openerp-server/usr/lib/python*
|
||||
|
||||
# Fixing permissions
|
||||
find debian/openerp-server/usr/lib/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
|
||||
sed -i -e 's|cd .*|cd /usr/share/pyshared/openerp-server|' debian/openerp-server/usr/bin/openerp-server
|
||||
|
||||
# Removing double files
|
||||
rm -rf debian/openerp-server/usr/share/doc/openerp-server-*
|
||||
|
||||
binary: binary-indep
|
||||
|
||||
binary-arch:
|
||||
|
||||
binary-indep: install
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_installchangelogs doc/Changelog
|
||||
dh_installdocs
|
||||
dh_installexamples
|
||||
dh_install
|
||||
dh_installinit --update-rcd-params='defaults 21'
|
||||
dh_installdebconf
|
||||
dh_lintian
|
||||
dh_link
|
||||
dh_compress
|
||||
override_dh_fixperms:
|
||||
dh_fixperms
|
||||
dh_installdeb
|
||||
dh_gencontrol
|
||||
dh_md5sums
|
||||
dh_builddeb
|
||||
|
||||
.PHONY: clean build install binary binary-arch binary-indep
|
||||
find debian/openerp-server/usr/share/pyshared/openerp-server/addons -type f -print0 | xargs -0 chmod 0644
|
||||
|
||||
override_dh_installchangelogs:
|
||||
dh_installchangelogs doc/Changelog
|
||||
|
||||
override_dh_installinit:
|
||||
dh_installinit --update-rcd-params='defaults 21'
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
1.0
|
||||
Loading…
Reference in New Issue