diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-05-03 01:52:08 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-05-03 01:52:08 +0100 |
| commit | f92456381b2a1487036848fc4e0105b8a439facd (patch) | |
| tree | 38dd931c315ad03dafcd4af8f374c48ad45ff553 /debian | |
| parent | 6a9d068e73b6d08056302fdc85dd706a2dd647a5 (diff) | |
| parent | 6824fb355a31ed46c22740ef184332440d3981ce (diff) | |
Mainline merge.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/bitlbee.init | 4 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/debian/bitlbee.init b/debian/bitlbee.init index 4c224ffc..be1dcd66 100755 --- a/debian/bitlbee.init +++ b/debian/bitlbee.init @@ -37,8 +37,8 @@ fi # d_start() { # Make sure BitlBee can actually write its PID... - touch /var/run/bitlbee.pid - chown bitlbee: /var/run/bitlbee.pid + touch $PIDFILE + chown bitlbee: $PIDFILE start-stop-daemon --start --quiet --pidfile $PIDFILE \ --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS diff --git a/debian/changelog b/debian/changelog index f969b410..56d0a551 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +bitlbee (1.2.6a-1) unstable; urgency=low + + * New upstream version. + * Native support for Twitter. + * Fixed /WHOIS response format. (Closes: #576120) + * Problems with bitlbee-skype are solved by now. (Closes: #575572) + + -- Wilmer van der Gaast <wilmer@peer.gaast.net> Tue, 20 Apr 2010 00:34:51 +0200 + bitlbee (1.2.5-1) unstable; urgency=low * New upstream version. diff --git a/debian/rules b/debian/rules index 788e5006..0c656fd8 100755 --- a/debian/rules +++ b/debian/rules @@ -98,7 +98,7 @@ binary-indep: install-indep cd debian/bitlbee-dev; \ find usr -type f -exec md5sum {} \; > DEBIAN/md5sums - dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev + dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev -v1:$(BITLBEE_VERSION)-0 dpkg --build debian/bitlbee-dev .. |