diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-01 22:51:27 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-06-01 22:51:27 +0100 |
| commit | 704dd38a1440dc9d614df9222d6196048226622c (patch) | |
| tree | e35adaca74191f899a3158a3421783f1a3a67077 /debian | |
| parent | 3429b589177f286384dab151c167e16071f8a828 (diff) | |
| parent | ba3233ce0b1fc34f3ad0a450bb1b661909dafb79 (diff) | |
Merging head.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 56d0a551..ca592229 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bitlbee (1.2.7-1) unstable; urgency=high + + * New upstream version. + * Fixes MSN Messenger login issues, so uploading at high priority. + + -- Wilmer van der Gaast <wilmer@gaast.net> Sat, 15 May 2010 16:15:57 +0100 + bitlbee (1.2.6a-1) unstable; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index 86488c8a..25a90506 100644 --- a/debian/control +++ b/debian/control @@ -14,13 +14,15 @@ Architecture: any Depends: ${shlibs:Depends}, adduser, net-tools, ${debconf-depends}, debianutils (>= 1.16) Description: An IRC to other chat networks gateway This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo. + say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and + Twitter. Package: bitlbee-dev Architecture: all Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) Description: An IRC to other chat networks gateway This program can be used as an IRC server which forwards everything you - say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo. + say to people on other chat networks: Jabber, ICQ, AIM, MSN, Yahoo! and + Twitter. . This package holds development stuff for compiling plug-ins. diff --git a/debian/rules b/debian/rules index 0c656fd8..ae6463fc 100755 --- a/debian/rules +++ b/debian/rules @@ -98,7 +98,11 @@ binary-indep: install-indep cd debian/bitlbee-dev; \ find usr -type f -exec md5sum {} \; > DEBIAN/md5sums +ifdef BITLBEE_FORCE_VERSION dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0 +else + dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev +endif dpkg --build debian/bitlbee-dev .. |