[Pkg-cli-libs-commits] [dbus-sharp-glib] 03/06: Merge tag 'upstream/0.6.0'

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/0.6.0-1
in repository dbus-sharp-glib.

commit bd3cf33f48fbaecc47c10926642cad41be22d85b
Merge: 763e892 851b476
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Oct 11 12:13:54 2013 +0200

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    Conflicts:
    	dbus-sharp-glib-2.0.pc.in

 INSTALL                                            |   15 +-
 Makefile.am                                        |    6 +-
 Makefile.in                                        |  415 +++--
 aclocal.m4                                         |  582 ++++---
 config.guess                                       | 1501 -----------------
 config.sub                                         | 1705 --------------------
 configure                                          |  629 ++++----
 configure.ac                                       |   22 +-
 ...arp-glib-1.0.pc.in => dbus-sharp-glib-2.0.pc.in |    4 +-
 examples/Makefile.in                               |  128 +-
 install-sh                                         |   35 +-
 missing                                            |  461 ++----
 src/GLib.cs                                        |    3 +-
 src/Makefile.in                                    |  129 +-
 14 files changed, 1284 insertions(+), 4351 deletions(-)

diff --cc dbus-sharp-glib-2.0.pc.in
index 4bd516b,80de747..61191d7
--- a/dbus-sharp-glib-2.0.pc.in
+++ b/dbus-sharp-glib-2.0.pc.in
@@@ -6,5 -6,5 +6,5 @@@ Name: Managed DBus GLib integratio
  Description: GLib integration for dbus-sharp, the D-Bus IPC library
  Version: @VERSION@
  URL: http://mono.github.com/dbus-sharp/
- Requires: dbus-sharp-1.0
+ Requires: dbus-sharp-2.0
 -Libs: -r:${libdir}/mono/@PACKAGE at -@API_VERSION@/dbus-sharp-glib.dll
 +Libs: -r:${libdir}/cli/@PACKAGE at -@API_VERSION@/dbus-sharp-glib.dll

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/dbus-sharp-glib.git