Skip to content

Commit

Permalink
Can't use pybuild / dh_python
Browse files Browse the repository at this point in the history
It's only available on platforms with Python 3.3 or above (Raspbian, and
Ubuntu Precise are stuck on 3.2). So, back to distutils ... Also fixed
up some incorrect target filenames
  • Loading branch information
waveform80 committed Dec 11, 2013
1 parent 88a854e commit d407159
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
12 changes: 5 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,14 @@ PY_SOURCES:=$(shell \
DEB_SOURCES:=debian/changelog \
debian/control \
debian/copyright \
debian/install \
debian/rules \
debian/source/include-binaries \
debian/$(NAME).manpages \
$(wildcard debian/*.desktop)
debian/rules
DOC_SOURCES:=$(wildcard docs/*.rst)

# Calculate the name of all outputs
DIST_EGG=dist/$(NAME)-$(VER)-$(PYVER).egg
DIST_TAR=dist/$(NAME)-$(VER).tar.gz
DIST_ZIP=dist/$(NAME)-$(VER).zip
DIST_DEB=dist/$(NAME)_$(VER)-1~ppa1_all.deb
DIST_DEB=dist/python-$(NAME)_$(VER)-1_armhf.deb dist/python3-$(NAME)_$(VER)-1_armhf.deb dist/python-$(NAME)-docs_$(VER)-1_all.deb


# Default target
Expand Down Expand Up @@ -103,7 +99,9 @@ $(DIST_DEB): $(PY_SOURCES) $(DEB_SOURCES)
rename -f 's/$(NAME)-(.*)\.tar\.gz/$(NAME)_$$1\.orig\.tar\.gz/' ../*
debuild -b -i -I -Idist -Idocs -Ibuild/sphinx/doctrees -rfakeroot
mkdir -p dist/
cp ../$(NAME)_$(VER)-1~ppa1_all.deb dist/
cp ../python-$(NAME)_$(VER)-1_armhf.deb dist/
cp ../python3-$(NAME)_$(VER)-1_armhf.deb dist/
cp ../python-$(NAME)-docs_$(VER)-1_all.deb dist/

release: $(PY_SOURCES) $(DOC_SOURCES)
$(MAKE) clean
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
picamera (0.8-1) stable; urgency=low
picamera (0.8-1) wheezy; urgency=low

* Initial release.

Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Maintainer: Dave Hughes <[email protected]>
Homepage: http://pypi.python.org/pypi/picamera
Section: python
Priority: extra
Build-Depends: debhelper (>= 8), dh-python, python-all (>= 2.7), python-setuptools, python3-all, python3-setuptools, python-docutils, python-sphinx (>= 1.0.7+dfsg-1~)
Build-Depends: debhelper (>= 8), python-all (>= 2.7), python-setuptools, python3-all, python3-setuptools, python-docutils, python-sphinx (>= 1.0.7+dfsg-1~)
Standards-Version: 3.9.3
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.2
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
export PYBUILD_NAME=picamera

%:
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
dh $@ --with python2,python3,sphinxdoc --buildsystem=python_distutils

override_dh_auto_test:
# Don't run the tests!
Expand Down

0 comments on commit d407159

Please sign in to comment.