diff --git a/src/desktop/unity-scope-recoll/debian/changelog b/src/desktop/unity-scope-recoll/debian/changelog index a30299c6..ddf22a41 100644 --- a/src/desktop/unity-scope-recoll/debian/changelog +++ b/src/desktop/unity-scope-recoll/debian/changelog @@ -1,4 +1,4 @@ -unity-scope-recoll (0.1) saucy; urgency=low +unity-scope-recoll (1.20.0.3506) saucy; urgency=low * Initial port of the recoll lens to the new Dash -- Jean-Francois Dockes Wed, 06 Nov 2013 15:23:00 +0200 diff --git a/src/desktop/unity-scope-recoll/debian/control b/src/desktop/unity-scope-recoll/debian/control index 956e85ab..25cd7e24 100644 --- a/src/desktop/unity-scope-recoll/debian/control +++ b/src/desktop/unity-scope-recoll/debian/control @@ -1,17 +1,16 @@ -Source: unity-scope-gdrive +Source: unity-scope-recoll Section: gnome Priority: extra Maintainer: Ubuntu Developers Build-Depends: debhelper (>= 9), - libaccounts-glib-dev, pkg-config, python3, - python3-distutils-extra, - python3-nose, +# python3-distutils-extra, +# python3-nose, python3-gi, gir1.2-glib-2.0, gir1.2-unity-5.0 (>= 7.0), -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: https://launchpad.net/unity-scope-recoll Package: unity-scope-recoll @@ -25,7 +24,7 @@ Depends: ${misc:Depends}, unity-scopes-runner, gir1.2-glib-2.0, recoll, - python-recoll + python3-recoll Description: Recoll scope for Unity Unity scope for Recoll diff --git a/src/desktop/unity-scope-recoll/debian/rules b/src/desktop/unity-scope-recoll/debian/rules index 1c431f2c..99279631 100755 --- a/src/desktop/unity-scope-recoll/debian/rules +++ b/src/desktop/unity-scope-recoll/debian/rules @@ -13,9 +13,6 @@ override_dh_auto_clean: override_dh_auto_build: python3 setup.py build -override_dh_auto_test: - nosetests3 - override_dh_auto_install: python3 setup.py install --root=$(CURDIR)/debian/unity-scope-recoll --install-layout=deb diff --git a/src/desktop/unity-scope-recoll/debian/watch b/src/desktop/unity-scope-recoll/debian/watch index 86d1446b..c25bda15 100644 --- a/src/desktop/unity-scope-recoll/debian/watch +++ b/src/desktop/unity-scope-recoll/debian/watch @@ -1,2 +1,2 @@ version=3 -http://www.recoll.org/unity-scope-recoll-([0-9.]+)\.tar\.gz +http://www.recoll.org/recoll-([0-9.]+)\.tar\.gz diff --git a/src/desktop/unity-scope-recoll/excludefile b/src/desktop/unity-scope-recoll/excludefile new file mode 100644 index 00000000..499bbd5d --- /dev/null +++ b/src/desktop/unity-scope-recoll/excludefile @@ -0,0 +1,4 @@ +mkdist.sh +debian +autom4te.cache +excludefile diff --git a/src/desktop/unity-scope-recoll/mkdist.sh b/src/desktop/unity-scope-recoll/mkdist.sh new file mode 100644 index 00000000..227101c7 --- /dev/null +++ b/src/desktop/unity-scope-recoll/mkdist.sh @@ -0,0 +1,53 @@ +#!/bin/sh + +fatal() { + echo $* + exit 1 +} +usage() { + echo 'Usage: mkdist.sh ' + exit 1 +} + +VCCMD=hg +TAR=/usr/bin/tar +TAR=tar + +VRECOLL=`cat ../../VERSION` +VLENS=`hg tip | egrep ^changeset: | awk '{print $2}' | awk -F: '{print $1}'` +VERSION=${VRECOLL}.${VLENS} +echo $VERSION + +targetdir=${targetdir-/tmp} + +checkmodified=${checkmodified-yes} + +#editedfiles=`$VCCMD status . | egrep -v '^\?'` +if test "$checkmodified" = "yes" -a ! -z "$editedfiles"; then + fatal "Edited files exist: " $editedfiles +fi + +releasename=recoll-scope-${VERSION} + +topdir=$targetdir/$releasename +if test ! -d $topdir ; then + mkdir $topdir || exit 1 +else + echo "Removing everything under $topdir Ok ? (y/n)" + read rep + if test $rep = 'y';then + rm -rf $topdir/* + fi +fi + +# Clean up this dir and copy the dist-specific files +#make distclean +yes | clean.O + +$TAR chfX - excludefile . | (cd $topdir;$TAR xf -) + +out=$releasename.tar.gz +(cd $targetdir ; \ + $TAR chf - $releasename | \ + gzip > $out) +echo "$targetdir/$out created"