[Da-tools-commits] ./debian/userdir-ldap r373: Merge from alioth

[Peter Palfrader]

------------------------------------------------------------
revno: 373
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:53:52 +0100
message:
  Merge from alioth
modified:
  debian/changelog
  debian/copyright
    ------------------------------------------------------------
    revno: 349.1.19
    committer: Joerg Jaspert <joerg at ganneff.de>
    branch nick: userdir-ldap-common
    timestamp: Fri 2007-12-28 16:30:07 +0100
    message:
      s/debain/debian/ and add the changelog entry i forgot earlier
    modified:
      debian/changelog
      debian/copyright
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-01-10 14:53:20 +0000
+++ b/debian/changelog	2008-01-10 14:53:52 +0000
@@ -44,7 +44,10 @@
     the db host doesn't need to have a key in the authorized_keys file
     for the sshdist user
 
- -- Marc 'HE' Brockschmidt <he at debian.org>  Thu, 27 Dec 2007 17:14:51 +0100
+  [ Joerg Jaspert ]
+  * Enhance copyright file a bit, also adding a pointer to our repository
+
+ -- Joerg Jaspert <joerg at debian.org>  Fri, 28 Dec 2007 16:29:35 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

=== modified file 'debian/copyright'
--- a/debian/copyright	2007-12-28 15:09:39 +0000
+++ b/debian/copyright	2007-12-28 15:30:07 +0000
@@ -26,7 +26,7 @@
 <http://db.debian.org/bzr/userdir-ldap/trunk>.
 
 
-Since 2007 there are branches of userdir-ldap on bzr.debain.org, used by
+Since 2007 there are branches of userdir-ldap on bzr.debian.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/>.