[MERGE] packaging part1 tgz

bzr revid: al@openerp.com-20111001173741-otvj0oqmsd77kag7

19 files changed, 82 insertions, 248 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 18b6b245bf0..00000000000
--- a/debian/README.source
+++ /dev/null
@@ -1,37 +0,0 @@
-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.
diff --git a/debian/changelog b/debian/changelog
index f9a2355cf62..0ee8e0e3295 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openerp (6.1-1) testing; urgency=low
+
+  * New major version, new packaging.
+
+ -- Antony Lesuisse <al@openerp.com>  Sat, 01 Oct 2011 12:31:00 +0100
+
 openerp-server (6.0.2-1) testing; urgency=low
 
   * Using upstream version 6.0.2
diff --git a/debian/control b/debian/control
index 11c98536526..2fdc8cf90f0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,40 +1,29 @@
-Source: openerp-server
+Source: openerp
 Section: net
 Priority: optional
-Maintainer: OpenERP SA. <xrg@openerp.com>
-Uploaders: Xrg <xrg@openerp.com>
+Maintainer: OpenERP SA <al@openerp.com>
 Build-Depends: debhelper (>= 7.0.50~), python
 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.hellug.gr/?p=xrg/openobject-server;a=summary
-Vcs-Git: http://members.hellug.gr/xrg/repos/openobject-server
-Vcs-Bzr: https://code.launchpad.net/openobject-server
+Vcs-Bzr: https://code.launchpad.net/openobject
 
-Package: openerp-server
+Package: openerp
 Section: net
 Architecture: all
 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,
- postgresql-client (>=8.2)
-Conflicts: tinyerp-server
-Replaces: tinyerp-server
+ ${misc:Depends}, adduser, python, postgresql-client, python-dateutil, python-libxslt1, python-lxml, python-mako, python-psycopg2, python-pychart, python-pydot, python-pyparsing, python-reportlab, python-simplejson python-tz, python-webdav, python-werkzeug, python-yaml
+Conflicts: tinyerp-server, openerp-server
+Replaces: tinyerp-server, openerp-server
 Recommends:
- graphviz, ghostscript, postgresql, python-imaging,
- python-matplotlib
-Suggests: openerp-client
-Description: Enterprise Resource Management (server)
- Open ERP, previously known as TinyERP, is a complete ERP and CRM. The main
+ graphviz, ghostscript, postgresql, python-imaging, python-matplotlib
+Description: OpenERP Enterprise Resource Management
+ OpenERP, previously known as TinyERP, is a complete ERP and CRM. The main
  features are accounting (analytic and financial), stock management, sales and
  purchases management, tasks automation, marketing campaigns, help desk, POS,
  etc. Technical features include a distributed server, flexible workflows, an
  object database, a dynamic GUI, customizable reports, and NET-RPC and XML-RPC
  interfaces.
- .
- This package contains the Open ERP server, install openerp-client package for
- the client.
 
