From 256164c49f83e85f5c5a04c9b659721b56cd35ec Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 20 Dec 2011 12:18:30 +0100 Subject: Merging Debian 3.0.3-1.1 changes. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 5702b417..bbc8aec9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,14 @@ bitlbee (3.0.4-1) unstable; urgency=low -- Wilmer van der Gaast Sun, 11 Dec 2011 16:53:31 +0000 +bitlbee (3.0.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Use the standard ${source:Version} and ${binary:Version} substvars instead + of the custom and broken ${bee:Version} (closes: #651612). + + -- Julien Cristau Thu, 15 Dec 2011 20:34:32 +0100 + bitlbee (3.0.3-1) unstable; urgency=low * New upstream release. (Skipped 3.0.2, sorry!) -- cgit v1.2.3 From f1c870a20c1c8a1173fe6244952518f015fc1346 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Tue, 20 Dec 2011 13:01:08 +0100 Subject: Second attempt at a 3.0.4-1 upload. --- debian/changelog | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index bbc8aec9..2588c768 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,23 +1,25 @@ -bitlbee (3.0.4-1) unstable; urgency=low +bitlbee (3.0.4+bzr855-1) unstable; urgency=low * New upstream release. + * This is not a vanilla 3.0.4 tree but a Bazaar snapshot. The source + release was a few weeks ago by now. There should be no significant + differences. * Added bitlbee-plugin-skype and skyped packages, now part of BitlBee - instead of a separate package. - * Fixed dependencies of bitlbee-plugin-otr package to not break with - binary MTUs. (Closes: #651612) + instead of a separate package. Not building these for Debian for now + though since python-skype was removed. * ^B and some other things are stripped in outgoing XMPP stanzas. (Closes: #507856) * OTR module linking fix. Not with the fix from the Debian bug but with one from bugs.bitlbee.org. I hope that covers it. (Closes: #646369) * Closing a few old bugs that were filed against the Debian package - instead of upstream: + instead of/as well as upstream: - Joining password-protected MUCs is working for a while already, set the password using "chan set". (Closes: #615624) - "Headline:" msgs (Closes: #605459) - Yahoo! was fixed long ago and Etch is deprecated. (Closes: #476529) - identi.ca support is documented. (Closes: #613789) - -- Wilmer van der Gaast Sun, 11 Dec 2011 16:53:31 +0000 + -- Wilmer van der Gaast Tue, 20 Dec 2011 12:46:42 +0100 bitlbee (3.0.3-1.1) unstable; urgency=low -- cgit v1.2.3 From d6ddff0d4dae3d93de21fc37ca2e4df6d0cc3fab Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Thu, 22 Dec 2011 17:10:27 +0100 Subject: bitlbee (3.0.4-2) unstable; urgency=low * Not a real Debian release, but just resetting the version number to get sane version numbers for the nightly builds. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 2588c768..70cb9418 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bitlbee (3.0.4-2) unstable; urgency=low + + * Not a real Debian release, but just resetting the version number to + get sane version numbers for the nightly builds. + + -- Wilmer van der Gaast Thu, 22 Dec 2011 17:09:15 +0100 + bitlbee (3.0.4+bzr855-1) unstable; urgency=low * New upstream release. -- cgit v1.2.3 From 2d93a51e15ac2d6daaac0d6ac1e2c41e33486c53 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Fri, 23 Dec 2011 09:47:02 +0100 Subject: Removing the version number override hack broken by a recent NMU. Instead, I'll try to solve this problem on just the buildbot using "dch". --- debian/changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'debian/changelog') diff --git a/debian/changelog b/debian/changelog index 70cb9418..590d7b90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -bitlbee (3.0.4-2) unstable; urgency=low +bitlbee (3.0.4+z-2) UNRELEASED; urgency=low - * Not a real Debian release, but just resetting the version number to - get sane version numbers for the nightly builds. + * Removed some version override stuff from Debian build scripts. Instead, + my buildbot now uses dch to generate a changelog entry with the right + version number. - -- Wilmer van der Gaast Thu, 22 Dec 2011 17:09:15 +0100 + -- Wilmer van der Gaast Fri, 23 Dec 2011 09:45:55 +0100 bitlbee (3.0.4+bzr855-1) unstable; urgency=low -- cgit v1.2.3