diff options
author | Nima Talebi <nima@it.net.au> | 2010-01-06 16:06:43 +1100 |
---|---|---|
committer | Nima Talebi <nima@it.net.au> | 2010-01-06 16:19:24 +1100 |
commit | 21b8547681620006fe357d90d15e7f7667dcdb91 (patch) | |
tree | a9331a654b2fb25b2cfe8fee38d666ac302f723b /debian | |
parent | 1b810386b0191cd68209f98b23310ba453e90865 (diff) | |
download | python-dmidecode-21b8547681620006fe357d90d15e7f7667dcdb91.tar.gz python-dmidecode-21b8547681620006fe357d90d15e7f7667dcdb91.tar.xz python-dmidecode-21b8547681620006fe357d90d15e7f7667dcdb91.zip |
Applied patch from Scott Kitterman
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 8 |
3 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 5b45cc1..0464057 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-dmidecode (3.10.9-1) lucid; urgency=low + + * Add --install-layout=deb to debian/rules setup.py install to prevent files + from landing in /usr/local. + + -- Scott Kitterman <scott@kitterman.com> Tue, 05 Jan 2010 22:02:29 -0500 + python-dmidecode (3.10.8-2) unstable; urgency=low * Resolved conflict between standard and debug package (Closes: #561904). diff --git a/debian/control b/debian/control index 93383b0..ba2ea7b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Priority: optional Homepage: http://projects.autonomy.net.au/python-dmidecode Maintainer: Nima Talebi <nima@it.net.au> Build-Depends: debhelper (>> 7), python-support (>= 0.5.3), python, - python-all-dev (>= 2.3.5-11), python-all-dbg, libxml2-dev, python-libxml2 + python-all-dev (>= 2.5.4-2), python-all-dbg, libxml2-dev, python-libxml2 Standards-Version: 3.8.3 Package: python-dmidecode diff --git a/debian/rules b/debian/rules index fca75cb..c33d38d 100755 --- a/debian/rules +++ b/debian/rules @@ -31,10 +31,14 @@ install: install-stamp dh_installman install-stamp: build-stamp $(PYVERS:%=install-ext-%) $(PYVERS:%=install-dbg-ext-%) install-ext-%: - python$* src/setup.py install --root $(CURDIR)/debian/$(PACKAGE) + python$* src/setup.py install \ + --root $(CURDIR)/debian/$(PACKAGE) \ + --install-layout=deb touch $@ install-dbg-ext-%: - python$*-dbg src/setup-dbg.py install --root $(CURDIR)/debian/$(PACKAGE)-dbg + python$*-dbg src/setup-dbg.py install \ + --root $(CURDIR)/debian/$(PACKAGE)-dbg \ + --install-layout=deb #find $(CURDIR)/debian/$(PACKAGE)-dbg/usr/lib/python$*/ ! -type d ! -name '*_d\.so' -delete #find $(CURDIR)/debian/$(PACKAGE)-dbg/usr/lib/python$*/ -depth -empty -delete touch $@ |