Merge branch 'master' into next

[i3/i3] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 588f735e50d06864fb72798e3944bf8fd598fb62..46a3d7919154dda841b73260992eacbf740e238a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,8 @@
 This Debian package is based on a tarball downloaded from
 This Debian package is based on a tarball downloaded from

-http://i3.zekjur.net
+http://i3wm.org/

 
 

-Copyright: (C) 2009 Michael Stapelberg <michael+i3 at stapelberg dot de>
+Copyright: (C) 2009-2011 Michael Stapelberg <michael+i3 at stapelberg dot de>
+All rights reserved.

 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:


@@ -13,7 +14,7 @@ are permitted provided that the following conditions are met:
   list of conditions and the following disclaimer in the documentation and/or other
   materials provided with the distribution.
 
   list of conditions and the following disclaimer in the documentation and/or other
   materials provided with the distribution.
 

-* Neither the name of Michael Stapelberg, wiipdf nor the names of its contributors
+* Neither the name of Michael Stapelberg, i3 nor the names of its contributors

   may be used to endorse or promote products derived from this software without
   specific prior written permission.
 
   may be used to endorse or promote products derived from this software without
   specific prior written permission.