aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2012-10-28 20:17:56 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2012-10-28 20:17:56 +0000
commit4d82e50a6bdc15ed39723c1dac23027b83330be1 (patch)
treea7317a2f3486de386632de6bbb49cef43e89f2d6
parent3cd37d784147808b2d93218b7eca3413a124b1b6 (diff)
parent3079db84d79f4b332949cad5b8e19e2067924077 (diff)
Meging Debian upload.
-rw-r--r--debian/changelog6
-rw-r--r--debian/source/options1
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e283a27..915d3983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bitlbee (3.0.6-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 28 Oct 2012 19:58:33 +0000
+
bitlbee (3.0.5-1.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 00000000..91a9b784
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+--diff-ignore='(^|/)\.bzr'