diff -Nru gssdp-0.12.2.1/debian/changelog gssdp-0.12.2.1/debian/changelog
--- gssdp-0.12.2.1/debian/changelog	2012-08-24 02:32:10.000000000 +0000
+++ gssdp-0.12.2.1/debian/changelog	2012-09-09 21:08:04.000000000 +0000
@@ -1,3 +1,26 @@
+gssdp (0.12.2.1-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Build-depend on valac-0.18
+  * Drop standards version bump as this isn't worth maintaining a diff for
+    - update debain/control
+  * This upload includes replaces on gupnp-vala fixing LP: #1048113
+
+ -- Micah Gersten <micahg@ubuntu.com>  Sun, 09 Sep 2012 16:00:55 -0500
+
+gssdp (0.12.2.1-1) unstable; urgency=low
+
+  * Bump to debhelper compatibility level 9
+  * Imported Upstream version 0.12.2.1
+  * Vala API is now generated from introspection:
+    - build-depend on valac (>= 0.14)
+    - install gssdp-1.0.{vapi,deps} in libgssdp-1.0-dev
+    - replace existing versions of gupnp-vala
+      (0.10.4 will no longer build these files, if built on top
+       of this gssdp version)
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 02 Sep 2012 18:32:18 +0200
+
 gssdp (0.12.2.1-0ubuntu1) quantal; urgency=low
 
   * New upstream release
diff -Nru gssdp-0.12.2.1/debian/compat gssdp-0.12.2.1/debian/compat
--- gssdp-0.12.2.1/debian/compat	2012-08-24 02:32:10.000000000 +0000
+++ gssdp-0.12.2.1/debian/compat	2012-09-02 21:09:59.000000000 +0000
@@ -1 +1 @@
-5
+9
diff -Nru gssdp-0.12.2.1/debian/control gssdp-0.12.2.1/debian/control
--- gssdp-0.12.2.1/debian/control	2012-08-24 02:32:10.000000000 +0000
+++ gssdp-0.12.2.1/debian/control	2012-09-09 21:07:20.000000000 +0000
@@ -1,18 +1,19 @@
 Source: gssdp
 Section: libs
 Priority: optional
-Maintainer: Ross Burton <ross@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
 Uploaders: Andreas Henriksson <andreas@fatal.se>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 9),
                cdbs,
                libglib2.0-dev (>= 2.18),
-               valac-0.18,
                gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.12),
                gir1.2-glib-2.0,
                libsoup2.4-dev (>= 2.26.1),
-               libgtk2.0-dev
-Standards-Version: 3.9.3
+               libgtk2.0-dev,
+               valac-0.18,
+Standards-Version: 3.9.2
 Homepage: http://www.gupnp.org
 Vcs-Git: git://git.debian.org/git/collab-maint/gssdp.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/gssdp.git
@@ -44,7 +45,7 @@
 Architecture: any
 Depends: libgssdp-1.0-3 (= ${binary:Version}), gir1.2-gssdp-1.0, libsoup2.4-dev, ${misc:Depends}
 Suggests: libgssdp-doc
-Replaces: gir-repository-dev (<= 0.6.5-5)
+Replaces: gir-repository-dev (<= 0.6.5-5), gupnp-vala (<= 0.10.4)
 Description: GObject-based library for SSDP (development files)
  A GObject-based API for doing SSDP (Simple Service Discovery Protocol)
  transparently.
diff -Nru gssdp-0.12.2.1/debian/libgssdp-1.0-dev.install gssdp-0.12.2.1/debian/libgssdp-1.0-dev.install
--- gssdp-0.12.2.1/debian/libgssdp-1.0-dev.install	2012-08-24 02:32:10.000000000 +0000
+++ gssdp-0.12.2.1/debian/libgssdp-1.0-dev.install	2012-09-09 21:00:34.000000000 +0000
@@ -3,4 +3,5 @@
 usr/lib/*.so
 usr/lib/pkgconfig/*
 usr/share/gir-1.0/GSSDP-1.0.gir
-usr/share/vala
+usr/share/vala/vapi/gssdp-1.0.vapi
+usr/share/vala/vapi/gssdp-1.0.deps