summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.gitignore8
-rw-r--r--debian/changelog7
2 files changed, 15 insertions, 0 deletions
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 00000000..59407f07
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,8 @@
+debian/bitmask.postinst.debhelper
+debian/bitmask.postrm.debhelper
+debian/bitmask.prerm.debhelper
+debian/bitmask.substvars
+debian/bitmask/
+debian/files
+docs/man/bitmask.1
+
diff --git a/debian/changelog b/debian/changelog
index c72287f6..56159bf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bitmask (0.3.1) unstable; urgency=low
+
+ * Merge master for new release
+ * Cherrypick fix for updown script.
+
+ -- Ben Carrillo <ben@futeisha.org> Mon, 26 Aug 2013 14:21:06 +0200
+
bitmask (0.3.1pre) unstable; urgency=low
* Merge develop for new release