diff --git a/debian/control b/debian/control index bf3c64d725f..34a0494fef2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Daniel Baumann Build-Depends: debhelper (>= 7), dpatch, python-dev -Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg +Build-Depends-Indep: python-lxml, python-xml, python-libxslt1, python-psycopg2 Standards-Version: 3.8.0 Homepage: http://www.openerp.com/ Vcs-Browser: http://git.debian.net/?p=debian/openerp-server.git @@ -12,7 +12,7 @@ Vcs-Git: git://git.debian.net/git/debian/openerp-server.git Package: openerp-server Section: net Architecture: all -Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg, python-reportlab, python-tz +Depends: ${misc:Depends}, adduser, python, python-lxml, python-xml, python-libxslt1, python-psycopg2, python-reportlab, python-pychart, python-pydot, python-tz Conflicts: tinyerp-server Replaces: tinyerp-server Recommends: graphviz, ghostscript, postgresql, postgresql-client, python-imaging, python-matplotlib, python-pyopenssl, python-pyparsing diff --git a/debian/copyright b/debian/copyright index 4bdf8e97d66..1d87b615d5d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -96,27 +96,6 @@ License: BSD ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: bin/addons/base/ir/workflow/pydot/* -Copyright: (C) 2004 Ero Carrera -License: other - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is furnished to do - so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - Files: bin/addons/base_report_designer/wizard/tiny_sxw2rml/normalized_oo2rml.xsl bin/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py @@ -205,52 +184,6 @@ License: GPL-2+ On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. -Files: bin/pychart/* -Copyright: (C) 2000-2005 Yasushi Saito -License: GPL-2+ - 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the complete text of the GNU General Public License - can be found in /usr/share/common-licenses/GPL-2 file. - -Files: bin/reportlab/* -Copyright: (C) 2000-2004 ReportLab Inc. -License: BSD - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the company nor the names of its contributors may be - used to endorse or promote products derived from this software without - specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE OFFICERS OR CONTRIBUTORS BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Files: bin/tools/threadinglocal.py Copyright: (C) 2004-2005 CherryPy Team License: BSD