/pcp

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Python 3 based .deb packages #86

Merged
merged 1 commit into from Apr 15, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+12 −12
Split
View
8 debian/control
@@ -4,13 +4,13 @@ Priority: extra
Homepage: http://pcp.io
Maintainer: PCP Development Team <pcp@oss.sgi.com>
Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), perl (>= 5.6), libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], python-all, python-all-dev, libnspr4-dev, libnss3-dev, libsasl2-dev, libmicrohttpd-dev, libavahi-common-dev, libqt4-dev, autotools-dev, zlib1g-dev, autoconf, libclass-dbi-perl, libdbd-mysql-perl, libdbd-pg-perl, dpkg-dev, build-essential, dh-python, libcairo2-dev, libpapi-dev, libpfm4-dev, g++, libncurses5-dev, python-six, python-json-pointer, libextutils-autoinstall-perl, libxml-tokeparser-perl, librrds-perl, libjson-perl, libwww-perl, libnet-snmp-perl, qt4-qmake, libnss3-tools
+Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), perl (>= 5.6), libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], python3-all, python3-all-dev, libnspr4-dev, libnss3-dev, libsasl2-dev, libmicrohttpd-dev, libavahi-common-dev, libqt4-dev, autotools-dev, zlib1g-dev, autoconf, libclass-dbi-perl, libdbd-mysql-perl, libdbd-pg-perl, dpkg-dev, build-essential, dh-python, libcairo2-dev, libpapi-dev, libpfm4-dev, g++, libncurses5-dev, python3-six, python3-json-pointer, libextutils-autoinstall-perl, libxml-tokeparser-perl, librrds-perl, libjson-perl, libwww-perl, libnet-snmp-perl, qt4-qmake, libnss3-tools
#Architecture-dependent -- Build-Depends: libibumad-dev, libibmad-dev
Standards-Version: 3.9.3
X-Python-Version: >= 2.6
Package: pcp
-Depends: ${shlibs:Depends}, ${misc:Depends}, gawk, procps, libpcp-pmda-perl, python-pcp, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, gawk, procps, libpcp-pmda-perl, python3-pcp, python3
Conflicts: pgpool2
Suggests: pcp-gui, libpcp-import-perl
Architecture: any
@@ -212,7 +212,7 @@ Description: Performance Co-Pilot data import library
client applications to easily retrieve and process any subset of
that data.
-Package: python-pcp
+Package: python3-pcp
Section: python
Architecture: any
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, libpcp3 (= ${binary:Version})
@@ -337,7 +337,7 @@ Description: Tool for importing data from collectl into PCP archive logs
(such as pmie, pmlogsummary, pmchart or pmdumptext).
Package: pcp-export-pcp2graphite
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-pcp
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python3-pcp
Breaks: pcp (<< 3.9.0)
Architecture: any
Description: Tool for exporting data from PCP to Graphite
View
8 debian/control.master
@@ -4,13 +4,13 @@ Priority: extra
Homepage: http://pcp.io
Maintainer: PCP Development Team <pcp@oss.sgi.com>
Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), perl (>= 5.6), libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], python-all, python-all-dev, libnspr4-dev, libnss3-dev, libsasl2-dev, libmicrohttpd-dev, libavahi-common-dev, libqt4-dev, autotools-dev, zlib1g-dev, autoconf ?{dh-python}
+Build-Depends: bison, flex, gawk, procps, pkg-config, debhelper (>= 5), perl (>= 5.6), libreadline-dev | libreadline5-dev | libreadline-gplv2-dev, chrpath, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], python3-all, python3-all-dev, libnspr4-dev, libnss3-dev, libsasl2-dev, libmicrohttpd-dev, libavahi-common-dev, libqt4-dev, autotools-dev, zlib1g-dev, autoconf ?{dh-python}
#Architecture-dependent -- Build-Depends: libibumad-dev, libibmad-dev
Standards-Version: 3.9.3
X-Python-Version: >= 2.6
Package: pcp
-Depends: ${shlibs:Depends}, ${misc:Depends}, gawk, procps, libpcp-pmda-perl, python-pcp, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, gawk, procps, libpcp-pmda-perl, python3-pcp, python3
Conflicts: pgpool2
Suggests: pcp-gui, libpcp-import-perl
Architecture: any
@@ -212,7 +212,7 @@ Description: Performance Co-Pilot data import library
client applications to easily retrieve and process any subset of
that data.
-Package: python-pcp
+Package: python3-pcp
Section: python
Architecture: any
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, libpcp3 (= ${binary:Version})
@@ -337,7 +337,7 @@ Description: Tool for importing data from collectl into PCP archive logs
(such as pmie, pmlogsummary, pmchart or pmdumptext).
Package: pcp-export-pcp2graphite
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python-pcp
+Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python3-pcp
Breaks: pcp (<< 3.9.0)
Architecture: any
Description: Tool for exporting data from PCP to Graphite
View
8 debian/rules
@@ -30,7 +30,7 @@ pcp_pmda_infiniband = pcp-pmda-infiniband
pcp_testsuite = pcp-testsuite
pcp_manager = pcp-manager
pcp_webapi = pcp-webapi
-pcp_python = python-pcp
+pcp_python = python3-pcp
pcpgui = pcp-gui
pcpdoc = pcp-doc
@@ -119,7 +119,7 @@ configure_tools = export DEBUG=-DNDEBUG;
# ... Makepkgs uses the latter mechanism to refine the configure
# options
#
-configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-sysconfigdir=/etc/default --without-systemd --without-python3
+configure_paths = --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var --with-rcdir=/etc/init.d --with-sysconfigdir=/etc/default --without-systemd --without-python
checkdir = test -f debian/rules
uninstall = cat debian/*.install | sed -e "s,^,debian/$(pcp)/," | xargs rm -f
@@ -185,7 +185,7 @@ binary-arch: checkroot build-stamp
#$(pkgpcp_pmda_infiniband) $(MAKE) -C src/pmdas/infiniband install
# need the make clean when more than one version of Python installed
# to ensure make install after the first version works
- for V in $(shell pyversions -vr); do \
+ for V in $(shell py3versions -vr); do \
$(pkgpcp_python) $(MAKE) PYTHON=python$$V -C src/python install; \
$(MAKE) -C src/python clean; \
done
@@ -220,7 +220,7 @@ binary-arch: checkroot build-stamp
dh_makeshlibs --package $(libpcp_gui)
dh_makeshlibs -N $(libpcp_mmv)
dh_makeshlibs --package $(libpcp_mmv)
- dh_python2 --package $(pcp_python)
+ dh_python3 --package $(pcp_python)
dh_perl -p $(libpcp_mmv_perl)
dh_perl -p $(libpcp_pmda_perl)
dh_perl -p $(libpcp_import_perl)