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

future 1.22 packaging

Browse Source
This commit is contained in:
Jean-Francois Dockes
2015-11-22 09:56:04 +01:00
parent c2183f1363
commit 02ac941cf7
11 changed files with 49 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/debian/debian/changelog
+5 -5
View File
@@ -1,10 +1,10 @@
recoll (1.21.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
recoll (1.22.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* New bison-based query parser.
* Improves filter execution performance
* Save/reload queries
* New build based on autotools
* Synonyms
* Windows port
-- Jean-Francois Dockes <jf@dockes.org> Tue, 16 Jun 2015 18:10:00 +0200
-- Jean-Francois Dockes <jf@dockes.org> Sat, 21 Nov 2015 16:01:00 +0200
recoll (1.20.6-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
packaging/debian/debian/control
+4 -3
View File
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Jean-Francois Dockes <jfd@recoll.org>
Build-Depends: autotools-dev,
debhelper (>= 7),
dh-python,
hardening-wrapper,
bison,
libqt4-dev,
@@ -13,7 +14,7 @@ Build-Depends: autotools-dev,
libz-dev,
python-all-dev (>= 2.6.6-3~),
python3-all-dev,
Standards-Version: 3.9.4
Standards-Version: 3.9.6
X-Python-Version: >= 2.7
Homepage: http://www.lesbonscomptes.com/recoll
Vcs-Git: git://anonscm.debian.org/collab-maint/recoll.git
@@ -21,8 +22,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/recoll.git;a=summa
Package: recoll
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: python-recoll, aspell, python, xdg-utils, xsltproc
Depends: ${misc:Depends}, ${shlibs:Depends}, python2, python
Recommends: python-recoll, aspell, xdg-utils, xsltproc
Suggests: antiword,
catdoc,
ghostscript,
packaging/debian/debian/copyright
+11 -36
View File
@@ -83,42 +83,11 @@ License: LGPL-2+
can be found in `/usr/share/common-licenses/LGPL-2' and
`/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'.
Files: qtgui/q3richtext_p.h
Copyright: 1992-2007, Trolltech ASA. All rights reserved
License:
This file is part of the Qt3Support module of the Qt Toolkit.
.
This file may be used under the terms of the GNU General Public License
version 2.0 as published by the Free Software Foundation and appearing in the
file LICENSE.GPL included in the packaging of this file. Please review the
following information to ensure GNU General Public Licensing requirements will
be met: http://trolltech.com/products/qt/licenses/licensing/opensource/
.
If you are unsure which license is appropriate for your use, please review the
following information:
http://trolltech.com/products/qt/licenses/licensing/licensingoverview
or contact the sales department at sales@trolltech.com.
.
In addition, as a special exception, Trolltech gives you certain additional
rights. These rights are described in the Trolltech GPL Exception version 1.0,
which can be found at http://www.trolltech.com/products/qt/gplexception/
and in the file GPL_EXCEPTION.txt in this package.
.
In addition, as a special exception, Trolltech, as the sole copyright
holder for Qt Designer, grants users of the Qt/Eclipse Integration
plug-in the right for the Qt/Eclipse Integration to link to
functionality provided by Qt Designer and its related libraries.
.
Trolltech reserves all rights not expressly granted herein.
.
Trolltech ASA (c) 2007
.
This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
Files: common/uproplist.h
Copyright: 1991-2006, Unicode, Inc.
License:
License: Unicode
License: Unicode
All rights reserved. Distributed under the Terms of Use in
http://www.unicode.org/copyright.html
.
@@ -153,7 +122,9 @@ License:
Files: utils/md5.*
Copyright: 1991-1992, RSA Data Security, Inc. All rights reserved.
License:
License: RSA
License:RSA
MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
.
License to copy and use this software is granted provided that it is
@@ -176,7 +147,9 @@ License:
Files: desktop/xdg-utils-1.0.1/*
Copyright: 2006, Kevin Krammer <kevin.krammer@gmx.at>,
Jeremy White <jwhite@codeweavers.com>.
License:
License: MIT
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@@ -197,6 +170,8 @@ License:
Files: index/csguess.cpp
Copyright: 2000-2004, Mikio Hirabayashi
License: LGPL-2.1+
License: LGPL-2.1+
This file is part of QDBM, Quick Database Manager.
.
packaging/debian/debian/patches/fix-python-install.patch
-10
View File
@@ -1,10 +0,0 @@
--- a/recollinstall.in
+++ b/recollinstall.in
@@ -149,5 +149,5 @@
${datadir}/recoll/translations/recoll_zh.qm || exit 1
-@NOPYTHON@(cd python/recoll;python setup.py install \
-@NOPYTHON@ --prefix=${REALPREFIX} ${ROOTFORPYTHON} ${OPTSFORPYTHON})
+#@NOPYTHON@(cd python/recoll;python setup.py install \
+#@NOPYTHON@ --prefix=${REALPREFIX} ${ROOTFORPYTHON} ${OPTSFORPYTHON})
packaging/debian/debian/patches/series
-1
View File
@@ -1 +0,0 @@
fix-python-install.patch
packaging/debian/debian/rules
+11 -11
View File
@@ -3,16 +3,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
export DEB_BUILD_HARDENING=1
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
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
#build qt4 UI only
#export QMAKE=qmake-qt4
CFLAGS += -Wall -g
#LDFLAGS += -Wl,-z,defs
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -33,7 +31,7 @@ build-arch: build-stamp
build-indep: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
$(MAKE) -j 5
touch $@
clean:
@@ -48,10 +46,12 @@ install:
dh_testroot
dh_prep
dh_installdirs
$(MAKE) STRIP=ls prefix=$(CURDIR)/debian/tmp/usr install
# Work around recollinstall forgetting the PPT text-extract utility
install -m 0444 filters/msodump.zip $(CURDIR)/debian/tmp/usr/share/recoll/filters
install -m 0555 filters/ppt-dump.py $(CURDIR)/debian/tmp/usr/share/recoll/filters
$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
chmod a+x $(CURDIR)/debian/tmp/usr/share/recoll/examples/rclmon.sh
chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclxslt.py
chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py
chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py
rm -f $(CURDIR)/debian/tmp/usr/lib/recoll/librecoll.la
(cd python/recoll; python setup.py install \
--install-layout=deb \
--prefix=$(CURDIR)/debian/tmp/usr )