Changeset b006464 for debian


Ignore:
Timestamp:
2012-11-17T23:51:21Z (7 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
5aa96fc8
Parents:
d1356cb (diff), e1d3f98 (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:

Merge mainline.

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/changelog

    rd1356cb rb006464  
     1bitlbee (3.0.6-2) UNRELEASED; urgency=low
     2
     3  * Depend on gnutls-dev instead of libgnutls-dev. (Closes: #691766)
     4  * Also, drop nss dependency. GnuTLS is supported officially, the rest is
     5    use-at-your-own-risk (so compile it yourself).
     6
     7 -- Wilmer van der Gaast <wilmer@gaast.net>  Tue, 30 Oct 2012 23:25:56 +0000
     8
    19bitlbee (3.0.6-1) unstable; urgency=low
    210
  • debian/control

    rd1356cb rb006464  
    55Uploaders: Jelmer Vernooij <jelmer@samba.org>
    66Standards-Version: 3.9.1
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, gnutls-dev | libgnutls-dev, po-debconf, libpurple-dev, libotr2-dev, debhelper (>= 6.0.7~), asciidoc
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
  • debian/copyright

    rd1356cb rb006464  
    55
    66Authors: Wilmer van der Gaast, Sjoerd Hemminga, Jelmer Vernooij,
    7          Maurits Dijkstra and others.
     7         Maurits Dijkstra, Geert Mulders, Miklos Vajna and others.
    88
    99Mainly Copyright 2002-2012 Wilmer van der Gaast.
Note: See TracChangeset for help on using the changeset viewer.