diff options
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | src/setup-dbg.py | 2 |
2 files changed, 8 insertions, 2 deletions
@@ -10,7 +10,8 @@ VERSION := $(shell cd src;python -c "from setup_common import *; print get_versi PACKAGE := python-dmidecode PY_VER := $(shell python -c 'import sys; print "%d.%d"%sys.version_info[0:2]') PY := python$(PY_VER) -SO = build/lib.linux-$(shell uname -m)-$(PY_VER)/dmidecodemod.so +SO := build/lib.linux-$(shell uname -m)-$(PY_VER)/dmidecodemod.so +SHELL := /bin/bash ############################################################################### .PHONY: build dmidump install uninstall clean tarball rpm unit version @@ -65,3 +66,8 @@ version: @echo "python-dmidecode: $(VERSION)" @echo "python version: $(PY_VER) ($(PY))" +conflicts: + @comm -12 \ + <(dpkg-deb -c ../../DPKGS/python-dmidecode_$(VERSION)-1_amd64.deb | awk '$$NF!~/\/$$/{print$$NF}'|sort) \ + <(dpkg-deb -c ../../DPKGS/python-dmidecode-dbg_$(VERSION)-1_amd64.deb | awk '$$NF!~/\/$$/{print$$NF}'|sort) + diff --git a/src/setup-dbg.py b/src/setup-dbg.py index faced4c..b91e3e0 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -78,5 +78,5 @@ setup( define_macros = macros ) ], - py_modules = [ "dmidecode" ] + py_modules = [ "dmidecode-dbg" ] ) |