--- bauble-0.9.7.orig/bauble/_gui.py +++ bauble-0.9.7/bauble/_gui.py @@ -17,7 +17,7 @@ import bauble.pluginmgr as pluginmgr from bauble.prefs import prefs from bauble.utils.log import log, debug, warning -from bauble.utils.pyparsing import * +from pyparsing import * from bauble.view import SearchView import bauble.error as error --- bauble-0.9.7.orig/bauble/db.py +++ bauble-0.9.7/bauble/db.py @@ -47,11 +47,11 @@ #print >>sys.stderr, dict_ if '__tablename__' in dict_: seqname = '%s_id_seq' % dict_['__tablename__'] - dict_['id'] = sa.Column('id', sa.Integer, sa.Sequence(seqname), + cls.id = sa.Column('id', sa.Integer, sa.Sequence(seqname), primary_key=True) - dict_['_created'] = sa.Column('_created', DateTime(True), + cls._created = sa.Column('_created', DateTime(True), default=sa.func.now()) - dict_['_last_updated'] = sa.Column('_last_updated', + cls._last_updated = sa.Column('_last_updated', DateTime(True), default=sa.func.now(), onupdate=sa.func.now()) --- bauble-0.9.7.orig/bauble/paths.py +++ bauble-0.9.7/bauble/paths.py @@ -72,7 +72,7 @@ """ Returns the root path of the locale files """ - if sys.platform == 'linux2': + if True: # sys.platform == 'linux2': # TODO: how do we get the locale directory for linux? d = os.path.join('/usr', 'share', 'locale') elif sys.platform == 'win32': @@ -96,7 +96,7 @@ else: raise Exception(_('Could not get path for user settings: no ' \ 'APPDATA or USERPROFILE variable')) - elif sys.platform == "linux2": + elif True: # sys.platform == "linux2": # using os.expanduser is more reliable than os.environ['HOME'] # because if the user runs bauble with sudo then it will # return the path of the user that used sudo instead of ~root --- bauble-0.9.7.orig/bauble/plugins/garden/plant.py +++ bauble-0.9.7/bauble/plugins/garden/plant.py @@ -193,7 +193,7 @@ """ __tablename__ = 'plant' __table_args__ = (UniqueConstraint('code', 'accession_id'), {}) - __mapper_args__ = {'order_by': ['accession_id', 'plant.code']} + __mapper_args__ = {'order_by': ('accession_id', 'plant.code')} # columns code = Column(Unicode(6), nullable=False) --- bauble-0.9.7.orig/bauble/plugins/imex/test.py +++ bauble-0.9.7/bauble/plugins/imex/test.py @@ -247,7 +247,7 @@ stmt = "SELECT max(id) from family;" nextval = conn.execute(stmt).fetchone()[0] + 1 else: - raise "no test for engine type: %s" % db.engine.name + assert False, "no test for engine type: %s" % db.engine.name #debug(list(conn.execute("SELECT * FROM family").fetchall())) maxid = conn.execute("SELECT max(id) FROM family").fetchone()[0] @@ -327,7 +327,7 @@ # stmt = "SELECT max(id) from family;" # nextval = conn.execute(stmt).fetchone()[0] + 1 # else: -# raise "no test for engine type: %s" % db.engine.name +# assert False, "no test for engine type: %s" % db.engine.name # #debug(list(conn.execute("SELECT * FROM family").fetchall())) # maxid = conn.execute("SELECT max(id) FROM family").fetchone()[0] --- bauble-0.9.7.orig/bauble/plugins/plants/genus.py +++ bauble-0.9.7/bauble/plugins/plants/genus.py @@ -142,7 +142,7 @@ __table_args__ = (UniqueConstraint('genus', 'hybrid', 'author', 'qualifier', 'family_id'), {}) - __mapper_args__ = {'order_by': ['genus', 'author']} + __mapper_args__ = {'order_by': ('genus', 'author')} # columns genus = Column(String(64), nullable=False, index=True) --- bauble-0.9.7.orig/bauble/plugins/plants/species_model.py +++ bauble-0.9.7/bauble/plugins/plants/species_model.py @@ -131,8 +131,8 @@ 'infrasp', 'infrasp_author', 'infrasp_rank', 'genus_id', name='species_index')) - _mapper_args__ = {'order_by': ['sp', 'sp_author', 'infrasp_rank', - 'infrasp']} + _mapper_args__ = {'order_by': ('sp', 'sp_author', 'infrasp_rank', + 'infrasp')} # columns sp = Column(Unicode(64), nullable=False, index=True) --- bauble-0.9.7.orig/bauble/test/test_bauble.py +++ bauble-0.9.7/bauble/test/test_bauble.py @@ -13,7 +13,7 @@ from bauble.types import Enum from bauble.utils.log import debug from bauble.view import SearchParser -from bauble.utils.pyparsing import * +from pyparsing import * from bauble.test import BaubleTestCase import bauble.meta as meta --- bauble-0.9.7.orig/bauble/test/test_pluginmgr.py +++ bauble-0.9.7/bauble/test/test_pluginmgr.py @@ -10,7 +10,7 @@ import bauble import bauble.db as db from bauble.view import SearchParser -from bauble.utils.pyparsing import * +from pyparsing import * from bauble.view import SearchView, MapperSearch, ResultSet from bauble.utils.log import debug, error from bauble.test import BaubleTestCase, uri --- bauble-0.9.7.orig/bauble/test/test_view.py +++ bauble-0.9.7/bauble/test/test_view.py @@ -10,7 +10,7 @@ import bauble import bauble.db as db from bauble.view import SearchParser -from bauble.utils.pyparsing import * +from pyparsing import * from bauble.view import SearchView, MapperSearch, ResultSet from bauble.utils.log import debug from bauble.test import BaubleTestCase --- bauble-0.9.7.orig/bauble/utils/__init__.py +++ bauble-0.9.7/bauble/utils/__init__.py @@ -17,7 +17,7 @@ from bauble.error import check, CheckConditionError import bauble.paths as paths from bauble.utils.log import debug, warning -from bauble.utils.pyparsing import * +from pyparsing import * def find_dependent_tables(table, metadata=None): --- bauble-0.9.7.orig/bauble/view.py +++ bauble-0.9.7/bauble/view.py @@ -25,7 +25,7 @@ import bauble.utils as utils from bauble.prefs import prefs from bauble.utils.log import debug, error, warning -from bauble.utils.pyparsing import * +from pyparsing import * # TODO: should we provide a way to change the results view from list to icon # and provide an icon type to each type that can be returned and then you could --- bauble-0.9.7.orig/data/bauble.desktop +++ bauble-0.9.7/data/bauble.desktop @@ -6,5 +6,5 @@ Terminal=False Icon=bauble Type=Application -Exec=bauble -Categories=Education; \ No newline at end of file +Exec=/usr/bin/bauble +Categories=Education; --- bauble-0.9.7.orig/debian/bauble.dirs +++ bauble-0.9.7/debian/bauble.dirs @@ -0,0 +1,7 @@ +usr/bin +usr/share/bauble +usr/share/icons +usr/share/locale +usr/share/pixmaps +usr/share/applications + --- bauble-0.9.7.orig/debian/bauble.docs +++ bauble-0.9.7/debian/bauble.docs @@ -0,0 +1 @@ +README --- bauble-0.9.7.orig/debian/bauble.install +++ bauble-0.9.7/debian/bauble.install @@ -0,0 +1 @@ +bauble/images/bauble.xpm usr/share/pixmaps --- bauble-0.9.7.orig/debian/bauble.manpages +++ bauble-0.9.7/debian/bauble.manpages @@ -0,0 +1,2 @@ +scripts/bauble.1 +scripts/bauble-admin.1 --- bauble-0.9.7.orig/debian/bauble.menu +++ bauble-0.9.7/debian/bauble.menu @@ -0,0 +1,2 @@ +?package(bauble):needs="X11" section="Applications/Science/Biology"\ + title="bauble" command="/usr/bin/bauble icon=/usr/share/pixmaps/bauble.xpm" --- bauble-0.9.7.orig/debian/changelog +++ bauble-0.9.7/debian/changelog @@ -0,0 +1,74 @@ +bauble (0.9.7-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Move from deprecated pysupport to dh_python2. (Closes: #785949) + + -- Martin Pitt Tue, 18 Aug 2015 17:44:55 +0200 + +bauble (0.9.7-2) unstable; urgency=low + + * manpages moved near the binaries + * remove string exceptions, invalid in python 2.6 (Closes: #585210) + * support also bsd flavours (Closes: #588849) + * updated to policy 3.9.1 + * support sqlalchemy 0.6 + + -- Giacomo Catenazzi Mon, 02 Aug 2010 19:36:01 +0200 + +bauble (0.9.7-1) unstable; urgency=low + + * ack NMU of Jonathan Wiltshire: thanks! (Closes: #547809) + * new upstream version (Closes: #551296) + * don't install pyparsing module, but use debian version (Closes: #555366) + + -- Giacomo Catenazzi Wed, 16 Dec 2009 07:50:50 +0100 + +bauble (0.9.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Invoke setup.py to install files in correct locations (Closes: #547809). + + -- Jonathan Wiltshire Wed, 18 Nov 2009 10:11:51 +0000 + +bauble (0.9.3-1) unstable; urgency=low + + [ Giacomo Catenazzi ] + * New upstream release + + -- Giacomo Catenazzi Fri, 07 Aug 2009 12:59:37 +0200 + +bauble (0.9.2-1) unstable; urgency=low + + [ Giacomo Catenazzi ] + * New upstream release + + [ Luca Falavigna ] + * debian/control: + - Minimum python version should be 2.5. + - Remove useless B-D. + - Add XS-Python-Version field. + - Remove python from Depends, ${python:Depends} will provide it. + + -- Giacomo Catenazzi Sun, 26 Jul 2009 20:19:55 +0200 + +bauble (0.9.0~b5-3) unstable; urgency=low + + * ooops: architecture "all" + * remove dh_desktop + + -- Giacomo Catenazzi Tue, 19 May 2009 22:11:32 +0200 + +bauble (0.9.0~b5-2) unstable; urgency=low + + * remove libgdk-pixbuf2 dependency: not needed + + -- Giacomo Catenazzi Tue, 19 May 2009 08:04:24 +0200 + +bauble (0.9.0~b5-1) unstable; urgency=low + + * Initial release (Closes: #507529) + * Created bauble.1 and bauble-admin.1 manpages + * install also icon bauble.xpm (but in usr/share/pixmaps) + * Patched setup.cfg: don't try to download dependencies from net + + -- Giacomo Catenazzi Thu, 02 Apr 2009 13:02:01 +0200 --- bauble-0.9.7.orig/debian/compat +++ bauble-0.9.7/debian/compat @@ -0,0 +1 @@ +7 --- bauble-0.9.7.orig/debian/control +++ bauble-0.9.7/debian/control @@ -0,0 +1,26 @@ +Source: bauble +Section: science +Priority: extra +Maintainer: Giacomo Catenazzi +Build-Depends: debhelper (>= 7), python (>= 2.5), dh-python, + gettext, python-setuptools (>= 0.6c9), python-gtk2, python-glade2, +Standards-Version: 3.9.1 +X-Python-Version: >= 2.5 +Homepage: http://bauble.belizebotanic.org/ + +Package: bauble +Architecture: all +Depends: xdg-utils, python-egenix-mxdatetime, + python-sqlalchemy (>= 0.6), python-lxml (>= 2.0), python-pyparsing, + python-gtk2 (>=2.12), librsvg2-common, python-glade2, + python-gdata (>=1.1.1), python-mako (>=0.2.2), + python-pysqlite2 (>= 2.3.2) | python-mysqldb | python-psycopg2, + ${misc:Depends}, ${python:Depends} +Recommends: python-mysqldb | python-psycopg2 +Description: biodiversity collection manager software application + Bauble is a software application to help you manage a collection of + botanical specimens. It is intended to be used by botanic gardens, + herbaria, arboreta, etc. to manage their collection information. + It is a open, free, cross-platform alternative to BG-Base and + similar software. + --- bauble-0.9.7.orig/debian/copyright +++ bauble-0.9.7/debian/copyright @@ -0,0 +1,80 @@ +This package was debianized by Giacomo Catenazzi on +Fri, 28 Nov 2008 08:11:03 +0100. + +It was downloaded from + +Upstream Authors: + + Brett Adams + Belize Botanic Gardens + Rosetta Contributors and Canonical Ltd + Paul Boddie + Paul T. McGuire + +Copyright: + + Copyright (c) 2005,2006,2007,2008 Brett Adams + Copyright (c) Belize Botanic Gardens + Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 + Copyright (C) 2005, 2006, 2007 Paul Boddie + Copyright (c) 2003-2008 Paul T. McGuire + +Licenses: + + In general GPL v2 (or GPL v2 and at your option any later version): + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + + Some files have differents licenses: + bauble/utils/desktop.py: LGPL (v2.1 or later) + + Copyright (C) 2005, 2006, 2007 Paul Boddie + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. + + bauble/utils/pyparsing.py: MIT/X11 (BSD like) + + Copyright (c) 2003-2008 Paul T. McGuire + + 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. + +The Debian packaging is copyright 2008, Giacomo Catenazzi and +is licensed under the GPL version 2 (or later), see `/usr/share/common-licenses/GPL-2'. + --- bauble-0.9.7.orig/debian/rules +++ bauble-0.9.7/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f +# This file is public domain software, originally written by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + touch build-stamp + python setup.py bdist_dumb --quiet --bdist-dir=bdist --keep-temp --relative + find bdist -name '*.pyc' -delete + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + python setup.py clean --quiet + # it as already own package. + rm -Rf bauble/utils/pyparsing.py + rm -Rf dist bdist + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + python setup.py install --root=$(CURDIR)/debian/bauble \ + --install-lib=/usr/share \ + --install-scripts=/usr/bin \ + --install-data=/usr + rm -rf $(CURDIR)/debian/bauble/usr/share/*.egg-info +# do "installation" manually: + dh_install + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_python2 + dh_installmenu + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install +# We have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install + --- bauble-0.9.7.orig/debian/watch +++ bauble-0.9.7/debian/watch @@ -0,0 +1,4 @@ +# See uscan(1) for format +version=3 +http://bauble.belizebotanic.org/ files/bauble-(.*)\.tar\.gz + --- bauble-0.9.7.orig/scripts/bauble +++ bauble-0.9.7/scripts/bauble @@ -16,8 +16,7 @@ import os, sys -if 'PYTHONPATH' in os.environ: - sys.path.insert(0, os.environ['PYTHONPATH']) +sys.path.insert(1, "/usr/share") if __name__ == "__main__": import bauble --- bauble-0.9.7.orig/scripts/bauble-admin.1 +++ bauble-0.9.7/scripts/bauble-admin.1 @@ -0,0 +1,43 @@ +.TH BAUBLE-ADMIN 1 "APRIL 2009" Linux "User Manuals" +.SH NAME +bauble-admin \- create bauble's database and change some of its properties +.SH SYNOPSIS +.B bauble-admin [ +.I command +.B ] [ +.I options +.B ] +.I dbname +.SH DESCRIPTION +The +.B bauble-admin +script makes it easier to create and database and change +some of its properties +.SH OPTIONS +.IP "-H,--host=hostname" +the host to connect to +.IP "-u,--user=user" +the user name to use when connecting to the server +.IP "-P,--port=port" +the port on the server to connect to +.IP "-o,--owner=owner" +the owner of the newly created database, if not set then use the user name +.IP "-p" +ask for a password +.IP "-d,--dbtype=dbtype" +the database type +.IP "-v,--verbose" +verbose output +.IP "-y',--dryrun" +don't execute anything + +.SH BUGS +This script is considered ALPHA quality. You mileage may vary. +.SH "SEE ALSO" +.BR bauble (1) +.SH AUTHOR +Bauble was written by Brett Adams. +.PP +This manual page was written by Giacomo Catenazzi , +for the Debian project (and may be used by others). + --- bauble-0.9.7.orig/scripts/bauble.1 +++ bauble-0.9.7/scripts/bauble.1 @@ -0,0 +1,19 @@ +.TH BAUBLE 1 "APRIL 2009" Linux "User Manuals" +.SH NAME +bauble \- software application to manage a collection of botanical specimens +.SH SYNOPSIS +.B bauble +.SH DESCRIPTION +.B Bauble +is a graphical (X) application. +The documentation is available throu the help menu in bauble application. +.SH "SEE ALSO" +.BR bauble-admin (1) +.br +The programs are documented fully in the runtime documentation. +.SH AUTHOR +Bauble was written by Brett Adams. +.PP +This manual page was written by Giacomo Catenazzi , +for the Debian project (and may be used by others). + --- bauble-0.9.7.orig/setup.cfg +++ bauble-0.9.7/setup.cfg @@ -1,3 +1,6 @@ +[easy_install] +allow-hosts = None + [sdist] formats = bztar,gztar,zip --- bauble-0.9.7.orig/setup.py +++ bauble-0.9.7/setup.py @@ -216,7 +216,7 @@ spawn.spawn(['msgfmt', po, '-o', mo]) # copy .desktop and icons - if sys.platform == 'linux2': + if True: # sys.platform == 'linux2': app_dir = os.path.join(self.build_base, 'share/applications') dir_util.mkpath(app_dir) file_util.copy_file('data/bauble.desktop', app_dir) @@ -258,7 +258,7 @@ _install.finalize_options(self) def run(self): - if sys.platform not in ('linux2', 'win32'): + if False: # sys.platform not in ('linux2', 'win32'): msg = "**Error: Can't install on this platform: %s" % sys.platform print msg sys.exit(1) @@ -274,7 +274,7 @@ # return # install bauble.desktop and icons - if sys.platform == 'linux2': + if True: # sys.platform == 'linux2': # install everything in share dir_util.copy_tree(os.path.join(self.build_base, 'share'), os.path.join(self.install_data, 'share'))