Merge lp:~rodrigo-moya/ubuntu/natty/couchdb-glib/0_7_0_release into lp:~ubuntu-desktop/couchdb-glib/ubuntu

[Rodrigo Moya]

[lp:~rodrigo-moya/ubuntu/natty/couchdb-glib/0_7_0_release]

26. By Rodrigo Moya on 2010-11-24

releasing version 0.7.0-0ubuntu2

27. By Rodrigo Moya on 2010-11-24

Rename introspection packages

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-31 14:39:57 +0000
+++ debian/changelog	2010-11-24 17:10:13 +0000
@@ -1,3 +1,31 @@
+couchdb-glib (0.7.0-0ubuntu2) natty; urgency=low
+
+  * debian/rules:
+    - Add rules for dh_girepository
+  * debian/libcouchdb-glib-dev.install:
+  * debian/libdesktopcouch-glib-dev.install:
+    - Add .gir files to -dev packages
+  * debian/control:
+  * debian/gir1.0-couchdb-1.0.install:
+  * debian/gir1.0-desktopcouch-1.0.install:
+    - Rename introspection packages to match the typelib names
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 24 Nov 2010 17:13:47 +0100
+
+couchdb-glib (0.7.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release:
+    - Fix two more small memleaks (Krzysztof Klimonda)
+    - Use silent building if available (Rodrigo Moya)
+    - Fix make distcheck (Rodrigo Moya)
+    - Add CouchdbResponse and CouchdbQuery classes (Krzysztof Klimonda)
+    - Add couchdb_encode_uri functions (Krzysztof Klimonda)
+    - Include Json-1.0 for introspection (Rodrigo Moya)
+  * debian/control:
+    - Remove dependency on gir-repository-dev
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 24 Nov 2010 16:48:42 +0100
+
 couchdb-glib (0.6.96-0ubuntu1) maverick; urgency=low
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2010-05-31 11:07:23 +0000
+++ debian/control	2010-11-24 17:10:13 +0000
@@ -14,7 +14,6 @@
  libgnome-keyring-dev,
  libdbus-glib-1-dev,
  gtk-doc-tools,
- gir-repository-dev,
  gir1.0-glib-2.0,
  gir1.0-json-glib-1.0,
  libgirepository1.0-dev (>= 0.6.3),
@@ -76,9 +75,11 @@
  a CouchDB instance on-demand for each user and managing
  OAuth keys and replication for that CouchDB instance.
 
-Package: gir1.0-couchdb-glib-1.0
+Package: gir1.0-couchdb-1.0
 Section: libs
 Architecture: any
+Conflicts: gir1.0-couchdb-glib-1.0
+Replaces: gir1.0-couchdb-glib-1.0
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
@@ -93,9 +94,11 @@
  It can be used by packages using the GIRepository format to generate
  dynamic bindings.
 
-Package: gir1.0-desktopcouch-glib-1.0
+Package: gir1.0-desktopcouch-1.0
 Section: libs
 Architecture: any
+Conflicts: gir1.0-desktopcouch-glib-1.0
+Replaces: gir1.0-desktopcouch-glib-1.0
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}

=== renamed file 'debian/gir1.0-couchdb-glib-1.0.install' => 'debian/gir1.0-couchdb-1.0.install'
=== renamed file 'debian/gir1.0-desktopcouch-glib-1.0.install' => 'debian/gir1.0-desktopcouch-1.0.install'
=== modified file 'debian/libcouchdb-glib-dev.install'
--- debian/libcouchdb-glib-dev.install	2010-02-19 20:20:31 +0000
+++ debian/libcouchdb-glib-dev.install	2010-11-24 17:10:13 +0000
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/libcouchdb-glib*.so
 debian/tmp/usr/lib/pkgconfig/couchdb-glib*.pc
 debian/tmp/usr/include/couchdb-glib-1.0/
+debian/tmp/usr/share/gir-1.0/Couchdb-1.0.gir

=== modified file 'debian/libdesktopcouch-glib-dev.install'
--- debian/libdesktopcouch-glib-dev.install	2010-02-19 20:20:31 +0000
+++ debian/libdesktopcouch-glib-dev.install	2010-11-24 17:10:13 +0000
@@ -1,3 +1,4 @@
 debian/tmp/usr/lib/libdesktopcouch-glib*.so
 debian/tmp/usr/lib/pkgconfig/desktopcouch-glib-1.0.pc
 debian/tmp/usr/include/desktopcouch-glib-1.0/
+debian/tmp/usr/share/gir-1.0/Desktopcouch-1.0.gir

=== modified file 'debian/rules'
--- debian/rules	2010-07-27 09:40:18 +0000
+++ debian/rules	2010-11-24 17:10:13 +0000
@@ -4,3 +4,9 @@
 include /usr/share/cdbs/1/class/gnome.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes --disable-debug-messages
+
+binary-predeb/gir1.0-couchdb-glib-1.0::
+	dh_girepository -pgir1.0-couchdb-glib-1.0
+
+binary-predeb/gir1.0-desktopcouch-glib-1.0::
+	dh_girepository -pgir1.0-desktopcouch-glib-1.0