New upstream release

* New upstream release
  - dbus.version is a tuple again (Closes: #816729)
  - includes headers in a consistent order (Closes: #749133)
* Update debian/copyright
* Update build tests: they no longer need to edit the dbus-glib
  main loop module to be compilable out-of-tree

4 files changed, 16 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 6da9dbe..cd9fa99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
-dbus-python (1.2.2-2) UNRELEASED; urgency=medium
+dbus-python (1.2.4-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - dbus.version is a tuple again (Closes: #816729)
+    - includes headers in a consistent order (Closes: #749133)
+  * Update debian/copyright
+  * Update build tests: they no longer need to edit the dbus-glib
+    main loop module to be compilable out-of-tree
   * Standards-Version: 3.9.7 (no changes needed)
   * Normalize packaging via wrap-and-sort -abst
 
diff --git a/debian/copyright b/debian/copyright
index 15f9f7e..aed67a3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,7 @@ Copyright: © 2003-2006 Red Hat Inc. <http://www.redhat.com/>
            © 2004 Anders Carlsson
            © 2005 Colin Walters
            © 2005-2016 Collabora Ltd. <http://www.collabora.co.uk/>
+           © 2016 Simon McVittie
 License: MIT
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
diff --git a/debian/tests/build2 b/debian/tests/build2
index 8d09c99..9d4d263 100755
--- a/debian/tests/build2
+++ b/debian/tests/build2
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# Verify that third-party main loop integration, as provided by Qt
+# and E, can be built against this dbus-python. We simulate a third-party
+# main loop by copying the one for dbus-glib from this source tree.
+
 exec 2>&1
 set -e
 set -x
@@ -11,7 +15,6 @@ test_build () {
 	# provide some cunningly disguised main-loop glue
 	sed \
 		-e 's/dbus_glib/dbus_test/g' \
-		-e 's!dbus-python\.h!dbus/dbus-python\.h!g' \
 		< _dbus_glib_bindings/module.c \
 		> "$ADTTMP/$PYTHON/module.c"
 
diff --git a/debian/tests/build3 b/debian/tests/build3
index d019fc0..7bd271a 100755
--- a/debian/tests/build3
+++ b/debian/tests/build3
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# Verify that third-party main loop integration, as provided by Qt
+# and E, can be built against this dbus-python. We simulate a third-party
+# main loop by copying the one for dbus-glib from this source tree.
+
 exec 2>&1
 set -e
 set -x
@@ -11,7 +15,6 @@ test_build () {
 	# provide some cunningly disguised main-loop glue
 	sed \
 		-e 's/dbus_glib/dbus_test/g' \
-		-e 's!dbus-python\.h!dbus/dbus-python\.h!g' \
 		< _dbus_glib_bindings/module.c \
 		> "$ADTTMP/$PYTHON/module.c"