Merge lp:~rodrigo-moya/ubuntu/natty/couchdb-glib/enable-debug-messages into lp:~ubuntu-desktop/couchdb-glib/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-01 15:48:15 +0000
+++ debian/changelog	2011-04-06 15:49:24 +0000
@@ -1,7 +1,16 @@
+couchdb-glib (0.7.2-0ubuntu2) natty; urgency=low
+
+  * debian/rules:
+    - Remove --disable-debug-messages, as the problem we had when adding this
+      flag is now solved. Debugging messages will only show up when users
+      set COUCHDB_DEBUG_MESSAGES environment variable
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 06 Apr 2011 17:33:39 +0200
+
 couchdb-glib (0.7.2-0ubuntu1) natty; urgency=low
 
   * New upstream release
-    - - Port to gdbus (Rodrigo Moya)
+    - Port to gdbus (Rodrigo Moya)
     - Add some more tests for desktopcouch (Rodrigo Moya)
     - Use g_strcmp0 instead of g_str_equal (Rodrigo Moya) (LP: #727370)
 

=== modified file 'debian/rules'
--- debian/rules	2010-11-24 16:57:03 +0000
+++ debian/rules	2011-04-06 15:49:24 +0000
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes --disable-debug-messages
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --enable-introspection=yes
 
 binary-predeb/gir1.0-couchdb-glib-1.0::
 	dh_girepository -pgir1.0-couchdb-glib-1.0