Changeset: be2816659598 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=be2816659598 Removed Files: debian/python-monetdb.install debian/python3-monetdb.install Modified Files: debian/control debian/rules Branch: default Log Message:
Removed python-monetdb also from Debian/Ubuntu build config. See also changeset 1f93f678faff. diffs (113 lines): diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -8,11 +8,10 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev, libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), libgsl0-dev, libpcre3-dev, libreadline-dev, liblzma-dev, - libssl-dev, libxml2-dev, perl, pkg-config, python, python3, + libssl-dev, libxml2-dev, perl, pkg-config, python, unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0), r-base Standards-Version: 3.8.0 X-Python-Version: >= 2.6 -X-Python3-Version: >= 3.0 Package: libmonetdb13 Architecture: any @@ -163,7 +162,7 @@ Depends: ${shlibs:Depends}, libmonetdb-c monetdb5-server (= ${source:Version}), perl-monetdb-client (= ${source:Version}), php5-monetdb-client (= ${source:Version}), - python-monetdb (= ${source:Version}), + python-monetdb (>= 1.0), monetdb5-sql (= ${source:Version}) Description: MonetDB client testing tools MonetDB is a database management system that is developed from a @@ -344,32 +343,6 @@ Description: MonetDB testing Python prog you are a developer, but if you do want to test, this is the package you need. -Package: python-monetdb -Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Description: Native MonetDB client Python API - MonetDB is a database management system that is developed from a - main-memory perspective with use of a fully decomposed storage model, - automatic index management, extensibility of data types and search - accelerators. It also has an SQL frontend. - . - This package contains the files needed to use MonetDB from a Python - program. This package is for Python version 2. If you want to use - Python version 3, you need python3-monetdb. - -Package: python3-monetdb -Architecture: all -Depends: ${python3:Depends}, ${misc:Depends} -Description: Native MonetDB client Python API - MonetDB is a database management system that is developed from a - main-memory perspective with use of a fully decomposed storage model, - automatic index management, extensibility of data types and search - accelerators. It also has an SQL frontend. - . - This package contains the files needed to use MonetDB from a Python3 - program. This package is for Python version 3. If you want to use - Python version 2, you need python-monetdb. - Package: monetdb-dbg Architecture: any Section: debug diff --git a/debian/python-monetdb.install b/debian/python-monetdb.install deleted file mode 100644 --- a/debian/python-monetdb.install +++ /dev/null @@ -1,3 +0,0 @@ -# usr/lib/python2.*/*-packages/* EXCEPT: MonetDBtesting -debian/tmp/usr/lib/python2.*/*-packages/monetdb/* -debian/tmp/usr/lib/python2.*/*-packages/python_monetdb-*.egg-info diff --git a/debian/python3-monetdb.install b/debian/python3-monetdb.install deleted file mode 100644 --- a/debian/python3-monetdb.install +++ /dev/null @@ -1,3 +0,0 @@ -# usr/lib/python3.*/*-packages/* EXCEPT: MonetDBtesting -debian/tmp/usr/lib/python3/*-packages/monetdb/* -debian/tmp/usr/lib/python3/*-packages/python_monetdb-*.egg-info diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ DH_VERBOSE=1 %: - dh $@ --parallel --with python2,python3 + dh $@ --parallel override_dh_auto_configure: dh_auto_configure -- \ @@ -54,8 +54,7 @@ override_dh_auto_configure: --with-perl-libdir=lib/perl5 \ --with-proj=no \ --with-pthread=yes \ - --with-python2=yes \ - --with-python3=yes \ + --with-python=yes \ --with-readline=yes \ --with-samtools=yes \ --with-sphinxclient=no \ @@ -67,16 +66,5 @@ override_dh_auto_configure: # currently the test suite fails override_dh_auto_test: -override_dh_clean: - dh_clean - cd clients/python2 && python setup.py clean - cd clients/python3 && python3 setup.py clean - -override_dh_python2: - dh_python2 clients/python2 - -override_dh_python3: - dh_python3 clients/python3 - override_dh_strip: dh_strip --dbg-package=monetdb-dbg _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
