[Python-modules-commits] r29724 - in packages/python-llfuse/trunk/debian (7 files)

Fri Jul 11 05:37:24 UTC 2014

Date: Friday, July 11, 2014 @ 05:37:23
  Author: nikratio-guest
Revision: 29724

Switched package build system to pybuild.

Modified:
  packages/python-llfuse/trunk/debian/changelog
  packages/python-llfuse/trunk/debian/control
  packages/python-llfuse/trunk/debian/rules
Deleted:
  packages/python-llfuse/trunk/debian/python-llfuse-dbg.links
  packages/python-llfuse/trunk/debian/python-llfuse.install
  packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links
  packages/python-llfuse/trunk/debian/python3-llfuse.install

Modified: packages/python-llfuse/trunk/debian/changelog
===================================================================

--- packages/python-llfuse/trunk/debian/changelog	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/changelog	2014-07-11 05:37:23 UTC (rev 29724)
@@ -2,6 +2,7 @@
 
   * Updated watch file to use pypi, and validate pgp signature.
   * Remove minified javascript files from upstream source.
+  * Switched package build system to pybuild.
 
  -- Nikolaus Rath <Nikolaus at rath.org>  Thu, 10 Jul 2014 21:34:34 -0700
 

Modified: packages/python-llfuse/trunk/debian/control
===================================================================
--- packages/python-llfuse/trunk/debian/control	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/control	2014-07-11 05:37:23 UTC (rev 29724)
@@ -6,6 +6,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Maintainer: Nikolaus Rath <Nikolaus at rath.org>
 Build-Depends: debhelper (>= 9),
+               dh-python,
                libfuse-dev (>= 2.8.0),
                libattr1-dev,
                python-all-dev (>= 2.6.6-3~),
@@ -16,7 +17,7 @@
                pkg-config,
                python-distribute,
                python3-setuptools,
-               cython (>= 0.16)
+               cython (>= 0.16),
 Standards-Version: 3.9.5
 Homepage: http://code.google.com/p/python-llfuse/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-llfuse/trunk/

Deleted: packages/python-llfuse/trunk/debian/python-llfuse-dbg.links
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse-dbg.links	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/python-llfuse-dbg.links	2014-07-11 05:37:23 UTC (rev 29724)
@@ -1 +0,0 @@
-/usr/share/doc/python-llfuse /usr/share/doc/python-llfuse-dbg

Deleted: packages/python-llfuse/trunk/debian/python-llfuse.install
===================================================================
--- packages/python-llfuse/trunk/debian/python-llfuse.install	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/python-llfuse.install	2014-07-11 05:37:23 UTC (rev 29724)
@@ -1 +0,0 @@
-usr/lib/python2*

Deleted: packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links
===================================================================
--- packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/python3-llfuse-dbg.links	2014-07-11 05:37:23 UTC (rev 29724)
@@ -1 +0,0 @@
-/usr/share/doc/python3-llfuse /usr/share/doc/python3-llfuse-dbg

Deleted: packages/python-llfuse/trunk/debian/python3-llfuse.install
===================================================================
--- packages/python-llfuse/trunk/debian/python3-llfuse.install	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/python3-llfuse.install	2014-07-11 05:37:23 UTC (rev 29724)
@@ -1 +0,0 @@
-usr/lib/python3*

Modified: packages/python-llfuse/trunk/debian/rules
===================================================================
--- packages/python-llfuse/trunk/debian/rules	2014-07-11 05:36:07 UTC (rev 29723)
+++ packages/python-llfuse/trunk/debian/rules	2014-07-11 05:37:23 UTC (rev 29724)
@@ -1,21 +1,17 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export PYBUILD_NAME=llfuse
+#export PYBUILD_BEFORE_BUILD="python setup.py build_cython"
+#export PYTHON_BEFORE_
 
-PYVERS=$(shell pyversions -vr) $(shell py3versions -vr) 
-
 %:
-	dh $@ --with python2,python3,sphinxdoc
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build: build-stamp
+override_dh_auto_build: build_cython build_sphinx
+	dh_auto_build
 
-build-stamp: build_cython \
-	     $(PYVERS:%=build-python%-dbg) \
-	     $(PYVERS:%=build-python%) \
-             build_sphinx 
-	touch $@
-
 build_cython:
 	dh_testdir
 	python setup.py build_cython
@@ -27,71 +23,19 @@
 	python setup.py build_sphinx
 	touch $@
 
-override_dh_compress:
-	dh_compress -X.inv
-
-build-python%: 
-	dh_testdir
-	python$* setup.py build -g
-	touch $@
-
-update_intersphinx:
-	wget http://docs.python.org/3/objects.inv -O debian/python.inv
-
-override_dh_auto_install: build install-prereq\
-	 $(PYVERS:%=install-python%-dbg) \
-         $(PYVERS:%=install-python%)
-
-install-prereq:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-install-python%: 
-	python$* setup.py install --force --root=debian/tmp \
-                                  --no-compile -O0 --install-layout=deb
-
-override_dh_link:
-	rm -rf debian/python-llfuse-dbg/usr/share/doc/python-llfuse-dbg
-	rm -rf debian/python3-llfuse-dbg/usr/share/doc/python3-llfuse-dbg
-	dh_link
-
-# We don't want to call setup.py clean, because this
-# requires a number of (potentially uninstalled) build-dependencies.
 override_dh_auto_clean:
-	rm -rf build-python* build_cython build_sphinx build-stamp \
-	       src/llfuse.c
+	# Remove documentation and cython output
+	rm -rf build_cython build_sphinx src/llfuse/capi_*.c doc/
 	find \( \( -name '*.egg-info' -type d \) \
 	     -o \( -name __pycache__  -type d \) \
 	     -o \( -name '*.so' -type f \) \
 	     -o \( -name '*.pyc' -type f \) \
 	     \) -prune -exec rm -rf '{}' +
+	dh_auto_clean
 
-override_dh_strip:
-	dh_strip -ppython-llfuse --dbg-package=python-llfuse-dbg
-	dh_strip -ppython3-llfuse --dbg-package=python3-llfuse-dbg
+update_intersphinx:
+	wget http://docs.python.org/3/objects.inv -O debian/python.inv
 
-override_dh_install:
-	dh_install
-
-        # Install debugging extension and remove from regular package
-	(cd debian/python-llfuse; \
-            find . -name "*_d.so" -printf "%P\0" -delete) \
-            | xargs -0 dh_install --autodest -ppython-llfuse-dbg
-
-	(cd debian/python3-llfuse; \
-            find . -regextype posix-egrep -regex ".+-[a-z0-9]*d[a-z]*.so" \
-                -printf "%P\0" -delete) \
-	    | xargs -0 dh_install --autodest -ppython3-llfuse-dbg
-
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647233
-# (python-llfuse has same problem)
-override_dh_sphinxdoc:
-ifneq "$(shell dh_listpackages | grep -- -doc)" ""
-	dh_sphinxdoc
-endif
-
 .PHONY: get-orig-source
 get-orig-source:
 	uscan --rename --destdir=$(CURDIR) --repack --force-download \


