[Da-tools-commits] ./da-tools/userdir-ldap-common r371: Merge from alioth

[Peter Palfrader]

------------------------------------------------------------
revno: 371
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:47:02 +0100
message:
  Merge from alioth
  
  Copyright statement from people doing stuff on alioth, and pointer to the alioth repository and discussion list
modified:
  debian/copyright
    ------------------------------------------------------------
    revno: 349.2.15
    committer: Joerg Jaspert <joerg at ganneff.de>
    branch nick: userdir-ldap-common
    timestamp: Fri 2007-12-28 16:05:40 +0100
    message:
      uncommitted 2 changes from me. BAD HACK
    modified:
      debian/copyright
    ------------------------------------------------------------
    revno: 349.2.16
    committer: Joerg Jaspert <joerg at ganneff.de>
    branch nick: userdir-ldap-common
    timestamp: Fri 2007-12-28 16:08:49 +0100
    message:
      Files have copyright statements until 2007 (from Ryan), note that in debian/copyright
      Also note that it is now maintained using bzr, not CVS
    modified:
      debian/copyright
    ------------------------------------------------------------
    revno: 349.2.17
    committer: Joerg Jaspert <joerg at ganneff.de>
    branch nick: userdir-ldap-common
    timestamp: Fri 2007-12-28 16:09:39 +0100
    message:
      Add a little pointer to our repository, also mention that for changes we do the copyright
      is ours. Now, to make it easy I just pointed to "da-tools project members, -discuss list",
      instead of listing every committer. License, of course, same as for "upstream".
    modified:
      debian/copyright
-------------- next part --------------
=== modified file 'debian/copyright'
--- a/debian/copyright	2005-01-22 18:19:03 +0000
+++ b/debian/copyright	2007-12-28 15:09:39 +0000
@@ -1,6 +1,6 @@
 userdir-ldap has been released under the GNU General Public License.
 
-    Copyright (c) 1999-2005  Debian Admin Team Members and Developers
+    Copyright (c) 1999-2007  Debian Admin Team Members and Developers
 
     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
@@ -19,5 +19,20 @@
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The source of the Debian package is managed through CVS.  It is publically
+The source of the Debian package was managed through CVS.  It was publically
 available at <http://cvs.debian.org/userdir-ldap/?cvsroot=debian-admin>.
+
+It is now managed using bzr and is publically available at
+<http://db.debian.org/bzr/userdir-ldap/trunk>.
+
+
+Since 2007 there are branches of userdir-ldap on bzr.debain.org, used by
+various Debian-related projects to coordinate their own userdir-ldap
+development as close as possible with that of Debian. The main branch is
+available at <http://bzr.debian.org/da-tools/da-tools/userdir-ldap-common/>.
+
+Copyright for all changes done there:
+
+  Copyright (c) 2007- da-tools project members <da-tools-discuss at lists.alioth.debian.org>
+
+  The license is the same as written above, GPL version 2 or any later.