From abc4c06dfaec30667e8d5cd1ed944716eb50afc0 Mon Sep 17 00:00:00 2001 From: LtWorf Date: Tue, 22 Mar 2011 16:17:41 +0000 Subject: [PATCH] - Installers for modules moved outside of the debian directory git-svn-id: http://galileo.dmi.unict.it/svn/relational/trunk@288 014f5005-505e-4b48-8d0a-63407b615a7c --- Makefile | 5 ++++- debian/changelog | 3 ++- debian/rules | 2 +- setup/installer_common.py | 23 ++++++++++++++++++++ {debian => setup}/python-relational.setup.py | 1 + {debian => setup}/relational-cli.setup.py | 1 + {debian => setup}/relational.setup.py | 1 + 7 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 setup/installer_common.py rename {debian => setup}/python-relational.setup.py (77%) rename {debian => setup}/relational-cli.setup.py (81%) rename {debian => setup}/relational.setup.py (79%) diff --git a/Makefile b/Makefile index 002f0f5..77cb1b4 100644 --- a/Makefile +++ b/Makefile @@ -17,13 +17,14 @@ install: cp relational.desktop /usr/share/applications/ chmod a+r /usr/share/applications/relational.desktop -source: clean +dist: clean rm -rf /tmp/relational/ rm -rf /tmp/relational-* mkdir /tmp/relational/ cp -R * /tmp/relational/ rm -rf /tmp/relational/windows rm -rf /tmp/relational/samples/.svn/ + rm -rf /tmp/relational/setup/.svn/ rm -rf /tmp/relational/debscript/.svn/ rm -rf /tmp/relational/mac/.svn/ rm -rf /tmp/relational/relational/.svn/ @@ -59,6 +60,8 @@ clean: rm -rf relational_readline/*~ || echo ok rm -rf relational_readline/*.pyc || echo ok rm -rf relational_readline/*.pyo || echo ok + rm -rf setup/*.pyc || echo ok + rm -rf setup/*.pyo || echo ok rm -rf relational_mac rm -rf test/*~ mac: app diff --git a/debian/changelog b/debian/changelog index 246ccae..eaebae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ relational (1.0-1) unstable; urgency=low * New upstream release * Merged relational-cli upstream, dropped debian patch * Using relational_gui.py for both relational and relational-cli packages + * Merged various setup.py upstream - -- Salvo 'LtWorf' Tomaselli Fri, 04 Mar 2011 13:28:51 +0100 + -- Salvo 'LtWorf' Tomaselli Tue, 22 Mar 2011 17:11:28 +0100 relational (0.11-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 3510d1f..cc99c69 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ override_dh_auto_clean: override_dh_auto_build: override_dh_auto_install: for pkg in relational-cli python-relational relational; do \ - python debian/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \ + python setup/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \ rm -rf build; \ done diff --git a/setup/installer_common.py b/setup/installer_common.py new file mode 100644 index 0000000..a75fa41 --- /dev/null +++ b/setup/installer_common.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Relational +# Copyright (C) 2008 Salvo "LtWorf" Tomaselli +# +# Relational 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 . +# +# author Salvo "LtWorf" Tomaselli + +from distutils.core import setup + +def c_setup(name) + setup(name=name, packages=(name,)) diff --git a/debian/python-relational.setup.py b/setup/python-relational.setup.py similarity index 77% rename from debian/python-relational.setup.py rename to setup/python-relational.setup.py index ee5d1bb..2756332 100644 --- a/debian/python-relational.setup.py +++ b/setup/python-relational.setup.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from distutils.core import setup setup(name='relational', packages=('relational',)) diff --git a/debian/relational-cli.setup.py b/setup/relational-cli.setup.py similarity index 81% rename from debian/relational-cli.setup.py rename to setup/relational-cli.setup.py index 805270c..d530ae5 100644 --- a/debian/relational-cli.setup.py +++ b/setup/relational-cli.setup.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from distutils.core import setup setup(name='relational_readline', packages=('relational_readline',)) diff --git a/debian/relational.setup.py b/setup/relational.setup.py similarity index 79% rename from debian/relational.setup.py rename to setup/relational.setup.py index 208964f..f5a6a33 100644 --- a/debian/relational.setup.py +++ b/setup/relational.setup.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from distutils.core import setup setup(name='relational_gui', packages=('relational_gui',))