[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.13.12-1

[Simon McVittie]

The following commit has been merged in the debian branch:
commit f81820c72be49939f3a42cf986e83fd1417622b4
Merge: d935bc7ca0b9bf45a3f11492e94e09360922af12 603553e564ed31cd356c4dda3a61e2d274541b4e
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jul 26 18:16:11 2010 +0100

    Merge branch 'debian' into debian-experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 152e212,723e474..04a7d14
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,29 @@@
++telepathy-glib (0.11.11-1+exp1) experimental; urgency=low
++
++  * Merge from unstable: new upstream version
++
++ -- Simon McVittie <smcv at debian.org>  Thu, 15 Jul 2010 11:52:25 +0100
++
+ telepathy-glib (0.11.11-1) unstable; urgency=low
+ 
+   * New upstream release (new API, ABI)
+   * Standards-Version: 3.9.1 (no changes needed)
+   * Update debhelper compat level to 7
+   * Partial merge from experimental:
+     - really get the documentation directories right if using dh_buildinfo
+ 
+  -- Simon McVittie <smcv at debian.org>  Mon, 26 Jul 2010 17:54:02 +0100
+ 
 +telepathy-glib (0.11.10-1+exp1) experimental; urgency=low
 +
 +  * Enable the experimental Vala bindings and install them in
 +    libtelepathy-glib-dev
 +  * Add telepathy-glib.deps (taken from upstream git) and install it alongside
 +    the Vala bindings, to have correct interdependencies
 +  * Really get the documentation directories right if using dh_buildinfo
 +
 + -- Simon McVittie <smcv at debian.org>  Thu, 15 Jul 2010 11:52:25 +0100
 +
  telepathy-glib (0.11.10-1) unstable; urgency=low
  
    [ Jonny Lamb ]
diff --combined debian/control
index 51a5e55,4f989d6..d75d697
--- a/debian/control
+++ b/debian/control
@@@ -16,13 -16,11 +16,13 @@@ Build-Depends: cdbs
                 libglib2.0-dev (>= 2.24),
                 libdbus-glib-1-dev (>= 0.82),
                 libdbus-1-dev (>= 0.95),
 +               libvala-dev (>= 0.9.3),
 +               valac (>= 0.9.3),
                 xsltproc,
                 python,
                 gtk-doc-tools (>= 1.15),
                 pkg-config (>= 0.21)
- Standards-Version: 3.9.0
+ Standards-Version: 3.9.1
  Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-glib.git
  Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-glib.git
  Homepage: http://telepathy.freedesktop.org/wiki/
diff --combined debian/rules
index c1afa42,aa81b91..cdb95b6
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,6 +1,6 @@@
  #!/usr/bin/make -f
  
- DEB_DH_MAKESHLIBS_ARGS_libtelepathy-glib0 := -V"libtelepathy-glib0 (>= 0.11.9)"
+ DEB_DH_MAKESHLIBS_ARGS_libtelepathy-glib0 := -V"libtelepathy-glib0 (>= 0.11.11)"
  
  include /usr/share/cdbs/1/rules/utils.mk
  include /usr/share/cdbs/1/class/autotools.mk
@@@ -18,7 -18,6 +18,7 @@@ DEB_MAKE_CHECK_TARGET := chec
  DEB_CONFIGURE_EXTRA_FLAGS := \
  	--disable-Werror \
  	--enable-introspection \
 +	--enable-vala-bindings \
  	--enable-gtk-doc \
  	--with-html-dir=\$${prefix}/share/doc/libtelepathy-glib-doc
  

-- 
telepathy-glib packaging