Merge lp:~manishsinha/gedit/enable-zeitgeist-datasource-plugin into lp:~ubuntu-desktop/gedit/ubuntu

[Manish Sinha (मनीष सिन्हा)]

Append libzeitgeist-dev as build-depends and libzeitgeist-1.0-1 as gedit dependency to enable zeitgeist-dataprovider plugin

Append libzeitgeist-dev as build-depends and libzeitgeist-1.0-1 as gedit dependency to enable zeitgeist-dataprovider plugin

[Jeremy Bícha (jbicha)]

Thank you! I've merged this into our packaging branch but I think we should figure out whether to enable this by default before we push a package update.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Some additional comment on the merge req (same for the totem one that has been merged as well):
+ libzeitgeist-1.0-1
-> this isn't needed and in addition, should be avoided at soon as possible. You are forcing a dependency on a versionned libzeitgeist soname, which means that if we have a new libzeitgeist, we need to change the gedit packaging (and all other packages depending on libzeitgeist, which will be a lot). Basically we just rebuild them.
libzeitgeist-1.0-1 (>= 0.3.2) is automatically added by dh_shlibdeps which expands ${shlibs:Depends}, and replace with library dependencies.

I fixed it directly in gedit upload and going to fix totem as well. If you want more info on that, please use man dh_shlibdeps ;)

I activated the plugin by default as well.
Thanks for your work there!

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-17 15:18:05 +0000
+++ debian/changelog	2011-10-27 13:00:29 +0000
@@ -1,3 +1,10 @@
+gedit (3.2.1-0ubuntu2) oneiric; urgency=low
+
+  * Append libzeitgeist-dev as build-depends and libzeitgeist-1.0-1 as 
+    gedit dependency to enable zeitgeist-dataprovider plugin
+
+ -- Manish Sinha <[e-mail]>  Thu, 27 Oct 2011 18:23:34 +0530
+
 gedit (3.2.1-0ubuntu1) oneiric-proposed; urgency=low
 
   * New upstream version (LP: #876592)

=== modified file 'debian/control'
--- debian/control	2011-10-17 14:45:56 +0000
+++ debian/control	2011-10-27 13:00:29 +0000
@@ -32,7 +32,8 @@
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
                scrollkeeper,
-               liblaunchpad-integration-3.0-dev
+               liblaunchpad-integration-3.0-dev,
+               libzeitgeist-dev
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk-3-doc,
                      libgtksourceview-3.0-doc
@@ -52,7 +53,8 @@
          gir1.2-glib-2.0,
          gir1.2-peas-1.0,
          gir1.2-gtk-3.0,
-         iso-codes
+         iso-codes,
+         libzeitgeist-1.0-1
 Conflicts: gir1.2-gedit-3.0
 Breaks: seahorse (<< 2.24),
         seahorse-plugins (<< 2.26),

=== modified file 'debian/control.in'
--- debian/control.in	2011-10-17 14:45:56 +0000
+++ debian/control.in	2011-10-27 13:00:29 +0000
@@ -27,7 +27,8 @@
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
                scrollkeeper,
-               liblaunchpad-integration-3.0-dev
+               liblaunchpad-integration-3.0-dev,
+               libzeitgeist-dev
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk-3-doc,
                      libgtksourceview-3.0-doc
@@ -47,7 +48,8 @@
          gir1.2-glib-2.0,
          gir1.2-peas-1.0,
          gir1.2-gtk-3.0,
-         iso-codes
+         iso-codes,
+         libzeitgeist-1.0-1
 Conflicts: gir1.2-gedit-3.0
 Breaks: seahorse (<< 2.24),
         seahorse-plugins (<< 2.26),