Changes in / [46511b3:9ead105]
- Files:
-
- 9 edited
-
debian/bitlbee-common.postinst (modified) (1 diff)
-
debian/changelog (modified) (2 diffs)
-
debian/copyright (modified) (2 diffs)
-
lib/arc.c (modified) (1 diff)
-
lib/json_util.c (modified) (1 diff)
-
lib/json_util.h (modified) (1 diff)
-
lib/oauth.c (modified) (1 diff)
-
lib/xmltree.c (modified) (2 diffs)
-
lib/xmltree.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
debian/bitlbee-common.postinst
r46511b3 r9ead105 66 66 fi 67 67 68 # The official way to check if we're upgrading is to check if $2 is 69 # non-empty. However, previous versions of BitlBee didn't have a 70 # bitlbee-common package so in that case the var will also be empty. 71 # Instead, check if the port is in use (if netstat is available). This 72 # works since the debconf code will pick a free port on new installs. 73 if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then 74 unset IS_UPGRADE 75 if which netstat > /dev/null 2> /dev/null; then 76 netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1 77 else 78 [ -n "$2" ] && IS_UPGRADE=1 79 fi 80 if [ -n "$IS_UPGRADE" ]; then 81 invoke-rc.d bitlbee restart 82 fi 68 if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a -n "$2" ]; then 69 invoke-rc.d bitlbee restart 83 70 fi 84 71 -
debian/changelog
r46511b3 r9ead105 1 bitlbee (3.2.1+otr4-2) UNRELEASED; urgency=medium 2 1 bitlbee (3.2.2-2) UNRELEASED; urgency=medium 2 3 * Fix copyright info (Closes: #764181) 4 5 -- Wilmer van der Gaast <wilmer@gaast.net> Fri, 17 Oct 2014 23:25:33 +0100 6 7 bitlbee (3.2.2-1) unstable; urgency=medium 8 9 [ Jelmer Vernooij ] 3 10 * Bump standards version to 3.9.5 (no changes). 4 11 * Remove obsolete DM-Upload-Allowed header. … … 9 16 * Support building against libgnutls28-dev. Closes: #753020 10 17 11 -- Jelmer Vernooij <jelmer@debian.org> Sun, 20 Jul 2014 01:19:30 +0200 18 [ Wilmer van der Gaast ] 19 * Merged 3.2.2 with a few later Debian-specific fixes for a belated 20 3.2.2-1 upload. Apologies for the delay! 21 * Removed stale workaround on upgrades from bitlbee <3.0 (with no 22 bitlbee-common package). 23 24 -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 05 Oct 2014 22:11:12 +0100 12 25 13 26 bitlbee (3.2.1+otr4-1) unstable; urgency=low -
debian/copyright
r46511b3 r9ead105 7 7 Maurits Dijkstra, Geert Mulders, Miklos Vajna and others. 8 8 9 Mainly Copyright 2002-201 2Wilmer van der Gaast.9 Mainly Copyright 2002-2014 Wilmer van der Gaast. 10 10 11 11 12 Bits of third party code, also GPLed: 13 * Some parts (mostly protocols/oscar/) are borrowed from Gaim (version 14 0.58), now known as Pidgin <http://www.pidgin.im/>. 12 Bits of third party code, also (L)GPLed: 15 13 * protocols/yahoo/ is libyahoo2 <http://libyahoo2.sf.net/>. 14 * Some parts (though there is very little left at this point) are borrowed 15 from Gaim (version 0.58), now known as Pidgin <http://www.pidgin.im/>. 16 16 17 17 Other license (but GPL-compatible): … … 40 40 41 41 42 Portions (mostly protocols/twitter and protocols/oscar) are licenced under 43 the LGPL: 44 45 ============================================================================ 46 This library is free software; you can redistribute it and/or 47 modify it under the terms of the GNU Lesser General Public 48 License as published by the Free Software Foundation, version 49 2.1. 50 51 This library is distributed in the hope that it will be useful, 52 but WITHOUT ANY WARRANTY; without even the implied warranty of 53 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 54 Lesser General Public License for more details. 55 56 You should have received a copy of the GNU Lesser General Public License 57 along with this library; if not, write to the Free Software Foundation, 58 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 59 ============================================================================ 60 42 61 43 62 The SGML-formatted documentation is written by Jelmer Vernooij -
lib/arc.c
r46511b3 r9ead105 6 6 * Copyright 2006 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 * This library is free software; you can redistribute it and/or*9 * modify it under the terms of the GNU Lesser General Public*10 * License as published by the Free Software Foundation, version*11 * 2.1.*12 * * 13 * This libraryis distributed in the hope that it will be useful, *8 * This program is free software; you can redistribute it and/or modify * 9 * it under the terms of the GNU General Public License as published by * 10 * the Free Software Foundation; either version 2 of the License, or * 11 * (at your option) any later version. * 12 * * 13 * This program is distributed in the hope that it will be useful, * 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU*16 * Lesser General Public License for more details.*17 * * 18 * You should have received a copy of the GNU Lesser General Public License*19 * along with this library; if not, write to the Free Software Foundation, *20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * GNU General Public License for more details. * 17 * * 18 * You should have received a copy of the GNU General Public License along * 19 * with this program; if not, write to the Free Software Foundation, Inc., * 20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 21 21 * * 22 22 \***************************************************************************/ -
lib/json_util.c
r46511b3 r9ead105 6 6 * Copyright 2012-2012 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 * This library is free software; you can redistribute it and/or*9 * modify it under the terms of the GNU Lesser General Public*10 * License as published by the Free Software Foundation, version*11 * 2.1.*8 * This program is free software; you can redistribute it and/or modify * 9 * it under the terms of the GNU General Public License as published by * 10 * the Free Software Foundation; either version 2 of the License, or * 11 * (at your option) any later version. * 12 12 * * 13 * This libraryis distributed in the hope that it will be useful, *13 * This program is distributed in the hope that it will be useful, * 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU*16 * Lesser General Public License for more details.*15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * GNU General Public License for more details. * 17 17 * * 18 * You should have received a copy of the GNU Lesser General Public License*19 * along with this library; if not, write to the Free Software Foundation, *20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*18 * You should have received a copy of the GNU General Public License along * 19 * with this program; if not, write to the Free Software Foundation, Inc., * 20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 21 21 * * 22 22 ****************************************************************************/ -
lib/json_util.h
r46511b3 r9ead105 6 6 * Copyright 2012-2012 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 * This library is free software; you can redistribute it and/or*9 * modify it under the terms of the GNU Lesser General Public*10 * License as published by the Free Software Foundation, version*11 * 2.1.*8 * This program is free software; you can redistribute it and/or modify * 9 * it under the terms of the GNU General Public License as published by * 10 * the Free Software Foundation; either version 2 of the License, or * 11 * (at your option) any later version. * 12 12 * * 13 * This libraryis distributed in the hope that it will be useful, *13 * This program is distributed in the hope that it will be useful, * 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU*16 * Lesser General Public License for more details.*15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * GNU General Public License for more details. * 17 17 * * 18 * You should have received a copy of the GNU Lesser General Public License*19 * along with this library; if not, write to the Free Software Foundation, *20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*18 * You should have received a copy of the GNU General Public License along * 19 * with this program; if not, write to the Free Software Foundation, Inc., * 20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 21 21 * * 22 22 ****************************************************************************/ -
lib/oauth.c
r46511b3 r9ead105 6 6 * Copyright 2010 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 * This library is free software; you can redistribute it and/or*9 * modify it under the terms of the GNU Lesser General Public*10 * License as published by the Free Software Foundation, version*11 * 2.1.*12 * * 13 * This libraryis distributed in the hope that it will be useful, *8 * This program is free software; you can redistribute it and/or modify * 9 * it under the terms of the GNU General Public License as published by * 10 * the Free Software Foundation; either version 2 of the License, or * 11 * (at your option) any later version. * 12 * * 13 * This program is distributed in the hope that it will be useful, * 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU*16 * Lesser General Public License for more details.*17 * * 18 * You should have received a copy of the GNU Lesser General Public License*19 * along with this library; if not, write to the Free Software Foundation, *20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * GNU General Public License for more details. * 17 * * 18 * You should have received a copy of the GNU General Public License along * 19 * with this program; if not, write to the Free Software Foundation, Inc., * 20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 21 21 * * 22 22 \***************************************************************************/ -
lib/xmltree.c
r46511b3 r9ead105 6 6 * Copyright 2006-2012 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 * This library is free software; you can redistribute it and/or*9 * modify it under the terms of the GNU Lesser General Public*10 * License as published by the Free Software Foundation, version*11 * 2.1.*8 * This program is free software; you can redistribute it and/or modify * 9 * it under the terms of the GNU General Public License as published by * 10 * the Free Software Foundation; either version 2 of the License, or * 11 * (at your option) any later version. * 12 12 * * 13 * This libraryis distributed in the hope that it will be useful, *13 * This program is distributed in the hope that it will be useful, * 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU*16 * Lesser General Public License for more details.*15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * GNU General Public License for more details. * 17 17 * * 18 * You should have received a copy of the GNU Lesser General Public License*19 * along with this library; if not, write to the Free Software Foundation, *20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*18 * You should have received a copy of the GNU General Public License along * 19 * with this program; if not, write to the Free Software Foundation, Inc., * 20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 21 21 * * 22 22 ****************************************************************************/ … … 524 524 } 525 525 526 struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value ) { 526 struct xt_node *xt_find_node_by_attr( struct xt_node *xt, const char *tag, const char *key, const char *value ) 527 { 527 528 struct xt_node *c; 528 529 char *s; -
lib/xmltree.h
r46511b3 r9ead105 6 6 * Copyright 2006-2012 Wilmer van der Gaast <wilmer@gaast.net> * 7 7 * * 8 * This library is free software; you can redistribute it and/or*9 * modify it under the terms of the GNU Lesser General Public*10 * License as published by the Free Software Foundation, version*11 * 2.1.*8 * This program is free software; you can redistribute it and/or modify * 9 * it under the terms of the GNU General Public License as published by * 10 * the Free Software Foundation; either version 2 of the License, or * 11 * (at your option) any later version. * 12 12 * * 13 * This libraryis distributed in the hope that it will be useful, *13 * This program is distributed in the hope that it will be useful, * 14 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of * 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU*16 * Lesser General Public License for more details.*15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 16 * GNU General Public License for more details. * 17 17 * * 18 * You should have received a copy of the GNU Lesser General Public License*19 * along with this library; if not, write to the Free Software Foundation, *20 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA*18 * You should have received a copy of the GNU General Public License along * 19 * with this program; if not, write to the Free Software Foundation, Inc., * 20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 21 21 * * 22 22 ****************************************************************************/
Note: See TracChangeset
for help on using the changeset viewer.