diff --git a/debian/local/openerp-server.conf b/debian/local/openerp-server.conf
deleted file mode 100644
index ffb6ed49db3..00000000000
--- a/debian/local/openerp-server.conf
+++ /dev/null
@@ -1,55 +0,0 @@
-# /etc/openerp-server.conf(5) - configuration file for openerp-server(1)
-
-[options]
-# Enable the debugging mode (default False).
-verbose = False
-debug_mode = False
-
-# The file where the server pid will be stored (default False).
-#pidfile = /var/run/openerp.pid
-
-# The file where the server log will be stored (default False).
-logfile = /var/log/openerp-server.log
-
-# The unix account on behalf openerp is running.
-process_user = openerp
-
-# The IP address on which the server will bind.
-# If empty, it will bind on all interfaces (default empty).
-interface = localhost
-
-# The TCP port on which the server will listen (default 8069).
-#port = 8070
-
-# Enable debug mode (default False).
-debug_mode = False
-
-# Launch server over https instead of http (default False).
-secure = False
-
-# Specify the SMTP server for sending email (default localhost).
-smtp_server = localhost
-
-# Specify the SMTP user for sending email (default False).
-smtp_user = False
-
-# Specify the SMTP password for sending email (default False).
-smtp_password = False
-
-# Specify the database name.
-#db_name = openerp
-
-# Specify the database user name (default None).
-db_user = openerp
-
-# Specify the database password for db_user (default None).
-db_password =
-
-# Specify the database host (default localhost).
-db_host =
-
-# Specify the database port (default None).
-db_port = 5432
-
-# Specify the price accuracy.
-#price_accuracy =
diff --git a/debian/openerp-server.config b/debian/openerp-server.config
deleted file mode 100644
index cf081ab3861..00000000000
--- a/debian/openerp-server.config
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input low openerp-server/username || true
-db_go
-
-db_stop
diff --git a/debian/openerp-server.docs b/debian/openerp-server.docs
deleted file mode 100644
index d5ad552bfce..00000000000
--- a/debian/openerp-server.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/migrate
-doc/tests
diff --git a/debian/openerp-server.examples b/debian/openerp-server.examples
deleted file mode 100644
index c7f075ec127..00000000000
--- a/debian/openerp-server.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/openerp-server.preseed
diff --git a/debian/openerp-server.links b/debian/openerp-server.links
deleted file mode 100644
index 67620d22397..00000000000
--- a/debian/openerp-server.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/man/man5/openerp_serverrc.5.gz	/usr/share/man/man5/openerp-server.conf.5.gz
-/var/lib/openerp-server/filestore		/usr/lib/openerp-server/filestore
diff --git a/debian/openerp-server.postinst b/debian/openerp-server.postinst
deleted file mode 100644
index a1e5317b8fc..00000000000
--- a/debian/openerp-server.postinst
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-CONFFILE="/etc/openerp-server.conf"
-LOGFILE="/var/log/openerp-server.log"
-
-case "${1}" in
-	configure)
-		db_version 2.0
-
-		db_get openerp-server/username
-		_USERNAME="${RET:-openerp}"
-
-		db_stop
-
-		if ! getent passwd | grep -q "^${_USERNAME}"
-		then
-			adduser --system --no-create-home --quiet --gecos 'Open ERP server' --group ${_USERNAME}
-		else
-			echo "Open ERP user (${_USERNAME}) already exists, doing nothing."
-		fi
-
-		sed -i -e "s|^process_user.*$|process_user = ${_USERNAME}|" ${CONFFILE}
-
-		# Creating log file
-		touch ${LOGFILE}
-		chown ${_USERNAME}:adm ${LOGFILE}
-		chmod 0640 ${LOGFILE}
-
-		# Creating local storage directory
-		mkdir -p /var/lib/openerp-server/filestore
-
-		# Setting ownership and permissions
-		chmod 0640 ${CONFFILE}
-		chown ${_USERNAME}:${_USERNAME} ${CONFFILE}
-		chown ${_USERNAME}:${_USERNAME} /var/lib/openerp-server -R
-
-		echo
-		echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
-		echo "* Open ERP uses a PostgreSQL database to store its data. With the first *"
-		echo "* generation of packages, you have to setup this database manually.     *"
-		echo "* Please read /usr/share/doc/openerp-server/README.Debian how to do it. *"
-		echo "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
-		echo
-		;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`{$1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openerp-server.postrm b/debian/openerp-server.postrm
deleted file mode 100644
index 02b3d0a6817..00000000000
--- a/debian/openerp-server.postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	remove)
-		_USERNAME="openerp"
-		_GROUPNAME="openerp"
-
-		if [ -x /usr/sbin/deluser ]
-		then
-			deluser --quiet --system ${_USERNAME}
-		fi
-
-		if [ -x /usr/sbin/delgroup ]
-		then
-			delgroup --quiet --system --only-if-empty ${_GROUPNAME} || true
-		fi
-
-		rm -f /usr/lib/openerp-server/addons/__init__.pyc
-		rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server/addons || true
-		rmdir --ignore-fail-on-non-empty /usr/lib/openerp-server || true
-		;;
-
-	purge)
-		rm -rf /var/lib/openerp-server
-		;;
-
-	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-		;;
-
-	*)
-		echo "postrm called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openerp-server.preseed b/debian/openerp-server.preseed
deleted file mode 100644
index 66d1a4ab95d..00000000000
--- a/debian/openerp-server.preseed
+++ /dev/null
@@ -1,5 +0,0 @@
-################################################################################
-## openerp-server
-
-#openerp-server openerp-server/username string openerp
-################################################################################
diff --git a/debian/openerp-server.templates b/debian/openerp-server.templates
deleted file mode 100644
index 985bd24abd9..00000000000
--- a/debian/openerp-server.templates
+++ /dev/null
@@ -1,9 +0,0 @@
-Template: openerp-server/username
-Type: string
-Default: openerp
-_Description: Dedicated system account for the Open ERP server:
- The Open ERP server must use a dedicated account for its operation so that
- the system's security is not compromised by running it with superuser
- privileges.
- .
- Please choose that account's username.
diff --git a/debian/openerp-server.README.Debian b/debian/openerp.README.Debian
index af298134af8..af298134af8 100644
--- a/debian/openerp-server.README.Debian
+++ b/debian/openerp.README.Debian
diff --git a/debian/openerp-server.init b/debian/openerp.init
index ad8cbecb07c..ad8cbecb07c 100644
--- a/debian/openerp-server.init
+++ b/debian/openerp.init
diff --git a/debian/openerp-server.install b/debian/openerp.install
index 78a4a648a06..78a4a648a06 100644
--- a/debian/openerp-server.install
+++ b/debian/openerp.install
diff --git a/debian/openerp-server.lintian-overrides b/debian/openerp.lintian-overrides
index 25b1165c4be..25b1165c4be 100644
--- a/debian/openerp-server.lintian-overrides
+++ b/debian/openerp.lintian-overrides
diff --git a/debian/openerp.postinst b/debian/openerp.postinst
new file mode 100644
index 00000000000..bbeee2a15f7
--- /dev/null
+++ b/debian/openerp.postinst
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+CONFFILE="/etc/openerp.conf"
+FILESTORE="/var/lib/openerp/filestore"
+LOGFILE="/var/log/openerp.log"
+USERNAME="openerp"
+
+case "${1}" in
+	configure)
+		if ! getent passwd | grep -q "^${USERNAME}" then
+			adduser --system --no-create-home --quiet --gecos 'OpenERP' --group ${USERNAME}
+		fi
+		# Creating log file
+		touch ${LOGFILE}
+		chown ${USERNAME}:${USERNAME} ${LOGFILE}
+		chmod 0640 ${LOGFILE}
+		# Creating local storage directory
+		mkdir -p ${FILESTORE}
+		# Setting ownership and permissions
+		chmod 0640 ${CONFFILE}
+		chown ${_USERNAME}:${_USERNAME} ${CONFFILE}
+		chown ${_USERNAME}:${_USERNAME} /var/lib/openerp -R
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+		;;
+
+	*)
+		echo "postinst called with unknown argument \`{$1}'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/openerp.postrm b/debian/openerp.postrm
new file mode 100644
index 00000000000..0e5014dc9c8
--- /dev/null
+++ b/debian/openerp.postrm
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+case "${1}" in
+	remove)
+        deluser --quiet --system "openerp" || true
+        delgroup --quiet --system --only-if-empty "openerp" || true
+        ;;
+
+    purge)
+        rm -rf /var/lib/openerp-server
+        ;;
+
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`${1}'" >&2
+        exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 30ce14141e4..52d395fd86e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,5 @@ EXTRA_MODULES_PATH ?= ../addons
 %:
 	dh  ${@}
 
-override_dh_installchangelogs:
-	dh_installchangelogs doc/Changelog
-
 override_dh_installinit:
 	dh_installinit --update-rcd-params='defaults 21'