diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 1766cd84..17c1f1e4 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,5 +1,5 @@ -recoll (3153-1.1) experimental; urgency=low - +recoll (1.20.0-1.1) raring; urgency=low + * local package testing new release build -- Jean-Francois Dockes Sun, 30 Dec 2012 12:29:46 +0530 diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index eb6c23fc..129b2ba5 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -10,8 +10,9 @@ Build-Depends: autotools-dev, libx11-dev, libxapian-dev (>= 1.0.15), libz-dev, - python-all-dev (>= 2.6.6-3~) -Standards-Version: 3.9.3 + python-all-dev (>= 2.6.6-3~), + python3-all-dev, +Standards-Version: 3.9.4 X-Python-Version: >= 2.7 Homepage: http://www.lesbonscomptes.com/recoll Vcs-Git: git://anonscm.debian.org/collab-maint/recoll.git @@ -57,7 +58,7 @@ Description: Personal full text search package with a Qt GUI Package: python-recoll Architecture: any Section: python -Depends: recoll (>= ${source:Version}), +Depends: recoll (= ${binary:Version}), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} @@ -67,3 +68,17 @@ Description: Python extension for recoll . This package provides Python extension module for recoll which can be use to extend recoll such as an Ubuntu Unity Lens. + +Package: python3-recoll +Architecture: any +Section: python +Depends: recoll (= ${binary:Version}), + ${misc:Depends}, + ${python3:Depends}, + ${shlibs:Depends} +Description: Python extension for recoll + Personal full text search package which is based on a very strong backend + (Xapian), for which it provides an easy to use and feature-rich interface. + . + This package provides Python extension module for recoll which can be use to + extend recoll such as an Ubuntu Unity Lens. diff --git a/packaging/debian/debian/python-recoll.install b/packaging/debian/debian/python-recoll.install index ca40d507..ae42f11b 100644 --- a/packaging/debian/debian/python-recoll.install +++ b/packaging/debian/debian/python-recoll.install @@ -1,2 +1,2 @@ -usr/lib/python*/*-packages/*.egg-info -usr/lib/python*/*-packages/recoll/* +usr/lib/python2*/*-packages/*.egg-info +usr/lib/python2*/*-packages/recoll/* diff --git a/packaging/debian/debian/python3-recoll.install b/packaging/debian/debian/python3-recoll.install new file mode 100644 index 00000000..b0bb287d --- /dev/null +++ b/packaging/debian/debian/python3-recoll.install @@ -0,0 +1,2 @@ +usr/lib/python3*/*-packages/*.egg-info +usr/lib/python3*/*-packages/recoll/* diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index ea4a247a..64b39b6b 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -33,7 +33,7 @@ build-arch: build-stamp build-indep: build-stamp build-stamp: config.status dh_testdir - $(MAKE) + $(MAKE) -j 5 touch $@ clean: @@ -53,6 +53,9 @@ install: (cd python/recoll; python setup.py install \ --install-layout=deb \ --prefix=$(CURDIR)/debian/tmp/usr ) + (cd python/recoll; python3 setup.py install \ + --install-layout=deb \ + --prefix=$(CURDIR)/debian/tmp/usr ) binary-arch: build install dh_testdir @@ -63,7 +66,8 @@ binary-arch: build install dh_installman dh_install --sourcedir=debian/tmp dh_makeshlibs - dh_python2 + dh_python2 -p python-recoll + dh_python3 -p python3-recoll dh_link dh_strip dh_compress diff --git a/src/Makefile.in b/src/Makefile.in index e50b3292..e608f3fe 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -42,9 +42,9 @@ clean: ${MAKE} -C common clean ${MAKE} -C index clean ${MAKE} -C internfile clean - ${MAKE} -C lib clean ${MAKE} -C query clean ${MAKE} -C utils clean + -${MAKE} -C lib clean -${MAKE} -C desktop/unity-lens-recoll clean -${MAKE} -C python/recoll clean @NOQTMAKE@@-${MAKE} -C $(QTGUI) clean diff --git a/src/mk/manifest.txt b/src/mk/manifest.txt index 299f36eb..8404afe7 100644 --- a/src/mk/manifest.txt +++ b/src/mk/manifest.txt @@ -46,6 +46,7 @@ common/textsplit.cpp common/textsplit.h common/unacpp.cpp common/unacpp.h +common/unordered_defs.h common/uproplist.h configure configure.ac @@ -83,6 +84,29 @@ desktop/unity-lens-recoll/py-compile desktop/unity-lens-recoll/recollscope/ desktop/unity-lens-recoll/recollscope/__init__.py desktop/unity-lens-recoll/recollscope/rclsearch.py +desktop/unity-scope-recoll/ +desktop/unity-scope-recoll/COPYING +desktop/unity-scope-recoll/MANIFEST.in +desktop/unity-scope-recoll/README +desktop/unity-scope-recoll/__init__.py +desktop/unity-scope-recoll/debian/ +desktop/unity-scope-recoll/debian/changelog +desktop/unity-scope-recoll/debian/compat +desktop/unity-scope-recoll/debian/control +desktop/unity-scope-recoll/debian/copyright +desktop/unity-scope-recoll/debian/rules +desktop/unity-scope-recoll/debian/source/ +desktop/unity-scope-recoll/debian/source/format +desktop/unity-scope-recoll/debian/watch +desktop/unity-scope-recoll/recoll.scope +desktop/unity-scope-recoll/scratch.txt +desktop/unity-scope-recoll/service-recoll.svg +desktop/unity-scope-recoll/setup.py +desktop/unity-scope-recoll/unity-scope-recoll.application.in +desktop/unity-scope-recoll/unity-scope-recoll.desktop +desktop/unity-scope-recoll/unity-scope-recoll.png +desktop/unity-scope-recoll/unity-scope-recoll.service +desktop/unity-scope-recoll/unity_recoll_daemon.py desktop/xdg-utils-1.0.1/ desktop/xdg-utils-1.0.1/LICENSE desktop/xdg-utils-1.0.1/scripts/ @@ -213,6 +237,8 @@ index/subtreelist.h internfile/ internfile/Filter.h internfile/Makefile +internfile/extrameta.cpp +internfile/extrameta.h internfile/htmlparse.cpp internfile/htmlparse.h internfile/indextext.h @@ -260,11 +286,11 @@ kde/kioslave/kio_recoll/recoll.protocol kde/kioslave/kio_recoll/recollf.protocol kde/kioslave/kio_recoll/recollnolist.protocol lib/ -lib/Makefile -lib/mkMake +lib/mkMake.in makestaticdist.sh mk/ mk/AIX +mk/CYGWIN mk/Darwin mk/Default mk/FreeBSD diff --git a/src/python/recoll/Makefile b/src/python/recoll/Makefile index 89168f7e..2e1ccced 100644 --- a/src/python/recoll/Makefile +++ b/src/python/recoll/Makefile @@ -4,7 +4,8 @@ all: install: sudo python setup.py install clean: - rm -rf build + rm -rf build rm -f recoll/__init__.pyc + rm -rf recoll/__pycache__ distclean: clean - rm -f setup.py + rm -f setup.py