summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNima Talebi <nima@it.net.au>2009-12-20 11:21:17 +1100
committerNima Talebi <nima@it.net.au>2010-01-06 16:19:23 +1100
commit1b810386b0191cd68209f98b23310ba453e90865 (patch)
tree0acfcd66d9ed1683630085e37a1e75caabe79cda
parent5d26fd4b09109664198539618a8679685fa18607 (diff)
downloadpython-dmidecode-1b810386b0191cd68209f98b23310ba453e90865.tar.gz
python-dmidecode-1b810386b0191cd68209f98b23310ba453e90865.tar.xz
python-dmidecode-1b810386b0191cd68209f98b23310ba453e90865.zip
Closes Bug#561904
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules3
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 34959b4..5b45cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-dmidecode (3.10.8-2) unstable; urgency=low
+
+ * Resolved conflict between standard and debug package (Closes: #561904).
+
+ -- Nima Talebi <nima@it.net.au> Sun, 20 Dec 2009 11:17:37 +1100
+
python-dmidecode (3.10.8-1) unstable; urgency=low
* New Upstream release.
diff --git a/debian/rules b/debian/rules
index 906da77..fca75cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ build-ext-%:
python$* src/setup.py build
touch $@
build-dbg-ext-%:
+ cp dmidecode.py dmidecode-dbg.py
python$*-dbg src/setup-dbg.py build
touch $@
@@ -60,7 +61,7 @@ clean:
dh_testdir
dh_testroot
$(MAKE) -f Makefile clean
- dh_clean build-stamp install-stamp \
+ dh_clean build-stamp install-stamp dmidecode-dbg.py \
$(PYVERS:%=install-ext-%) $(PYVERS:%=build-ext-%) \
$(PYVERS:%=install-dbg-ext-%) $(PYVERS:%=build-dbg-ext-%)