diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2015-08-03 22:56:05 +0100 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2015-08-03 22:56:05 +0100 |
commit | e11216ce7cfdd8092e724e824b04f2bee0a7e41b (patch) | |
tree | bd5e45241af15286110330346e4a0f215f1e65fb | |
parent | 91dd19caf16790c3b77818f8efd6cabaca209ecf (diff) | |
parent | d567b58a869e9e7c6a39332da50c2b2be067d23f (diff) |
Merge remote-tracking branch 'origin/release-3.4.1'
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | debian/source/options | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 0d01b898..1b3b6cb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -bitlbee (3.2.2-2) UNRELEASED; urgency=medium +bitlbee (3.4.1-1) unstable; urgency=medium * Fix copyright info (Closes: #764181) + * "New" upstream release. Apologies for the delay. + * Exclude .git not .bzr when building the source package. - -- Wilmer van der Gaast <wilmer@gaast.net> Fri, 17 Oct 2014 23:25:33 +0100 + -- Wilmer van der Gaast <wilmer@gaast.net> Mon, 03 Aug 2015 22:33:25 +0100 bitlbee (3.2.2-1) unstable; urgency=medium diff --git a/debian/source/options b/debian/source/options index 91a9b784..3d7e42cf 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1 @@ ---diff-ignore='(^|/)\.bzr' +--diff-ignore='(^|/)\.git' |