diff options
| -rw-r--r-- | debian/bitlbee-common.postinst | 17 | ||||
| -rw-r--r-- | debian/changelog | 17 | ||||
| -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 | 23 | ||||
| -rw-r--r-- | lib/xmltree.h | 20 |
9 files changed, 102 insertions, 82 deletions
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst index 3225a02a..4587ce7a 100644 --- a/debian/bitlbee-common.postinst +++ b/debian/bitlbee-common.postinst @@ -65,21 +65,8 @@ if [ -e /usr/share/bitlbee/help.upgrading ]; then fi fi -# The official way to check if we're upgrading is to check if $2 is -# non-empty. However, previous versions of BitlBee didn't have a -# bitlbee-common package so in that case the var will also be empty. -# Instead, check if the port is in use (if netstat is available). This -# works since the debconf code will pick a free port on new installs. -if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then - unset IS_UPGRADE - if which netstat > /dev/null 2> /dev/null; then - netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1 - else - [ -n "$2" ] && IS_UPGRADE=1 - fi - if [ -n "$IS_UPGRADE" ]; then - invoke-rc.d bitlbee restart - fi +if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a -n "$2" ]; then + invoke-rc.d bitlbee restart fi ## If we're upgrading, we'll probably skip this next part diff --git a/debian/changelog b/debian/changelog index b5ed12c5..0d01b898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -bitlbee (3.2.1+otr4-2) UNRELEASED; urgency=medium +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 ] * Bump standards version to 3.9.5 (no changes). * Remove obsolete DM-Upload-Allowed header. * Build with dpkg-flags, for hardening. @@ -8,7 +15,13 @@ bitlbee (3.2.1+otr4-2) UNRELEASED; urgency=medium * Use my Debian e-mail address in Uploaders. * Support building against libgnutls28-dev. Closes: #753020 - -- Jelmer Vernooij <jelmer@debian.org> Sun, 20 Jul 2014 01:19:30 +0200 + [ Wilmer van der Gaast ] + * Merged 3.2.2 with a few later Debian-specific fixes for a belated + 3.2.2-1 upload. Apologies for the delay! + * Removed stale workaround on upgrades from bitlbee <3.0 (with no + bitlbee-common package). + + -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 05 Oct 2014 22:11:12 +0100 bitlbee (3.2.1+otr4-1) unstable; urgency=low 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 9d84fb7c..6253d760 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. * * * ****************************************************************************/ @@ -523,7 +523,8 @@ char *xt_find_attr( struct xt_node *node, const char *key ) return node->attr[i].value; } -struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value ) { +struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value ) +{ struct xt_node *c; char *s; diff --git a/lib/xmltree.h b/lib/xmltree.h index aaf49cea..af13b859 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. * * * ****************************************************************************/ |