Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/mLib

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/mLib:
  Release 2.2.2.2.
  debian/source/format: Apparently these are now mandatory.
  debian/control: Add Build-Depends on python for improved testing.

diff --git a/Makefile.am b/Makefile.am
index 1fe6fa1..e08768f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,7 +128,7 @@ EXTRA_DIST          += config/maninst
 ## General stuff.
 EXTRA_DIST             += debian/rules debian/copyright
 EXTRA_DIST             += debian/control debian/changelog
-EXTRA_DIST             += debian/compat
+EXTRA_DIST             += debian/compat debian/source/format
 
 ## mlib2
 EXTRA_DIST             += debian/mlib2.install

diff --git a/debian/changelog b/debian/changelog
index c6866d4..8682f9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mlib (2.2.2.2) experimental; urgency=low
+
+  * codec: Minor formatting fix to manpage.
+  * Fixed Build-Depends and missing debian/source/format file.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Thu, 18 Feb 2016 08:19:10 +0000
+
 mlib (2.2.2.1) experimental; urgency=low
 
   * dstr: `dstr_putf' no longer leaks memory.  Sorry.

diff --git a/debian/control b/debian/control
index 131a859..5e86034 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mlib
 Section: libs
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: debhelper (>= 8), libadns1-dev
+Build-Depends: debhelper (>= 8), python, libadns1-dev
 Standards-Version: 3.1.1
 
 Package: mlib2

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0