diff options
| author | Simon McVittie <smcv@debian.org> | 2011-09-21 18:32:22 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2011-09-21 18:32:22 +0100 |
| commit | d55eb2d1ad5c5edc179f34b68002860cd44b2b51 (patch) | |
| tree | 8f3d9b9282c0dd5509b4c5f899783fe7a28badae | |
| parent | 637642b3c68201d49a7683c69f16825f2389c48e (diff) | |
| parent | f91eae9f5660a29cd4d5cc3238b035b146eae538 (diff) | |
| download | dbus-d55eb2d1ad5c5edc179f34b68002860cd44b2b51.tar.gz | |
Merge branch 'master' into experimental
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/dbus-1-doc.links | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 81a8fcc3..ec0463c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +dbus (1.4.16-1) unstable; urgency=low + + * New upstream release + * Do not symlink dcop-howto.txt.gz - no longer installed (this is D-Bus, + not DCOP) + * Set the build-dependencies to be enough to run all tests, but don't + run the tests yet + + -- Simon McVittie <smcv@debian.org> Wed, 21 Sep 2011 15:32:10 +0100 + dbus (1.5.6-1) unstable; urgency=low * Merge from unstable diff --git a/debian/control b/debian/control index 7498e3cd..3d1153ba 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,12 @@ Uploaders: Sjoerd Simons <sjoerd@debian.org>, Michael Biebl <biebl@debian.org>, Loic Minier <lool@dooz.org>, Simon McVittie <smcv@debian.org> -# libdbus-glib-1-dev and libglib2.0-dev can be omitted for bootstrapping, +# The following packages can be omitted for bootstrapping: +# libdbus-glib-1-dev (circular dependency) +# libglib2.0-dev +# python +# python-dbus (circular dependency) +# python-gobject # but if you have them in Build-Depends, more tests can be run Build-Depends: automake (>= 1:1.10), autotools-dev, @@ -21,6 +26,9 @@ Build-Depends: automake (>= 1:1.10), libglib2.0-dev, libselinux1-dev [linux-any], libx11-dev, + python (>= 2.6), + python-dbus, + python-gobject, xmlto, xsltproc Standards-Version: 3.9.2 diff --git a/debian/dbus-1-doc.links b/debian/dbus-1-doc.links index 8a5d4f5d..72c09cd7 100644 --- a/debian/dbus-1-doc.links +++ b/debian/dbus-1-doc.links @@ -3,6 +3,5 @@ usr/share/doc/dbus/dbus-specification.html usr/share/doc/dbus-1-doc/dbus-specifi usr/share/doc/dbus/dbus-specification.html usr/share/doc/dbus-1-doc/html/dbus-specification.html usr/share/doc/dbus/dbus-test-plan.html usr/share/doc/dbus-1-doc/dbus-test-plan.html usr/share/doc/dbus/dbus-tutorial.html usr/share/doc/dbus-1-doc/html/dbus-tutorial.html -usr/share/doc/dbus/dcop-howto.txt.gz usr/share/doc/dbus-1-doc/dcop-howto.txt.gz usr/share/doc/dbus/api usr/share/doc/dbus-1-doc/html/api usr/share/doc/dbus usr/share/gtk-doc/html/dbus |