Changeset 6da18ac


Ignore:
Timestamp:
2010-11-12T22:48:28Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
70d7795
Parents:
389ce9f (diff), 5258d364 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging a bunch of Debian packaging fixes from AnAnt, the package should be
Lintian clean now (or at least *much* cleaner than before). Thanks!

Files:
3 added
13 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee-common.config

    r389ce9f r6da18ac  
    1 #!/bin/sh -e
     1#!/bin/sh
     2
     3set -e
    24
    35. /usr/share/debconf/confmodule
  • debian/bitlbee-common.init

    r389ce9f r6da18ac  
    55# Required-Stop:     $remote_fs $syslog
    66# Default-Start:     2 3 4 5
    7 # Default-Stop:      1
     7# Default-Stop:      0 1 6
     8# Short-Description:       Start and stop BitlBee IRC to other chat networks gateway
    89### END INIT INFO
    910#
    10 # Init script for BitlBee Debian package. Based on skeleton init script:
    1111#
    1212# Version:      @(#)skeleton  2.85-23  28-Jul-2004  miquels@cistron.nl
  • debian/bitlbee-common.postinst

    r389ce9f r6da18ac  
    1 #!/bin/sh -e
     1#!/bin/sh
     2
     3set -e
    24
    35. /usr/share/debconf/confmodule
     
    1618[ -r /etc/default/bitlbee ] && . /etc/default/bitlbee
    1719
    18 if [ "$BITLBEE_DISABLED" = "0" ] && type update-inetd > /dev/null 2> /dev/null &&
     20if [ "$BITLBEE_DISABLED" = "0" ] && which update-inetd > /dev/null 2> /dev/null &&
    1921   ( expr "$2" : '0\..*' > /dev/null || expr "$2" : '1\.0\..*' > /dev/null ); then
    2022        ## Make sure the inetd entry is gone (can still be there from a
     
    7173if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
    7274        unset IS_UPGRADE
    73         if type netstat > /dev/null 2> /dev/null; then
     75        if which netstat > /dev/null 2> /dev/null; then
    7476                netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1
    7577        else
  • debian/bitlbee-common.postrm

    r389ce9f r6da18ac  
    1 #!/bin/sh -e
     1#!/bin/sh
     2
     3set -e
    24
    35[ "$1" = "purge" ] || exit 0
  • debian/bitlbee-common.prerm

    r389ce9f r6da18ac  
    1 #!/bin/sh -e
     1#!/bin/sh
     2
     3set -e
    24
    35if [ "$1" = "upgrade" ]; then
  • debian/bitlbee.prerm

    r389ce9f r6da18ac  
    1 #!/bin/sh -e
     1#!/bin/sh
     2
     3set -e
    24
    35if [ "$1" != "upgrade" ]; then
  • debian/changelog

    r389ce9f r6da18ac  
     1bitlbee (3.0-2) UNRELEASED; urgency=low
     2
     3  * debian/bitlbee-common.postinst: Replace 'type' with 'which' to avoid
     4    bashism.
     5  * debian/{*.prerm, *.postinst, *.postrm, *.config}: use set -e in the body
     6    of maintainer scripts.
     7  * debian/control:
     8    + Corrected short description of bitlbee-plugin-otr
     9    + Bumped Standards-Version to 3.9.1
     10    + Added ${misc:Depends} for bitlbee & bitlbee-libpurple
     11    + Moved dependency on adduser to bitlbee-common
     12    + Bumped debhelper version to 6.0.7~ for dh_lintian
     13  * debian/copyright: Refer to /usr/share/common-licenses/GPL-2
     14  * Added lintian overrides for bitlbee & bitlbee-libpurple
     15  * Explicitly set source format to 1.0
     16  * debian/bitlbee-common.init:
     17    + Add Short-Description header.
     18    + Also stop at runlevels 0 and 6.
     19
     20 -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Mon, 25 Oct 2010 16:56:24 +0200
     21
    122bitlbee (3.0-1) unstable; urgency=low
    223
  • debian/control

    r389ce9f r6da18ac  
    44Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
    55Uploaders: Jelmer Vernooij <jelmer@samba.org>
    6 Standards-Version: 3.8.4
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6)
     6Standards-Version: 3.9.1
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~)
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
     
    1212Package: bitlbee
    1313Architecture: any
    14 Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
     14Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
    1515Conflicts: bitlbee-libpurple
    1616Replaces: bitlbee-libpurple
     
    2222Package: bitlbee-libpurple
    2323Architecture: any
    24 Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
     24Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${bee:Version})
    2525Conflicts: bitlbee
    2626Replaces: bitlbee
     
    4040Package: bitlbee-common
    4141Architecture: all
    42 Depends: ${misc:Depends}, net-tools
     42Depends: ${misc:Depends}, net-tools, adduser
    4343Replaces: bitlbee
    4444Description: An IRC to other chat networks gateway (common files/docs)
     
    6363Architecture: any
    6464Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${bee:Version}) | bitlbee-libpurple (= ${bee:Version}), bitlbee-common (= ${bee:Version})
    65 Description: An IRC to other chat networks gateway (default version)
     65Description: An IRC to other chat networks gateway (OTR plugin)
    6666 This program can be used as an IRC server which forwards everything you
    6767 say to people on other chat networks: Jabber (which includes Google Talk
  • debian/copyright

    r389ce9f r6da18ac  
    2525
    2626  You should have received a copy of the GNU General Public License with
    27   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
     27  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
    2828  if not, write to the Free Software Foundation, Inc., 51 Franklin St,
    2929  Fifth Floor, Boston, MA 02110-1301, USA.
  • debian/rules

    r389ce9f r6da18ac  
    8787        dh_installinit --init-script=bitlbee
    8888        dh_installman
     89        dh_lintian
    8990        dh_strip
    9091        dh_link
  • doc/bitlbee.8

    r389ce9f r6da18ac  
    1919.PP
    2020.B bitlbee
    21 [-I]
    22 [-c \fIconfiguration file\fP]
    23 [-d \fIconfiguration directory\fP]
     21[\-I]
     22[\-c \fIconfiguration file\fP]
     23[\-d \fIconfiguration directory\fP]
    2424.PP
    2525.B bitlbee
    26 -D
    27 [-i \fIaddress\fP]
    28 [-p \fIport number\fP]
    29 [-n]
    30 [-v]
    31 [-c \fIconfiguration file\fP]
    32 [-d \fIconfiguration directory\fP]
     26\-D
     27[\-i \fIaddress\fP]
     28[\-p \fIport number\fP]
     29[\-n]
     30[\-v]
     31[\-c \fIconfiguration file\fP]
     32[\-d \fIconfiguration directory\fP]
    3333.PP
    3434.B bitlbee
    35 -h
     35\-h
    3636.RI
    3737.SH DESCRIPTION
  • protocols/oscar/chatnav.c

    r389ce9f r6da18ac  
    372372
    373373        if (snac2->family != 0x000d) {
    374                 imcb_error(sess->aux_data, "recieved response that maps to corrupt request!");
     374                imcb_error(sess->aux_data, "received response that maps to corrupt request!");
    375375                return 0;
    376376        }
  • protocols/oscar/im.c

    r389ce9f r6da18ac  
    937937
    938938        if (channel != 0x01) {
    939                 imcb_error(sess->aux_data, "icbm: ICBM recieved on unsupported channel.  Ignoring.");
     939                imcb_error(sess->aux_data, "icbm: ICBM received on unsupported channel.  Ignoring.");
    940940                return 0;
    941941        }
Note: See TracChangeset for help on using the changeset viewer.