The following commit has been merged in the master branch:
commit 54c1fe9788a7f7618abb5c4597c29d9008e0a51b
Author: Ralf Treinen <trei...@free.fr>
Date: Sun Jun 17 20:01:19 2012 +0200
debian/licence: fix order of fields, add connection.h BSD-ish licence
diff --git a/debian/changelog b/debian/changelog
index 5468b37..726fab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,15 @@ dose3 (3.0.1-1) unstable; urgency=low
* New upstream version
* Remove patch manpages-section5 which has been applied by upstream
- * Install upstream's version of apt-cudf-get script an manpage, drop our
+ * Install upstream's version of apt-cudf-get script and manpage, drop our
version in debian/
* Patch manpage-distcheck: some improvements to distcheck manpage.
+ * debian/copyright:
+ - put files paragraph with more general file pattern first
+ - add BSD-ish license for db/sqlite/sqlitext/connection.h
+ (thanks to Ansgar Burchardt for the remark).
- -- Ralf Treinen <trei...@debian.org> Sun, 17 Jun 2012 13:50:36 +0200
+ -- Ralf Treinen <trei...@debian.org> Sun, 17 Jun 2012 19:58:39 +0200
dose3 (2.9.17-1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 7c69c5d..8c9549b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,10 @@ Upstream-Name: dose
Upstream-Contact: Pietro Abate <pietro.ab...@pps.jussieu.fr>
Source: http://gforge.info.ucl.ac.be/projects/mancoosi/
+Files: *
+Copyright: © 2009-2012 Pietro Abate
+License: LGPL-3+
+
Files: deb/format822.ml
Copyright: © 2005-2009 Jérôme Vouillion, Stefano Zacchiroli, Pietro Abate
License: LGPL-3+
@@ -31,9 +35,9 @@ Files: debian/*
Copyright: © 2011, 2012 Ralf Treinen, Stefano Zacchiroli
License: LGPL-3+
-Files: *
-Copyright: © 2009-2012 Pietro Abate
-License: LGPL-3+
+Files: db/sqlite/sqlitext/connection.h
+Copyright: (C) 2004-2006 Gerhard Häring <g...@ghaering.de>
+Licence: connection-licence
License: LGPL-3+
This library is free software: you can redistribute it and/or modify
@@ -46,3 +50,20 @@ License: LGPL-3+
On Debian systems, the complete text of the latest GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
+License: connection-licence
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
--
dose3 packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
