Build and install the python module by default

2012-03-24 16:26:56 +01:00
parent 5bcf17a224
commit 1b9cb605f2
14 changed files with 160 additions and 44 deletions
@@ -5,17 +5,19 @@ Maintainer: Jean-Francois Dockes <jf@dockes.org>
 Build-Depends: debhelper (>= 7), 
 	       autotools-dev,
 	       libqt4-dev,
-	       libqtwebkit-dev,
+               libqtwebkit-dev,
 	       libxapian-dev (>= 1.0.15),
 	       libx11-dev,
-	       libz-dev
+	       libz-dev,
+               python-dev,
+               quilt
 Standards-Version: 3.8.3

 Package: recoll
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: aspell, python
-Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen, xsltproc
+Recommends: aspell, python, xsltproc
+Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen
 Description: a personal full text search package with a QT GUI
 The Recoll personal full text search package is based on a very strong 
 backend (Xapian), for which it provides an easy to use and feature-rich 
@@ -7,14 +7,16 @@ Build-Depends: debhelper (>= 7),
 	       libqt4-dev,
 	       libxapian-dev (>= 1.0.15),
 	       libx11-dev,
-	       libz-dev
+	       libz-dev,
+               python-dev,
+               quilt
 Standards-Version: 3.8.3

 Package: recoll
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: aspell, python
-Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen, xsltproc
+Recommends: aspell, python, xsltproc
+Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen
 Description: a personal full text search package with a QT GUI
 The Recoll personal full text search package is based on a very strong 
 backend (Xapian), for which it provides an easy to use and feature-rich 
@@ -0,0 +1,12 @@
+setup.py --root and --user options interfer with debian wanting a dist-packages, 
+not site-packages installation for python modules
+--- a/recollinstall.in
+++ b/recollinstall.in
+@@ -139,5 +139,4 @@
+     ${datadir}/recoll/translations/recoll_zh.qm || exit 1
+ 
+ 
+-@NOPYTHON@(cd python/recoll;python setup.py install \
+-    --prefix=${REALPREFIX} ${ROOTFORPYTHON})
+#@NOPYTHON@(cd python/recoll;python setup.py install \
+#    --prefix=${REALPREFIX} ${ROOTFORPYTHON})
@@ -0,0 +1 @@
+fix-python-install.patch
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f

+include /usr/share/quilt/quilt.make 
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

@@ -7,7 +9,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

 CFLAGS = -Wall -g
-LDFLAGS = -Wl,-z,defs
+#LDFLAGS = -Wl,-z,defs

 #build qt4 UI only
 export QMAKE=qmake-qt4
@@ -27,12 +29,12 @@ config.status: configure
 		    --prefix=/usr

 build: build-stamp
-build-stamp: config.status
+build-stamp: $(QUILT_STAMPFN) config.status
 	dh_testdir
 	$(MAKE)
 	touch $@

-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config.log
@@ -44,8 +46,8 @@ install:
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
 	$(MAKE) prefix=$(CURDIR)/debian/recoll/usr install
+	(cd python/recoll;python setup.py install --install-layout=deb --root=$(CURDIR)/debian/recoll/ )

 binary-arch: build install
 	dh_testdir