diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/copyright | 27 | ||||
| -rw-r--r-- | lib/arc.c | 20 | ||||
| -rw-r--r-- | lib/json_util.c | 20 | ||||
| -rw-r--r-- | lib/json_util.h | 20 | ||||
| -rw-r--r-- | lib/oauth.c | 20 | ||||
| -rw-r--r-- | lib/xmltree.c | 20 | ||||
| -rw-r--r-- | lib/xmltree.h | 20 |
8 files changed, 89 insertions, 64 deletions
diff --git a/debian/changelog b/debian/changelog index 8189bf21..0d01b898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bitlbee (3.2.2-2) UNRELEASED; urgency=medium + + * Fix copyright info (Closes: #764181) + + -- Wilmer van der Gaast <wilmer@gaast.net> Fri, 17 Oct 2014 23:25:33 +0100 + bitlbee (3.2.2-1) unstable; urgency=medium [ Jelmer Vernooij ] diff --git a/debian/copyright b/debian/copyright index 9002c219..c053d9d8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,13 +6,13 @@ The source can be downloaded from http://www.bitlbee.org/ Authors: Wilmer van der Gaast, Sjoerd Hemminga, Jelmer Vernooij, Maurits Dijkstra, Geert Mulders, Miklos Vajna and others. -Mainly Copyright 2002-2012 Wilmer van der Gaast. +Mainly Copyright 2002-2014 Wilmer van der Gaast. -Bits of third party code, also GPLed: -* Some parts (mostly protocols/oscar/) are borrowed from Gaim (version - 0.58), now known as Pidgin <http://www.pidgin.im/>. +Bits of third party code, also (L)GPLed: * protocols/yahoo/ is libyahoo2 <http://libyahoo2.sf.net/>. +* Some parts (though there is very little left at this point) are borrowed + from Gaim (version 0.58), now known as Pidgin <http://www.pidgin.im/>. Other license (but GPL-compatible): * lib/json.[ch] is from <https://github.com/udp/json-parser> and licensed @@ -39,6 +39,25 @@ BitlBee License: ============================================================================ +Portions (mostly protocols/twitter and protocols/oscar) are licenced under +the LGPL: + +============================================================================ + 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, version + 2.1. + + 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 +============================================================================ + The SGML-formatted documentation is written by Jelmer Vernooij <jelmer@samba.org> under the GNU Free Documentation License: @@ -5,19 +5,19 @@ * * * Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net> * * * -* 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, version * -* 2.1. * +* 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 * +* 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, * +* This program 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. * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU 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 * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, write to the Free Software Foundation, Inc., * +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * \***************************************************************************/ diff --git a/lib/json_util.c b/lib/json_util.c index 2f1bc7e8..ff1d5bb9 100644 --- a/lib/json_util.c +++ b/lib/json_util.c @@ -5,19 +5,19 @@ * * * Copyright 2012-2012 Wilmer van der Gaast <wilmer@gaast.net> * * * -* 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, version * -* 2.1. * +* 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 * +* 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, * +* This program 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. * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU 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 * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, write to the Free Software Foundation, Inc., * +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * ****************************************************************************/ diff --git a/lib/json_util.h b/lib/json_util.h index c2ddb0d1..7eb49515 100644 --- a/lib/json_util.h +++ b/lib/json_util.h @@ -5,19 +5,19 @@ * * * Copyright 2012-2012 Wilmer van der Gaast <wilmer@gaast.net> * * * -* 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, version * -* 2.1. * +* 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 * +* 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, * +* This program 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. * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU 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 * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, write to the Free Software Foundation, Inc., * +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * ****************************************************************************/ diff --git a/lib/oauth.c b/lib/oauth.c index c78b4a43..b18949f4 100644 --- a/lib/oauth.c +++ b/lib/oauth.c @@ -5,19 +5,19 @@ * * * Copyright 2010 Wilmer van der Gaast <wilmer@gaast.net> * * * -* 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, version * -* 2.1. * +* 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 * +* 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, * +* This program 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. * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU 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 * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, write to the Free Software Foundation, Inc., * +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * \***************************************************************************/ diff --git a/lib/xmltree.c b/lib/xmltree.c index 0726d387..3d9eb735 100644 --- a/lib/xmltree.c +++ b/lib/xmltree.c @@ -5,19 +5,19 @@ * * * Copyright 2006-2012 Wilmer van der Gaast <wilmer@gaast.net> * * * -* 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, version * -* 2.1. * +* 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 * +* 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, * +* This program 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. * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU 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 * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, write to the Free Software Foundation, Inc., * +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * ****************************************************************************/ diff --git a/lib/xmltree.h b/lib/xmltree.h index a41cbac1..c1451dad 100644 --- a/lib/xmltree.h +++ b/lib/xmltree.h @@ -5,19 +5,19 @@ * * * Copyright 2006-2012 Wilmer van der Gaast <wilmer@gaast.net> * * * -* 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, version * -* 2.1. * +* 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 * +* 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, * +* This program 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. * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU 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 * +* You should have received a copy of the GNU General Public License along * +* with this program; if not, write to the Free Software Foundation, Inc., * +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * * ****************************************************************************/ |