From 5446b0cf54d53be2eea6d424ef97bfba3d3b5d35 Mon Sep 17 00:00:00 2001 From: dockes Date: Tue, 16 Jan 2007 09:22:34 +0000 Subject: [PATCH] 2007-01-12 comments --- packaging/debian/changelog | 2 +- packaging/debian/control | 2 +- packaging/debian/copyright | 83 ++++++++++++++++++++++++++++++++++++++ packaging/debian/manpages | 3 -- packaging/debian/rules | 34 +++------------- 5 files changed, 91 insertions(+), 33 deletions(-) delete mode 100644 packaging/debian/manpages diff --git a/packaging/debian/changelog b/packaging/debian/changelog index d782598b..bcd75274 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,4 +1,4 @@ -recoll (1.7.4-1) unstable; urgency=low +recoll (1.7.5-1) feisty; urgency=low * Initial release diff --git a/packaging/debian/control b/packaging/debian/control index dd042bcc..1d539459 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -2,7 +2,7 @@ Source: recoll Section: x11 Priority: optional Maintainer: Jean-Francois Dockes -Build-Depends: debhelper (>= 5), autotools-dev, libqt3-mt-dev, qt3-dev-tools, libqt3-headers, libxapian-dev +Build-Depends: debhelper (>= 5), libqt3-mt-dev, qt3-dev-tools, libqt3-headers, libxapian-dev Standards-Version: 3.7.2 Package: recoll diff --git a/packaging/debian/copyright b/packaging/debian/copyright index 2c469ca8..00265702 100644 --- a/packaging/debian/copyright +++ b/packaging/debian/copyright @@ -28,3 +28,86 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2007, Jean-Francois Dockes and is licensed under the GPL, see above. + +Portions of the software are: + +Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL: +/* This file is part of The New Aspell + * Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL + * license version 2.0 or 2.1. You should have received a copy of the + * LGPL license along with this library if you did not you can find it + * at http://www.gnu.org/. + +On Debian systems, the complete text of the GNU LGPL +can be found in `/usr/share/common-licenses/LGPL-2'. + + +Copyright 2002-2005 Andreas Aardal Hanssen +Copyright (C) 2000-2004 Mikio Hirabayashi +Copyright 1999,2000,2001 BrightStation PLC +Copyright 2001 Ananova Ltd +Copyright 2002 Olly Betts +Copyright (C) 2000, 2001, 2002 Loic Dachary + - GPL V2 or later, same license text as above + +Copyright (c) 1991-2004 Unicode, Inc. + + COPYRIGHT AND PERMISSION NOTICE + + Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under + the Terms of Use in http://www.unicode.org/copyright.html. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of the Unicode data files and any associated documentation (the "Data + Files") or Unicode software and any associated documentation (the + "Software") to deal in the Data Files or Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, and/or sell copies of the Data Files or Software, and + to permit persons to whom the Data Files or Software are furnished to do + so, provided that (a) the above copyright notice(s) and this permission + notice appear with all copies of the Data Files or Software, (b) both the + above copyright notice(s) and this permission notice appear in associated + documentation, and (c) there is clear notice in each modified Data File or + in the Software as well as in the documentation associated with the Data + File(s) or Software that the data or software has been modified. + + THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR + CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THE DATA FILES OR SOFTWARE. + + Except as contained in this notice, the name of a copyright holder shall + not be used in advertising or otherwise to promote the sale, use or other + dealings in these Data Files or Software without prior written + authorization of the copyright holder. + +Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All +/* + * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm + * + * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + * rights reserved. + * + * License to copy and use this software is granted provided that it + * is identified as the "RSA Data Security, Inc. MD5 Message-Digest + * Algorithm" in all material mentioning or referencing this software + * or this function. + * + * License is also granted to make and use derivative works provided + * that such works are identified as "derived from the RSA Data + * Security, Inc. MD5 Message-Digest Algorithm" in all material + * mentioning or referencing the derived work. + * + * RSA Data Security, Inc. makes no representations concerning either + * the merchantability of this software or the suitability of this + * software for any particular purpose. It is provided "as is" + * without express or implied warranty of any kind. + * + * These notices must be retained in any copies of any part of this + * documentation and/or software. + */ diff --git a/packaging/debian/manpages b/packaging/debian/manpages deleted file mode 100644 index 12e7a4b9..00000000 --- a/packaging/debian/manpages +++ /dev/null @@ -1,3 +0,0 @@ -doc/man/recoll.1 -doc/man/recoll.conf.5 -doc/man/recollindex.1 diff --git a/packaging/debian/rules b/packaging/debian/rules index b3e6c8e8..5f7d6824 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -37,41 +37,22 @@ config.status: configure #Architecture -build: build-arch build-indep +build: build-arch build-arch: build-arch-stamp build-arch-stamp: config.status - $(MAKE) static - touch $@ - -build-indep: build-indep-stamp -build-indep-stamp: config.status + $(MAKE) touch $@ clean: dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# - + rm -f build-arch-stamp #CONFIGURE-STAMP# # Add here commands to clean up after the build process. -$(MAKE) distclean -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - dh_clean -install: install-indep install-arch -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - dh_install -i +install: install-arch install-arch: dh_testdir @@ -101,13 +82,10 @@ binary-common: dh_gencontrol dh_md5sums dh_builddeb -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common # Build architecture dependant packages using the common target. binary-arch: build-arch install-arch $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch +binary: binary-arch +.PHONY: build clean binary-arch binary install install-arch