lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge

Created by Jackson Doak and last modified
Get this branch:
bzr branch lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jackson Doak
Status:
Development

Recent revisions

18. By Jackson Doak

* Merge from debian. Remaining changes:
  - Build using dh-autoreconf.
  - Build-depend on gtk-doc-tools.
--------- This line and the following will be ignored --------------

removed:
  docs/libvirt-gconfig/html/GVirConfigInterface.html
  docs/libvirt-gobject/html/GVirInterface.html
  vapi/LibvirtGObject-1.0.metadata
added:
  AUTHORS.in
  docs/libvirt-gconfig/html/Libvirt-gconfig-GVirConfig.html
  docs/libvirt-gobject/html/Libvirt-gobject-GVir.html
  libvirt-gconfig/libvirt-gconfig-domain-chardev-source-private.h
  libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c
  libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h
  libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c
  libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.h
  libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c
  libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.h
  libvirt-gconfig/libvirt-gconfig-domain-snapshot-private.h
  m4/intltool.m4
  m4/virt-gettext.m4
  po/
  po/Makefile.in.in
  po/POTFILES.in
modified:
  AUTHORS
  ChangeLog
  INSTALL
  Makefile.am
  Makefile.in
  NEWS
  aclocal.m4
  build-aux/compile
  build-aux/config.guess
  build-aux/config.sub
  build-aux/depcomp
  build-aux/missing
  cfg.mk
  config.h.in
  configure
  configure.ac
  debian/changelog
  debian/control
  debian/libvirt-glib-1.0-0.symbols
  debian/libvirt-glib-1.0-dev.install
  docs/Makefile.in
  docs/libvirt-gconfig/Libvirt-gconfig-sections.txt
  docs/libvirt-gconfig/Libvirt-gconfig.types
  docs/libvirt-gconfig/Makefile.in
  docs/libvirt-gconfig/html/GVirConfigCapabilities.html
  docs/libvirt-gconfig/html/GVirConfigDomain.html
  docs/libvirt-gconfig/html/GVirConfigDomainSnapshot.html
  docs/libvirt-gconfig/html/GVirConfigNetwork.html
  docs/libvirt-gconfig/html/GVirConfigNetworkFilter.html
  docs/libvirt-gconfig/html/GVirConfigNodeDevice.html
  docs/libvirt-gconfig/html/GVirConfigObject.html
  docs/libvirt-gconfig/html/GVirConfigSecret.html
  docs/libvirt-gconfig/html/GVirConfigStoragePool.html
  docs/libvirt-gconfig/html/GVirConfigStorageVol.html
  docs/libvirt-gconfig/html/Libvirt-gconfig.devhelp2
  docs/libvirt-gconfig/html/annotation-glossary.html
  docs/libvirt-gconfig/html/api-index-full.html
  docs/libvirt-gconfig/html/ch01.html
  docs/libvirt-gconfig/html/index.html
  docs/libvirt-gconfig/html/index.sgml
  docs/libvirt-gconfig/html/object-tree.html
  docs/libvirt-glib/Libvirt-glib-sections.txt
  docs/libvirt-glib/Makefile.in
  docs/libvirt-glib/html/Libvirt-glib-Error-reporting.html
  docs/libvirt-glib/html/Libvirt-glib-Event-loop.html
  docs/libvirt-glib/html/Libvirt-glib-Library-initialization.html
  docs/libvirt-glib/html/Libvirt-glib.devhelp2
  docs/libvirt-glib/html/annotation-glossary.html
  docs/libvirt-glib/html/api-index-full.html
  docs/libvirt-glib/html/ch01.html
  docs/libvirt-glib/html/index.html
  docs/libvirt-glib/html/index.sgml
  docs/libvirt-glib/html/object-tree.html
  docs/libvirt-gobject/Libvirt-gobject-sections.txt
  docs/libvirt-gobject/Makefile.in
  docs/libvirt-gobject/html/GVirConnection.html
  docs/libvirt-gobject/html/GVirDomain.html
  docs/libvirt-gobject/html/GVirDomainSnapshot.html
  docs/libvirt-gobject/html/GVirManager.html
  docs/libvirt-gobject/html/GVirNetwork.html
  docs/libvirt-gobject/html/GVirNetworkFilter.html
  docs/libvirt-gobject/html/GVirNodeDevice.html
  docs/libvirt-gobject/html/GVirSecret.html
  docs/libvirt-gobject/html/GVirStoragePool.html
  docs/libvirt-gobject/html/GVirStorageVol.html
  docs/libvirt-gobject/html/GVirStream.html
  docs/libvirt-gobject/html/Libvirt-gobject.devhelp2
  docs/libvirt-gobject/html/annotation-glossary.html
  docs/libvirt-gobject/html/api-index-full.html
  docs/libvirt-gobject/html/ch01.html
  docs/libvirt-gobject/html/index.html
  docs/libvirt-gobject/html/index.sgml
  docs/libvirt-gobject/html/object-tree.html
  examples/Makefile.in
  examples/config-demo.py
  libvirt-gconfig/Makefile.am
  libvirt-gconfig/Makefile.in
  libvirt-gconfig/libvirt-gconfig-compat.h
  libvirt-gconfig/libvirt-gconfig-domain-channel.c
  libvirt-gconfig/libvirt-gconfig-domain-channel.h
  libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c
  libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.h
  libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c
  libvirt-gconfig/libvirt-gconfig-domain-chardev.c
  libvirt-gconfig/libvirt-gconfig-domain-chardev.h
  libvirt-gconfig/libvirt-gconfig-domain-device.c
  libvirt-gconfig/libvirt-gconfig-domain-device.h
  libvirt-gconfig/libvirt-gconfig-domain-disk.c
  libvirt-gconfig/libvirt-gconfig-domain-disk.h
  libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c
  libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h
  libvirt-gconfig/libvirt-gconfig-domain-graphics.c
  libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c
  libvirt-gconfig/libvirt-gconfig-domain-interface-network.c
  libvirt-gconfig/libvirt-gconfig-domain-interface-user.c
  libvirt-gconfig/libvirt-gconfig-domain-snapshot.c
  libvirt-gconfig/libvirt-gconfig-domain-snapshot.h
  libvirt-gconfig/libvirt-gconfig-domain.c
  libvirt-gconfig/libvirt-gconfig-helpers-private.h
  libvirt-gconfig/libvirt-gconfig-helpers.c
  libvirt-gconfig/libvirt-gconfig-interface.c
  libvirt-gconfig/libvirt-gconfig-network-filter.c
  libvirt-gconfig/libvirt-gconfig-network.c
  libvirt-gconfig/libvirt-gconfig-node-device.c
  libvirt-gconfig/libvirt-gconfig-object-private.h
  libvirt-gconfig/libvirt-gconfig-object.c
  libvirt-gconfig/libvirt-gconfig-private.h
  libvirt-gconfig/libvirt-gconfig-secret.c
  libvirt-gconfig/libvirt-gconfig-storage-permissions.c
  libvirt-gconfig/libvirt-gconfig-storage-permissions.h
  libvirt-gconfig/libvirt-gconfig-storage-pool-source.c
  libvirt-gconfig/libvirt-gconfig-storage-pool-source.h
  libvirt-gconfig/libvirt-gconfig-storage-pool-target.c
  libvirt-gconfig/libvirt-gconfig-storage-pool-target.h
  libvirt-gconfig/libvirt-gconfig-storage-pool.c
  libvirt-gconfig/libvirt-gconfig-storage-pool.h
  libvirt-gconfig/libvirt-gconfig-storage-vol.c
  libvirt-gconfig/libvirt-gconfig.h
  libvirt-gconfig/libvirt-gconfig.sym
  libvirt-gconfig/tests/Makefile.am
  libvirt-gconfig/tests/Makefile.in
  libvirt-gconfig/tests/test-domain-create.c
  libvirt-glib.spec
  libvirt-glib/Makefile.am
  libvirt-glib/Makefile.in
  libvirt-glib/libvirt-glib-error.c
  libvirt-glib/libvirt-glib-error.h
  libvirt-glib/libvirt-glib-main.c
  libvirt-gobject/Makefile.in
  libvirt-gobject/libvirt-gobject-connection.c
  libvirt-gobject/libvirt-gobject-domain-snapshot.c
  libvirt-gobject/libvirt-gobject-domain.c
  libvirt-gobject/libvirt-gobject-interface.c
  libvirt-gobject/libvirt-gobject-main.c
  libvirt-gobject/libvirt-gobject-manager.c
  libvirt-gobject/libvirt-gobject-network-filter.c
  libvirt-gobject/libvirt-gobject-network.c
  libvirt-gobject/libvirt-gobject-node-device.c
  libvirt-gobject/libvirt-gobject-secret.c
  libvirt-gobject/libvirt-gobject-storage-pool.c
  libvirt-gobject/libvirt-gobject-storage-vol.c
  libvirt-gobject/libvirt-gobject-stream.c
  python/Makefile.am
  python/Makefile.in
  vapi/Makefile.am
  vapi/Makefile.in
