lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge
Branch merges
- Tim Lunn: Approve
-
Diff: 25223 lines (+11140/-5840)164 files modifiedAUTHORS (+12/-7)
AUTHORS.in (+15/-0)
ChangeLog (+175/-0)
INSTALL (+1/-1)
Makefile.am (+12/-3)
Makefile.in (+170/-123)
NEWS (+18/-2)
aclocal.m4 (+180/-150)
build-aux/compile (+7/-2)
build-aux/config.guess (+36/-22)
build-aux/config.sub (+51/-45)
build-aux/depcomp (+268/-185)
build-aux/missing (+150/-265)
cfg.mk (+0/-15)
config.h.in (+3/-0)
configure (+1091/-376)
configure.ac (+48/-5)
debian/changelog (+38/-0)
debian/control (+9/-2)
debian/libvirt-glib-1.0-0.symbols (+2/-1)
debian/libvirt-glib-1.0-dev.install (+0/-1)
docs/Makefile.in (+130/-91)
docs/libvirt-gconfig/Libvirt-gconfig-sections.txt (+263/-141)
docs/libvirt-gconfig/Libvirt-gconfig.types (+3/-0)
docs/libvirt-gconfig/Makefile.in (+85/-38)
docs/libvirt-gconfig/html/GVirConfigCapabilities.html (+31/-31)
docs/libvirt-gconfig/html/GVirConfigDomain.html (+487/-367)
docs/libvirt-gconfig/html/GVirConfigDomainSnapshot.html (+293/-5)
docs/libvirt-gconfig/html/GVirConfigInterface.html (+0/-95)
docs/libvirt-gconfig/html/GVirConfigNetwork.html (+3/-3)
docs/libvirt-gconfig/html/GVirConfigNetworkFilter.html (+5/-5)
docs/libvirt-gconfig/html/GVirConfigNodeDevice.html (+3/-3)
docs/libvirt-gconfig/html/GVirConfigObject.html (+17/-16)
docs/libvirt-gconfig/html/GVirConfigSecret.html (+3/-3)
docs/libvirt-gconfig/html/GVirConfigStoragePool.html (+266/-3)
docs/libvirt-gconfig/html/GVirConfigStorageVol.html (+3/-3)
docs/libvirt-gconfig/html/Libvirt-gconfig-GVirConfig.html (+95/-0)
docs/libvirt-gconfig/html/Libvirt-gconfig.devhelp2 (+104/-35)
docs/libvirt-gconfig/html/annotation-glossary.html (+25/-27)
docs/libvirt-gconfig/html/api-index-full.html (+373/-42)
docs/libvirt-gconfig/html/ch01.html (+6/-6)
docs/libvirt-gconfig/html/index.html (+5/-5)
docs/libvirt-gconfig/html/index.sgml (+111/-41)
docs/libvirt-gconfig/html/object-tree.html (+7/-4)
docs/libvirt-glib/Libvirt-glib-sections.txt (+1/-6)
docs/libvirt-glib/Makefile.in (+85/-38)
docs/libvirt-glib/html/Libvirt-glib-Error-reporting.html (+12/-12)
docs/libvirt-glib/html/Libvirt-glib-Event-loop.html (+5/-5)
docs/libvirt-glib/html/Libvirt-glib-Library-initialization.html (+4/-4)
docs/libvirt-glib/html/Libvirt-glib.devhelp2 (+1/-1)
docs/libvirt-glib/html/annotation-glossary.html (+13/-18)
docs/libvirt-glib/html/api-index-full.html (+3/-3)
docs/libvirt-glib/html/ch01.html (+5/-5)
docs/libvirt-glib/html/index.html (+4/-4)
docs/libvirt-glib/html/index.sgml (+1/-1)
docs/libvirt-glib/html/object-tree.html (+3/-3)
docs/libvirt-gobject/Libvirt-gobject-sections.txt (+110/-120)
docs/libvirt-gobject/Makefile.in (+85/-38)
docs/libvirt-gobject/html/GVirConnection.html (+806/-806)
docs/libvirt-gobject/html/GVirDomain.html (+845/-777)
docs/libvirt-gobject/html/GVirDomainSnapshot.html (+11/-11)
docs/libvirt-gobject/html/GVirInterface.html (+0/-136)
docs/libvirt-gobject/html/GVirManager.html (+38/-38)
docs/libvirt-gobject/html/GVirNetwork.html (+15/-15)
docs/libvirt-gobject/html/GVirNetworkFilter.html (+15/-15)
docs/libvirt-gobject/html/GVirNodeDevice.html (+9/-9)
docs/libvirt-gobject/html/GVirSecret.html (+15/-15)
docs/libvirt-gobject/html/GVirStoragePool.html (+446/-418)
docs/libvirt-gobject/html/GVirStorageVol.html (+101/-81)
docs/libvirt-gobject/html/GVirStream.html (+174/-150)
docs/libvirt-gobject/html/Libvirt-gobject-GVir.html (+136/-0)
docs/libvirt-gobject/html/Libvirt-gobject.devhelp2 (+136/-111)
docs/libvirt-gobject/html/annotation-glossary.html (+25/-36)
docs/libvirt-gobject/html/api-index-full.html (+24/-24)
docs/libvirt-gobject/html/ch01.html (+6/-6)
docs/libvirt-gobject/html/index.html (+5/-5)
docs/libvirt-gobject/html/index.sgml (+143/-117)
docs/libvirt-gobject/html/object-tree.html (+4/-4)
examples/Makefile.in (+116/-62)
examples/config-demo.py (+2/-1)
libvirt-gconfig/Makefile.am (+8/-0)
libvirt-gconfig/Makefile.in (+168/-91)
libvirt-gconfig/libvirt-gconfig-compat.h (+20/-0)
libvirt-gconfig/libvirt-gconfig-domain-channel.c (+18/-0)
libvirt-gconfig/libvirt-gconfig-domain-channel.h (+3/-0)
libvirt-gconfig/libvirt-gconfig-domain-chardev-source-private.h (+40/-0)
libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c (+25/-2)
libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.h (+4/-2)
libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c (+21/-0)
libvirt-gconfig/libvirt-gconfig-domain-chardev.c (+23/-0)
libvirt-gconfig/libvirt-gconfig-domain-chardev.h (+3/-0)
libvirt-gconfig/libvirt-gconfig-domain-device.c (+9/-0)
libvirt-gconfig/libvirt-gconfig-domain-device.h (+2/-0)
libvirt-gconfig/libvirt-gconfig-domain-disk.c (+38/-0)
libvirt-gconfig/libvirt-gconfig-domain-disk.h (+25/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c (+98/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h (+71/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c (+130/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.h (+79/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c (+12/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h (+2/-0)
libvirt-gconfig/libvirt-gconfig-domain-graphics.c (+2/-6)
libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-domain-interface-network.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-domain-interface-user.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c (+173/-0)
libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.h (+84/-0)
libvirt-gconfig/libvirt-gconfig-domain-snapshot-private.h (+38/-0)
libvirt-gconfig/libvirt-gconfig-domain-snapshot.c (+254/-4)
libvirt-gconfig/libvirt-gconfig-domain-snapshot.h (+47/-1)
libvirt-gconfig/libvirt-gconfig-domain.c (+5/-3)
libvirt-gconfig/libvirt-gconfig-helpers-private.h (+8/-4)
libvirt-gconfig/libvirt-gconfig-helpers.c (+4/-3)
libvirt-gconfig/libvirt-gconfig-interface.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-network-filter.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-network.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-node-device.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-object-private.h (+2/-0)
libvirt-gconfig/libvirt-gconfig-object.c (+22/-12)
libvirt-gconfig/libvirt-gconfig-private.h (+1/-0)
libvirt-gconfig/libvirt-gconfig-secret.c (+3/-3)
libvirt-gconfig/libvirt-gconfig-storage-permissions.c (+63/-0)
libvirt-gconfig/libvirt-gconfig-storage-permissions.h (+4/-0)
libvirt-gconfig/libvirt-gconfig-storage-pool-source.c (+132/-0)
libvirt-gconfig/libvirt-gconfig-storage-pool-source.h (+8/-0)
libvirt-gconfig/libvirt-gconfig-storage-pool-target.c (+39/-0)
libvirt-gconfig/libvirt-gconfig-storage-pool-target.h (+2/-0)
libvirt-gconfig/libvirt-gconfig-storage-pool.c (+146/-3)
libvirt-gconfig/libvirt-gconfig-storage-pool.h (+8/-0)
libvirt-gconfig/libvirt-gconfig-storage-vol.c (+3/-3)
libvirt-gconfig/libvirt-gconfig.h (+3/-0)
libvirt-gconfig/libvirt-gconfig.sym (+88/-1)
libvirt-gconfig/tests/Makefile.am (+1/-1)
libvirt-gconfig/tests/Makefile.in (+118/-63)
libvirt-gconfig/tests/test-domain-create.c (+19/-3)
libvirt-glib.spec (+1/-1)
libvirt-glib/Makefile.am (+1/-0)
libvirt-glib/Makefile.in (+121/-67)
libvirt-glib/libvirt-glib-error.c (+3/-0)
libvirt-glib/libvirt-glib-error.h (+6/-6)
libvirt-glib/libvirt-glib-main.c (+4/-0)
libvirt-gobject/Makefile.in (+121/-68)
libvirt-gobject/libvirt-gobject-connection.c (+23/-21)
libvirt-gobject/libvirt-gobject-domain-snapshot.c (+10/-10)
libvirt-gobject/libvirt-gobject-domain.c (+13/-13)
libvirt-gobject/libvirt-gobject-interface.c (+10/-10)
libvirt-gobject/libvirt-gobject-main.c (+2/-2)
libvirt-gobject/libvirt-gobject-manager.c (+3/-3)
libvirt-gobject/libvirt-gobject-network-filter.c (+3/-3)
libvirt-gobject/libvirt-gobject-network.c (+10/-10)
libvirt-gobject/libvirt-gobject-node-device.c (+10/-10)
libvirt-gobject/libvirt-gobject-secret.c (+12/-12)
libvirt-gobject/libvirt-gobject-storage-pool.c (+2/-2)
libvirt-gobject/libvirt-gobject-storage-vol.c (+10/-10)
libvirt-gobject/libvirt-gobject-stream.c (+8/-6)
m4/intltool.m4 (+237/-0)
m4/virt-gettext.m4 (+5/-0)
po/Makefile.in.in (+222/-0)
po/POTFILES.in (+4/-0)
python/Makefile.am (+1/-1)
python/Makefile.in (+108/-55)
vapi/LibvirtGObject-1.0.metadata (+0/-2)
vapi/Makefile.am (+1/-1)
vapi/Makefile.in (+84/-37)
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/GVirConfig Interface. html
docs/libvirt- gobject/ html/GVirInterf ace.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/GVirConfig Capabilities. html
docs/libvirt- gconfig/ html/GVirConfig Domain. html
docs/libvirt- gconfig/ html/GVirConfig DomainSnapshot. html
docs/libvirt- gconfig/ html/GVirConfig Network. html
docs/libvirt- gconfig/ html/GVirConfig NetworkFilter. html
docs/libvirt- gconfig/ html/GVirConfig NodeDevice. html
docs/libvirt- gconfig/ html/GVirConfig Object. html
docs/libvirt- gconfig/ html/GVirConfig Secret. html
docs/libvirt- gconfig/ html/GVirConfig StoragePool. html
docs/libvirt- gconfig/ html/GVirConfig StorageVol. 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/GVirConnec tion.html
docs/libvirt- gobject/ html/GVirDomain .html
docs/libvirt- gobject/ html/GVirDomain Snapshot. html
docs/libvirt- gobject/ html/GVirManage r.html
docs/libvirt- gobject/ html/GVirNetwor k.html
docs/libvirt- gobject/ html/GVirNetwor kFilter. html
docs/libvirt- gobject/ html/GVirNodeDe vice.html
docs/libvirt- gobject/ html/GVirSecret .html
docs/libvirt- gobject/ html/GVirStorag ePool.html
docs/libvirt- gobject/ html/GVirStorag eVol.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 - 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
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