summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsesse <sesse@alioth.debian.org>2006-01-05 14:59:17 +0000
committersesse <sesse@alioth.debian.org>2006-01-05 14:59:17 +0000
commit608162f84594e52871e8fee5355ae9b34436c4ac (patch)
tree82bd08bead9e811898e4c77ce4c15cbadafdf40b
parent2df1446053029d5cb0a3c20e44d12d22c305f358 (diff)
downloadsamba-608162f84594e52871e8fee5355ae9b34436c4ac.tar.gz
Updated debian/copyright.
* Added Samba copyright holders. * Noted that talloc, ldb and tdb are under the LGPL. * Added copyright holders and licensing for the packaging itself. git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba4@878 fc4039ab-9d04-0410-8cac-899223bdd6b0
-rw-r--r--changelog7
-rw-r--r--copyright34
2 files changed, 38 insertions, 3 deletions
diff --git a/changelog b/changelog
index 1f9ef7adf9..1732fb18b3 100644
--- a/changelog
+++ b/changelog
@@ -43,6 +43,11 @@ samba (3.9.0+SVN12692-1) UNRELEASED; urgency=low
* Updated README.Debian to show the user how to change the password.
* Make samba recommend ldb-tools.
+ * Updated debian/copyright.
+ * Added Samba copyright holders.
+ * Noted that talloc, ldb and tdb are under the LGPL.
+ * Added copyright holders and licensing for the packaging itself.
+
* Remove a few unused files in the packaging.
* Change debhelper compatibility level to 5.
* Don't give --pidfile to start-stop-daemon when stopping -- current
@@ -51,7 +56,7 @@ samba (3.9.0+SVN12692-1) UNRELEASED; urgency=low
* Rewritten README.building, to reflect the magic that has to be done
with the package in another repository.
- -- Steinar H. Gunderson <sesse@debian.org> Wed, 4 Jan 2006 18:00:38 +0100
+ -- Steinar H. Gunderson <sesse@debian.org> Thu, 5 Jan 2006 15:25:12 +0100
samba (3.9.0+SVN12395-1) unstable; urgency=low
diff --git a/copyright b/copyright
index a3bdd95d7c..9fdf81be2c 100644
--- a/copyright
+++ b/copyright
@@ -3,7 +3,10 @@ Thu, 13 May 2004 01:38:41 +0200.
It was downloaded from ftp://ftp.samba.org/
-Copyright:
+Copyright for Samba itself:
+
+ Copyright Andrew Tridgell and the Samba Team 1992-2006
+ Heimdal Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,5 +21,32 @@ Copyright:
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Copyright for talloc, ldb and tdb:
+
+ Copyright Andrew Tridgell and the Samba Team 1992-2006
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Copyright for the Debian packaging:
+
+ Copyright Jelmer Vernooij 2005
+ Copyright Steinar H. Gunderson 2005-2006
+
+ The Debian packaging is licensed under the GNU LGPL, version 2.1.
+
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL',
+and the complete text of the GNU Lesser General Public License can
+be found in `/usr/share/common-licenses/LGPL'.