tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build and install the python module by default

Browse Source
This commit is contained in:
Jean-Francois Dockes
2012-03-24 16:26:56 +01:00
parent 5bcf17a224
commit 1b9cb605f2
14 changed files with 160 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/debian/buildppa.sh
+3 -3
View File
@@ -5,7 +5,7 @@
# sudo apt-get install pkg-kde-tools cdbs
RCLVERS=1.17.0
PPAVERS=1
PPAVERS=0
case $RCLVERS in
[23]*) PPANAME=recollexp-ppa;;
@@ -18,7 +18,7 @@ debdir=debianrclqt4
series4="lucid maverick natty oneiric precise"
rm -rf recoll-${RCLVERS}/debian
cp -rp $debdir recoll-${RCLVERS}/debian
cp -rp ${debdir}/ recoll-${RCLVERS}/debian
for series in $series4 ; do
if test -f $debdir/control-$series ; then
@@ -42,7 +42,7 @@ seriesk=""
debdir=debiankio
rm -rf recoll-${RCLVERS}/debian
cp -rp $debdir recoll-${RCLVERS}/debian
cp -rp ${debdir}/ recoll-${RCLVERS}/debian
for series in $seriesk ; do
sed -e s/SERIES/$series/g < ${debdir}/changelog > \
recoll-${RCLVERS}/debian/changelog ;
packaging/debian/debianrclqt4/control
+6 -4
View File
@@ -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
packaging/debian/debianrclqt4/control-lucid
+5 -3
View File
@@ -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
packaging/debian/debianrclqt4/patches/fix-python-install.patch
+12
View File
@@ -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})
packaging/debian/debianrclqt4/patches/series
+1
View File
@@ -0,0 +1 @@
fix-python-install.patch
packaging/debian/debianrclqt4/rules
+6 -4
View File
@@ -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
packaging/rpm/recoll.spec
+2 -1
View File
@@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
# libxapian-devel or xapian-core-devel?
BuildRequires: libqt4-devel zlib-devel xapian-core-devel libuuid-devel
BuildRequires: libqt4-devel zlib-devel libxapian-devel libuuid-devel python-devel
%description
Recoll is a personal full text search package for Linux, FreeBSD and
@@ -51,6 +51,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/*
%{python_sitearch}/
%{_datadir}/%{name}
%{_datadir}/applications/recoll-searchgui.desktop
%{_datadir}/icons/hicolor/48x48/apps/recoll.png