Changeset ae3dc99 for debian


Ignore:
Timestamp:
2010-04-24T17:02:07Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
c521362
Parents:
b5b40ff (diff), f1b7711 (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 stuff from mainline (1.2.6).

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee.init

    rb5b40ff rae3dc99  
    3838d_start() {
    3939        # Make sure BitlBee can actually write its PID...
    40         touch /var/run/bitlbee.pid
    41         chown bitlbee: /var/run/bitlbee.pid
     40        touch $PIDFILE
     41        chown bitlbee: $PIDFILE
    4242       
    4343        start-stop-daemon --start --quiet --pidfile $PIDFILE \
  • debian/changelog

    rb5b40ff rae3dc99  
     1bitlbee (1.2.6a-1) unstable; urgency=low
     2
     3  * New upstream version.
     4  * Native support for Twitter.
     5  * Fixed /WHOIS response format. (Closes: #576120)
     6  * Problems with bitlbee-skype are solved by now. (Closes: #575572)
     7
     8 -- Wilmer van der Gaast <wilmer@peer.gaast.net>  Tue, 20 Apr 2010 00:34:51 +0200
     9
    110bitlbee (1.2.5-1) unstable; urgency=low
    211
  • debian/rules

    rb5b40ff rae3dc99  
    100100                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
    101101
    102         dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
     102        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0
    103103
    104104        dpkg --build debian/bitlbee-dev ..
Note: See TracChangeset for help on using the changeset viewer.