pending merges:
  Andreas Henriksson 2014-04-01 * Non-maintainer upload.
    Guido Günther 2014-02-16 [merge] * Upload to unstable (Closes: #726582)
    Guido Günther 2014-01-06 [merge] * Upload to experimental
    Guido Günther 2014-01-06 [merge] Import upstream version 0.1.7

17. By Matthias Klose

Build-depend on gtk-doc-tools.

16. By Matthias Klose

Build using dh-autoreconf.

15. By Guido Günther

* Upload to unstable
* Acknowledge NMU, thanks Andreas!
* [decc6aa] Use vala >= 0.20 (Closes: #709717)
* [7f21934] Add gbp.conf

14. By Jeremy Bícha

* Sync with Debian. Remaining change:
* debian/control:
  - Build-depend on valac-0.18 instead of -0.14

13. By Jeremy Bícha

* debian/control:
  - Build-depend on valac instead of valac-0.14; fixes build failure

12. By Michael Bienia

* debian/rules: add --with-python=no to configure options
  Build without the Python bindings which aren't packaged anyways
  ("fixes" build with multi-arched Python).
* debian/control:
  Drop python-dev and python-support from Build-Depends

11. By Guido Günther

* [d14bf12] New upstream version 0.1.2
* [4700825] Ship development documentation
* [34fa445] Bump standards version
* [8eb4d1c] Update symbols file

10. By Guido Günther

[ec963a2] Bump required version in symbols file (Closes: #667683)

9. By Guido Günther

[901d3d1] New upstream version 0.0.7 (Closes: #666690)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/utopic/libvirt-glib
This branch contains Public information 
Everyone can see this information.

Subscribers