From c1c25afcc7a772b1672fd0c51b02fa048fe3e5d9 Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 28 Jan 2020 16:43:02 -0500 Subject: [PATCH] Python: fix up debug package #298 --- CMakeLists.txt | 2 +- debian/control | 12 +++++++++++- debian/rules | 7 +++---- doc/man/man1/notcurses-demo.1.md | 3 ++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3268c4389..efb2e351d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,4 +500,4 @@ install(TARGETS notcurses ) install( CODE - "execute_process(COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ../python)") + "execute_process(COMMAND ${Python3_EXECUTABLE} ${SETUP_PY} install --install-layout=deb --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ../python)") diff --git a/debian/control b/debian/control index 0b3247e6c..fa010117f 100644 --- a/debian/control +++ b/debian/control @@ -63,9 +63,19 @@ Description: Binaries from libnotcurses notcurses-view, notcurses-planereel, and notcurses-input. Package: python3-notcurses -Architecture: all +Architecture: any Depends: ${python3:Depends}, ${misc:Depends} Description: Python wrappers for notcurses (Python 3) Python wrappers for the notcurses TUI library. . This package installs the library for Python 3. + +Package: python3-notcurses-dbg +Architecture: any +Section: debug +Recommends: python3-dbg +Depends: ${python3:Depends}, ${misc:Depends}, python3-notcurses (= ${binary:Version}) +Description: Python wrappers for notcurses (Python 3 debug) + Python wrappers for the notcurses TUI library. + . + This package installs the debug-enabled library for Python 3. diff --git a/debian/rules b/debian/rules index 34b7e2206..621d4ac8f 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export PYBUILD_NAME=notcurses %: - dh $@ --buildsystem=cmake + dh $@ --with python3 --buildsystem=cmake # dh_auto_test -O--buildsystem=cmake -O--no-parallel # Don't try to run ncurses tests @@ -17,6 +17,5 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) cd obj-x86_64-linux-gnu && env -u TERM make test endif -# support building a Python debugging package -override_dh_strip: - dh_strip -ppython3-foo --dbg-package=python3-foo-dbg +override_dh_auto_install: + dh_auto_install -B $(BUILDDIR) diff --git a/doc/man/man1/notcurses-demo.1.md b/doc/man/man1/notcurses-demo.1.md index 0a155926d..2004ff7d6 100644 --- a/doc/man/man1/notcurses-demo.1.md +++ b/doc/man/man1/notcurses-demo.1.md @@ -8,7 +8,8 @@ notcurses-demo - Show off some notcurses features # SYNOPSIS -**notcurses-demo** [**-h|--help**] [**-p path**] [**-d delaymult**] [**-l loglevel**] [**-kHVc**] demospec +**notcurses-demo** [**-h|--help**] [**-p path**] [**-d delaymult**] + [**-l loglevel**] [**-kHVc**] demospec # DESCRIPTION