From 2aac30445388ebabff4b09808723ffe6ab0b1846 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:38 +0300 Subject: [PATCH 01/41] Adding README.source. bzr revid: p_christ@hol.gr-20101019095438-b1xc7dhszox2vq6q --- debian/README.source | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 00000000000..259f923558f --- /dev/null +++ b/debian/README.source @@ -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/control. + + +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 push -a + +More information about Quilt can be found in the quilt package. From 0a6dbb784317006ebdcf29a544e41db17d860b84 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:39 +0300 Subject: [PATCH 02/41] Moving maintainer homepage from control to copyright. bzr revid: p_christ@hol.gr-20101019095439-k519zjif76hrtx2d --- debian/control | 1 - debian/copyright | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index f866107f2b0..a7bb7cdea7f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Standards-Version: 3.8.3 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 diff --git a/debian/copyright b/debian/copyright index 6a75021214c..61b14085aed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ -Author: Tiny.be -Download: http://www.openerp.com/ +Upstream-Homepage: http://www.openerp.com/ +Maintainer-Homepage: http://open-object.debian-maintainers.org/ Files: * Copyright: (C) 2004-2009 Tiny.be From b794f174614e08ae1f0611a34f07c37d14939d13 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:39 +0300 Subject: [PATCH 03/41] Updating README.source. bzr revid: p_christ@hol.gr-20101019095439-nts1fw6854mw5h4d --- debian/README.source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/README.source b/debian/README.source index 259f923558f..dcc7ba33a65 100644 --- a/debian/README.source +++ b/debian/README.source @@ -4,7 +4,7 @@ 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/control. +debian/copyright. Source Access From cff3cc6b9a6fafc86768fd8b083c1db95eee19c7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:40 +0300 Subject: [PATCH 04/41] Releasing debian version 5.0.3-0-2. bzr revid: p_christ@hol.gr-20101019095440-spwbw7di89t0y1kp --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0735d998cec..2a831a86d97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +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 (Closes: + #543947). + + -- Daniel Baumann 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. From d82f368aabf63c4f6c6ffb5397e90fcf71ff655d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:40 +0300 Subject: [PATCH 05/41] No longer calling debconf-updatepo in clean target of rules. bzr revid: p_christ@hol.gr-20101019095440-lcmlikz33u21uhue --- debian/control | 2 +- debian/rules | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/control b/debian/control index a7bb7cdea7f..42686e084a6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Debian Open Object Maintainers Uploaders: Daniel Baumann -Build-Depends: debhelper (>= 7), po-debconf, python-dev, quilt +Build-Depends: debhelper (>= 7), python-dev, quilt Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2 Standards-Version: 3.8.3 Homepage: http://www.openerp.com/ diff --git a/debian/rules b/debian/rules index d974a63b2d1..54f3cfdd503 100755 --- a/debian/rules +++ b/debian/rules @@ -27,8 +27,6 @@ clean-patched: patch rm -rf build openerp-server -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f - debconf-updatepo - dh_clean build: From 3c61eb02d53626429fc3744f71d985497bcf2519 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:40 +0300 Subject: [PATCH 06/41] Releasing debian version 5.0.4-1. bzr revid: p_christ@hol.gr-20101019095440-81kcbdc3kxnuncm5 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2a831a86d97..ceefe433fdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 Mon, 21 Sep 2009 00:01:13 +0200 + openerp-server (5.0.3-0-2) unstable; urgency=low * Adding README.source. From 1c0c8e904a218403a713b924a8548f4f521344cb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:41 +0300 Subject: [PATCH 07/41] Releasing debian version 5.0.5-1. bzr revid: p_christ@hol.gr-20101019095441-jesqeua25nimz7qc --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index ceefe433fdb..0924d8fca04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.5-1) unstable; urgency=low + + * Merging upstream version 5.0.5. + + -- Daniel Baumann Mon, 21 Sep 2009 20:38:00 +0200 + openerp-server (5.0.4-1) unstable; urgency=medium * Merging upstream version 5.0.4: From 6397dfdf4d7e4ef7b4b6d05e568351b66b32db86 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:41 +0300 Subject: [PATCH 08/41] Releasing debian version 5.0.6-1. bzr revid: p_christ@hol.gr-20101019095441-hz0hf81mdpm2b2lf --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0924d8fca04..d8da0c9724c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openerp-server (5.0.6-1) unstable; urgency=low + + * Merging upstream version 5.0.6. + * Rediffing python-lxml.patch. + + -- Daniel Baumann Sat, 17 Oct 2009 08:32:56 +0200 + openerp-server (5.0.5-1) unstable; urgency=low * Merging upstream version 5.0.5. From dc5d0b6b528bdc8255df66a0f1a6ed7bd96f8f06 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:42 +0300 Subject: [PATCH 09/41] Minimizing rules file. bzr revid: p_christ@hol.gr-20101019095442-ahpmsub05uqsa5f9 --- debian/control | 2 +- debian/rules | 62 +++++++------------------------------------------- 2 files changed, 9 insertions(+), 55 deletions(-) diff --git a/debian/control b/debian/control index 42686e084a6..9e2416f28fe 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Debian Open Object Maintainers Uploaders: Daniel Baumann -Build-Depends: debhelper (>= 7), python-dev, quilt +Build-Depends: debhelper (>= 7.0.50~), python-dev, quilt (>= 0.46-7) Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2 Standards-Version: 3.8.3 Homepage: http://www.openerp.com/ diff --git a/debian/rules b/debian/rules index 54f3cfdd503..c533fe28505 100755 --- a/debian/rules +++ b/debian/rules @@ -1,42 +1,14 @@ #!/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 - - 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 - - python setup.py clean - rm -rf build openerp-server -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f - dh_clean - -build: - -install: patch - dh_testdir - dh_testroot - dh_prep - dh_installdirs - +override_dh_auto_install: python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr # Adjusting program location @@ -50,26 +22,8 @@ install: patch # 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 +override_dh_installchangelogs: 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 - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb -.PHONY: clean build install binary binary-arch binary-indep +override_dh_installinit: + dh_installinit --update-rcd-params='defaults 21' From 891565da847b4f9f7aa0f6099068b078d703f599 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:42 +0300 Subject: [PATCH 10/41] Releasing debian version 5.0.6-2. bzr revid: p_christ@hol.gr-20101019095442-2o19r68vrbf27fg4 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d8da0c9724c..ffa373fed74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.6-2) unstable; urgency=low + + * Minimizing rules file. + + -- Daniel Baumann Sun, 18 Oct 2009 21:19:57 +0200 + openerp-server (5.0.6-1) unstable; urgency=low * Merging upstream version 5.0.6. From 151ee3fac94f50d5bca67648b29a8ad5095b0f58 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:43 +0300 Subject: [PATCH 11/41] Setting last-translator for German debconf templates to me, no intention do deal with debian-l10n-german in the future anymore. bzr revid: p_christ@hol.gr-20101019095443-er8m8crenl535yba --- debian/po/de.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/po/de.po b/debian/po/de.po index 9b41a553763..c953c212492 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -9,8 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n" "POT-Creation-Date: 2009-03-26 07:45+0100\n" "PO-Revision-Date: 2009-04-06 19:01+0200\n" -"Last-Translator: Helge Kreutzmann \n" -"Language-Team: German \n" +"Last-Translator: Daniel Baumann \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" From 68dd8577b5092430e8561668669004500a31653d Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Tue, 19 Oct 2010 12:54:43 +0300 Subject: [PATCH 12/41] Removing deprecated option -q for PostgreSQL client commands (Closes: #548875). bzr revid: p_christ@hol.gr-20101019095443-x859rv11yxav91o4 --- debian/openerp-server.README.Debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/openerp-server.README.Debian b/debian/openerp-server.README.Debian index 39dede87780..af298134af8 100644 --- a/debian/openerp-server.README.Debian +++ b/debian/openerp-server.README.Debian @@ -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 From 4d97ff6cf4e3cb2f63733cdf2ce7de38bc4de951 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:43 +0300 Subject: [PATCH 13/41] Releasing debian version 5.0.6-3. bzr revid: p_christ@hol.gr-20101019095443-9naaqagdxtfcivo2 --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index ffa373fed74..dc5969b663d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +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 Sat, 31 Oct 2009 09:20:27 +0100 + openerp-server (5.0.6-2) unstable; urgency=low * Minimizing rules file. From 243550a582f2059a90aae283d6ac8e8364a29ede Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:44 +0300 Subject: [PATCH 14/41] Adding explicit debian source version 1.0 until switch to 3.0. bzr revid: p_christ@hol.gr-20101019095444-0bdqsu63zrsgmxrx --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 From 4f086141d28d90b512e8bd32ea60cb1f222917d7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:44 +0300 Subject: [PATCH 15/41] Updating year in copyright file. bzr revid: p_christ@hol.gr-20101019095444-edap60t0wbcxgkk9 --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 61b14085aed..001ff2c9a70 100644 --- a/debian/copyright +++ b/debian/copyright @@ -226,7 +226,7 @@ License: other permission. Files: debian/* -Copyright: (C) 2005-2009 Daniel Baumann +Copyright: (C) 2005-2010 Daniel Baumann 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 From 6c68bd3b42505a66be13988158d2286487ffbbdb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:54:44 +0300 Subject: [PATCH 16/41] Updating to standards 3.8.4. bzr revid: p_christ@hol.gr-20101019095444-xkzrqr4mmh863k0x --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9e2416f28fe..ac5f5c5c8fb 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Open Object Maintainers Build-Depends: debhelper (>= 7.0.50~), python-dev, quilt (>= 0.46-7) Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2 -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 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 From 444801e11bbd37c88817d1fcca07d47bf9d08742 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:02 +0300 Subject: [PATCH 17/41] Adding patch from Toni Mueller to fix SQL for postgresql 8.4 (Closes: #568119). bzr revid: p_christ@hol.gr-20101019095502-z3qzefpofohdy6tt --- debian/patches/05-postgresql-8.4.patch | 15 +++++++++++++++ debian/patches/series | 1 + 2 files changed, 16 insertions(+) create mode 100644 debian/patches/05-postgresql-8.4.patch diff --git a/debian/patches/05-postgresql-8.4.patch b/debian/patches/05-postgresql-8.4.patch new file mode 100644 index 00000000000..338e64b5f8d --- /dev/null +++ b/debian/patches/05-postgresql-8.4.patch @@ -0,0 +1,15 @@ +Author: Toni Mueller +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') diff --git a/debian/patches/series b/debian/patches/series index 6d5ba4c38b4..92ac0d98c87 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01-autobuild.patch 02-migrate.patch 03-shebang.patch +05-postgresql-8.4.patch From 4183c917d30bde9b4fd72e9dd5dde26364e3324f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:04 +0300 Subject: [PATCH 18/41] Releasing debian version 5.0.6-4. bzr revid: p_christ@hol.gr-20101019095504-hqru4dp1d6x65iik --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index dc5969b663d..d293525e344 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 to fix SQL for + postgresql 8.4 (Closes: #568119). + + -- Daniel Baumann Sat, 06 Feb 2010 10:22:05 +0100 + openerp-server (5.0.6-3) unstable; urgency=low [ Daniel Baumann ] From 662227902ba858ba78341c4b0d0a311173343dba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:05 +0300 Subject: [PATCH 19/41] Updating copyright file. bzr revid: p_christ@hol.gr-20101019095505-6fgh1hyfef4xtupx --- debian/copyright | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 001ff2c9a70..8ac87f187d8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,10 @@ +Upstream-Contact: n/a Upstream-Homepage: http://www.openerp.com/ +Maintainer-Contact: Debian Open Object Maintainers Maintainer-Homepage: http://open-object.debian-maintainers.org/ Files: * -Copyright: (C) 2004-2009 Tiny.be +Copyright: (C) 2004-2010 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 From 4d6fc8ac5eff7f062ae854c550f05038dfed639c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:07 +0300 Subject: [PATCH 20/41] Resorting the dh call to more common order. bzr revid: p_christ@hol.gr-20101019095507-a43bg04gq8crp7f5 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c533fe28505..36121571d8c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh ${@} --with quilt + dh --with quilt ${@} override_dh_auto_clean: dh_auto_clean From 0db842096e46dc65e961b68370e26685b3c7186c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:08 +0300 Subject: [PATCH 21/41] Updating README.source. bzr revid: p_christ@hol.gr-20101019095508-z5cx450guft4c17w --- debian/README.source | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/README.source b/debian/README.source index dcc7ba33a65..18b6b245bf0 100644 --- a/debian/README.source +++ b/debian/README.source @@ -32,6 +32,6 @@ 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 push -a + $ QUILT_PATCHES=debian/patches quilt push -a More information about Quilt can be found in the quilt package. From 07f143bb939404d64ba6a4300e085209d210de74 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:09 +0300 Subject: [PATCH 22/41] Adding some more python module build-depends to avoid some chicken-egg problem with the new setup.py and quilt. bzr revid: p_christ@hol.gr-20101019095509-ewfvtex7f3kvmfn1 --- debian/control | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ac5f5c5c8fb..5631e01dab4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,9 @@ Priority: optional Maintainer: Debian Open Object Maintainers Uploaders: Daniel Baumann Build-Depends: debhelper (>= 7.0.50~), python-dev, quilt (>= 0.46-7) -Build-Depends-Indep: python-libxslt1, python-lxml, python-psycopg2 +Build-Depends-Indep: + python-libxslt1, python-lxml, python-pychart, python-pydot, python-psycopg2, + python-reportlab Standards-Version: 3.8.4 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian-maintainers.org/?p=open-object/openerp-server.git From 1156a73a336983988096f2bf0e81f4b7956f0f66 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:09 +0300 Subject: [PATCH 23/41] Adding dependency to remote_fs in init script. bzr revid: p_christ@hol.gr-20101019095509-6mptez1r35h4v5vu --- debian/openerp-server.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/openerp-server.init b/debian/openerp-server.init index e981d2cffe8..08c39e517bd 100644 --- a/debian/openerp-server.init +++ b/debian/openerp-server.init @@ -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 From c004e9500dba47b25f4131889476b1f2b85ccfd7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:10 +0300 Subject: [PATCH 24/41] Releasing debian version 5.0.7-1. bzr revid: p_christ@hol.gr-20101019095510-nf2o19az4s6cb6rk --- debian/changelog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index d293525e344..b17ca9ad739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 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. From 89d44cc1a5e7028252b3319d0f9bd344a8e92544 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:55:12 +0300 Subject: [PATCH 25/41] Updating python build-depends. bzr revid: p_christ@hol.gr-20101019095512-gsh9eamqd4zmafzd --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5631e01dab4..7e4dce1c7d5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Debian Open Object Maintainers Uploaders: Daniel Baumann -Build-Depends: debhelper (>= 7.0.50~), python-dev, quilt (>= 0.46-7) +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 From bf903514d5cfe0e1ae3d1b709776017d184538e0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:50 +0300 Subject: [PATCH 26/41] Adding patch to fix bad whatis entry in openerp-server manpage. bzr revid: p_christ@hol.gr-20101019095650-m27o882i99qy6g1s --- debian/patches/04-manpage.patch | 15 +++++++++++++++ debian/patches/series | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 debian/patches/04-manpage.patch diff --git a/debian/patches/04-manpage.patch b/debian/patches/04-manpage.patch new file mode 100644 index 00000000000..2ee2417dbf8 --- /dev/null +++ b/debian/patches/04-manpage.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann +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] diff --git a/debian/patches/series b/debian/patches/series index 92ac0d98c87..7819b4cf731 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 01-autobuild.patch 02-migrate.patch 03-shebang.patch -05-postgresql-8.4.patch +04-manpage.patch From 253312080fcbffdf484ea77dd5c597e7dc6ade42 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:54 +0300 Subject: [PATCH 27/41] Releasing debian version 5.0.7-2. bzr revid: p_christ@hol.gr-20101019095654-gj7ygpyzghthdcik --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b17ca9ad739..0933d89a821 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 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): From 6a7e3c81ac7f37f743042d356c733da4d4c5a0e1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:55 +0300 Subject: [PATCH 28/41] Releasing debian version 5.0.8-1. bzr revid: p_christ@hol.gr-20101019095655-qys4v27f88rsytz2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0933d89a821..f22c83b3f0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.8-1) unstable; urgency=low + + * Merging upstream version 5.0.8. + + -- Daniel Baumann Wed, 14 Apr 2010 20:19:21 +0200 + openerp-server (5.0.7-2) unstable; urgency=low * Updating python build-depends. From ff801e586e2a0a88cd12960cf38fb90abafcce23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:56 +0300 Subject: [PATCH 29/41] Releasing debian version 5.0.9-1. bzr revid: p_christ@hol.gr-20101019095656-nkbzz0msdlmrjtup --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f22c83b3f0c..4f9689676c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.9-1) unstable; urgency=low + + * Merging upstream version 5.0.9. + + -- Daniel Baumann Fri, 16 Apr 2010 06:47:02 +0200 + openerp-server (5.0.8-1) unstable; urgency=low * Merging upstream version 5.0.8. From 7732b7f40c083b4cc0dd25f44537666371e9487d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:56 +0300 Subject: [PATCH 30/41] Releasing debian version 5.0.10-1. bzr revid: p_christ@hol.gr-20101019095656-2ziugx2bnf0yhley --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4f9689676c8..60646bf21c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.10-1) unstable; urgency=low + + * Merging upstream version 5.0.10. + + -- Daniel Baumann Fri, 07 May 2010 15:02:31 +0200 + openerp-server (5.0.9-1) unstable; urgency=low * Merging upstream version 5.0.9. From 248984ad5c276cf0ed92daf11b7aa8a79648f062 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:57 +0300 Subject: [PATCH 31/41] Adding patch from Timothy E. Harris to prevents creating a new database if the locale is not a UTF-8 one (Closes: #584976). bzr revid: p_christ@hol.gr-20101019095657-36xhp4ihkvhf5n9h --- debian/patches/05-db-encoding.patch | 33 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/05-db-encoding.patch diff --git a/debian/patches/05-db-encoding.patch b/debian/patches/05-db-encoding.patch new file mode 100644 index 00000000000..ad9b0530c2a --- /dev/null +++ b/debian/patches/05-db-encoding.patch @@ -0,0 +1,33 @@ +Author: Timothy E. Harris +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() + diff --git a/debian/patches/series b/debian/patches/series index 7819b4cf731..78bdb14b64f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 02-migrate.patch 03-shebang.patch 04-manpage.patch +05-db-encoding.patch From a32665b0156f3169d29ad5d9826b756428de0326 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:57 +0300 Subject: [PATCH 32/41] Releasing debian version 5.0.11-1. bzr revid: p_christ@hol.gr-20101019095657-y6xemkpwiq60i1o1 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 60646bf21c4..c8ec373cb0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +openerp-server (5.0.11-1) unstable; urgency=low + + * Merging upstream version 5.0.11. + * Adding patch from Timothy E. Harris + to prevents creating a new database if the locale is not a UTF-8 one + (Closes: #584976). + + -- Daniel Baumann Tue, 08 Jun 2010 11:42:23 +0200 + openerp-server (5.0.10-1) unstable; urgency=low * Merging upstream version 5.0.10. From 01e654b50c9f369eae1fc0d3266776babb2135ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:58 +0300 Subject: [PATCH 33/41] Updating standards version to 3.9.0. bzr revid: p_christ@hol.gr-20101019095658-3il3w1pa2ggcr91k --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7e4dce1c7d5..23f462335ae 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ 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.8.4 +Standards-Version: 3.9.0 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 From fbae299da0823c82d6141d9d8103e00810da3631 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:58 +0300 Subject: [PATCH 34/41] Releasing debian version 5.0.12-1. bzr revid: p_christ@hol.gr-20101019095658-ph2lwucyxyaivwa6 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index c8ec373cb0f..e7a9f534678 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openerp-server (5.0.12-1) unstable; urgency=low + + * Updating standards version to 3.9.0. + * Merging upstream version 5.0.12. + + -- Daniel Baumann Sun, 18 Jul 2010 19:46:39 +0200 + openerp-server (5.0.11-1) unstable; urgency=low * Merging upstream version 5.0.11. From d05510c6f4844f0f97659d859f3cffe7fea660ef Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:59 +0300 Subject: [PATCH 35/41] Removing debhelper auto install overrides. bzr revid: p_christ@hol.gr-20101019095659-pg014ywgfdhsoacp --- debian/rules | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/debian/rules b/debian/rules index 36121571d8c..b9820b42840 100755 --- a/debian/rules +++ b/debian/rules @@ -8,20 +8,6 @@ override_dh_auto_clean: -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f -override_dh_auto_install: - python setup.py install --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 - - # Removing double files - rm -rf debian/openerp-server/usr/share/doc/openerp-server-* - override_dh_installchangelogs: dh_installchangelogs doc/Changelog From 962746436cd20c783d7f1681118d1bd0d87058e8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:56:59 +0300 Subject: [PATCH 36/41] Updating clean target in rules. bzr revid: p_christ@hol.gr-20101019095659-sy8rus8ds7rut3va --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index b9820b42840..627ef9d3c73 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ override_dh_auto_clean: dh_auto_clean - -find $(CURDIR) -type f -name "*.pyc" | xargs rm -f + rm -rf build override_dh_installchangelogs: dh_installchangelogs doc/Changelog From 9d3c41ea0735fe381e4aa4dbab60bdbdbb938a89 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:57:00 +0300 Subject: [PATCH 37/41] Reverting to manual setup.py call, updated for version 5.0.12. bzr revid: p_christ@hol.gr-20101019095700-wluzc90fjz01fk27 --- debian/rules | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian/rules b/debian/rules index 627ef9d3c73..a0f68be6b61 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,20 @@ override_dh_auto_clean: rm -rf build +override_dh_auto_install: + python setup.py install --install-layout=deb --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr + + # Adjusting program location + 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-* + +override_dh_fixperms: + dh_fixperms + + find debian/openerp-server/usr/share/pyshared/openerp-server/addons -type f -print0 | xargs -0 chmod 0644 + override_dh_installchangelogs: dh_installchangelogs doc/Changelog From 5b090de53e87a147d1af8522a8fedcf5a4406d6f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:57:00 +0300 Subject: [PATCH 38/41] Releasing debian version 5.0.12-2. bzr revid: p_christ@hol.gr-20101019095700-b4dmohgeiw4yae7a --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index e7a9f534678..83e9b13ca8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 Sat, 14 Aug 2010 18:53:43 +0200 + openerp-server (5.0.12-1) unstable; urgency=low * Updating standards version to 3.9.0. From 066cbb5d789d4172ae193a2539a5d237442cadca Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:57:01 +0300 Subject: [PATCH 39/41] Releasing debian version 5.0.13-1. bzr revid: p_christ@hol.gr-20101019095701-4c3fvaefggpw7p1u --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 83e9b13ca8f..3ec8e76fd19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +openerp-server (5.0.13-1) experimental; urgency=low + + * Merging upstream version 5.0.13. + + -- Daniel Baumann Mon, 13 Sep 2010 09:14:10 +0200 + openerp-server (5.0.12-2) unstable; urgency=low * Removing debhelper auto install overrides. From fe9b3b9da4aa99f205f84c31a117f333fc4a7228 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:57:01 +0300 Subject: [PATCH 40/41] Updating to standards version 3.9.1. bzr revid: p_christ@hol.gr-20101019095701-l3efr4vhb3mrxtzk --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 23f462335ae..22be0f04638 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ 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.0 +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 From 39eeb881a29bbaff8f79063de38378a5e7013e06 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Oct 2010 12:57:02 +0300 Subject: [PATCH 41/41] Releasing debian version 5.0.14-1. bzr revid: p_christ@hol.gr-20101019095702-ys2rced2xmsy26g7 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3ec8e76fd19..13dedd6ce5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +openerp-server (5.0.14-1) experimental; urgency=low + + * Updating to standards version 3.9.1. + * Merging upstream version 5.0.14. + + -- Daniel Baumann Wed, 15 Sep 2010 00:22:00 +0200 + openerp-server (5.0.13-1) experimental; urgency=low * Merging upstream version 5.0.13.