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

small release 1.15.0 doc and packaging fixups

Browse Source
This commit is contained in:
Jean-Francois Dockes
2011-02-02 14:21:56 +01:00
parent ded0af4231
commit e39a21654b
39 changed files with 1880 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/debian/buildppa.sh
+25 -13
View File
@@ -4,27 +4,39 @@
# For the kio: (and kdesdk?)
# sudo apt-get install pkg-kde-tools cdbs
RCLVERS=1.14.3
RCLVERS=1.15.0
PPAVERS=1
########## QT3
series3=""
series3="dapper hardy"
case $RCLVERS in
1.14*)
series3="dapper hardy";;
esac
if test X$series3 != X; then
debdir=debianrclqt3
debdir=debianrclqt3
rm -rf recoll-${RCLVERS}/debian
cp -rp $debdir recoll-${RCLVERS}/debian
for series in $series3;do
sed -e s/SERIES/$series/g < ${debdir}/changelog > \
recoll-${RCLVERS}/debian/changelog ;
(cd recoll-${RCLVERS};debuild -S -sa) || break
dput recoll-ppa recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
done
rm -rf recoll-${RCLVERS}/debian
cp -rp $debdir recoll-${RCLVERS}/debian
for series in $series3;do
sed -e s/SERIES/$series/g < ${debdir}/changelog > \
recoll-${RCLVERS}/debian/changelog ;
(cd recoll-${RCLVERS};debuild -S -sa) || break
dput recoll-ppa recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
done
fi
####### QT4
series4=""
series4="jaunty karmic lucid maverick"
case $RCLVERS in
1.14*)
series4="jaunty karmic lucid maverick natty";;
*)
# jaunty had qt 4.3 1.15+ needs at least 4.4
series4="karmic lucid maverick natty";;
esac
debdir=debianrclqt4
rm -rf recoll-${RCLVERS}/debian
packaging/debian/debiankio/changelog
+6
View File
@@ -1,3 +1,9 @@
kio-recoll (1.15.0-0~ppa1~SERIES1) SERIES; urgency=low
* Update to recoll version 1.15.0
-- Jean-Francois Dockes <jf@dockes.org> Wed, 02 Feb 2011 09:48:00 +0200
kio-recoll (1.14.3-0~ppa1~SERIES1) SERIES; urgency=low
* Update to recoll version 1.14.3
packaging/debian/debianrclqt4/changelog
+4
View File
@@ -1,3 +1,7 @@
recoll (1.15.0-0~ppa1~SERIES1) SERIES; urgency=low
* Updated package to recoll version 1.15.0
-- Jean-Francois Dockes <jf@dockes.org> Wed, 02 Feb 2011 09:48:00 +0200
recoll (1.14.3-0~ppa1~SERIES1) SERIES; urgency=low
* Update to release 1.14.3
-- Jean-Francois Dockes <jf@dockes.org> Thu, 25 Nov 2010 10:25:00 +0200
packaging/rpm/recoll.spec
+4 -2
View File
@@ -1,6 +1,6 @@
%define name recoll
%define version 1.14.3
%define release 1
%define version 1.15.0
%define release 0
Name: %{name}
Version: %{version}
@@ -62,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT
# ---------------------------------------------------------------------------
%changelog
* Thu Feb 2 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.0-0
- Update to release 1.15.0
* Thu Oct 28 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.3-1
- Update to release 1.14.3
* Thu Oct 28 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.2-1
packaging/rpm/recollfedora10+.spec
+4 -4
View File
@@ -1,12 +1,12 @@
Name: recoll
Version: 1.14.2
Version: 1.15.0
Release: 1%{?dist}
Summary: Desktop full text search tool with a qt gui
Group: Applications/Databases
License: GPLv2
URL: http://www.recoll.org/
Source0: http://www.recoll.org/recoll-1.14.2.tar.gz
Source0: http://www.recoll.org/recoll-1.15.0.tar.gz
BuildRequires: qt-devel xapian-core-devel zlib-devel desktop-file-utils
@@ -50,8 +50,8 @@ rm -rf %{buildroot}
%doc
%changelog
* Sat Sep 24 2010 J.F. Dockes <jfd@recoll.org> 1.14.2-1
- updated to release 1.14.2
* Wed Feb 02 2011 J.F. Dockes <jfd@recoll.org> 1.15.0-1
- updated to release 1.15.0
* Mon Sep 13 2010 J.F. Dockes <jfd@recoll.org> 1.14.0-1
- updated to release 1.14.0
* Sun May 9 2010 J.F. Dockes <jfd@recoll.org> 1.13.04-2
packaging/rpm/recollmdk.spec
+5 -4
View File
@@ -1,5 +1,5 @@
%define name recoll
%define version 1.14.3
%define version 1.15.0
%define release %mkrel 1
Name: %{name}
@@ -13,8 +13,7 @@ Group: Applications/Databases
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
# We build with a static link to xapian to avoid this dependency
#Requires: xapian-core
Requires: xapian-core
%description
Recoll is a personal full text search package for Linux, FreeBSD and
@@ -32,7 +31,7 @@ interface.
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/60qt4.sh
%configure
make %{?_smp_mflags} static
make %{?_smp_mflags}
# ---------------------------------------------------------------------------
@@ -60,6 +59,8 @@ rm -rf $RPM_BUILD_ROOT
# ---------------------------------------------------------------------------
%changelog
* Wed Feb 02 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.0-1
- Update to release 1.15.0
* Thu Nov 25 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.3-1
- Update to release 1.14.2
* Sat Sep 24 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.2-1