r41668 - in /desktop/unstable/gnome-documents/debian: changelog control control.in patches/01-tracker-1.0.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat May 10 00:22:39 UTC 2014


Author: biebl
Date: Sat May 10 00:22:39 2014
New Revision: 41668

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41668
Log:
Switch to tracker 1.0. (Closes: #741429)

Added:
    desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch
Modified:
    desktop/unstable/gnome-documents/debian/changelog
    desktop/unstable/gnome-documents/debian/control
    desktop/unstable/gnome-documents/debian/control.in
    desktop/unstable/gnome-documents/debian/patches/series

Modified: desktop/unstable/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/changelog?rev=41668&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/changelog	[utf-8] Sat May 10 00:22:39 2014
@@ -5,6 +5,9 @@
   * Bump dh compat to 9
   * debian/control.in:
     - Build-depend on desktop-file-utils
+
+  [ Michael Biebl ]
+  * Switch to tracker 1.0. (Closes: #741429)
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 03 Sep 2013 18:34:20 +0200
 

Modified: desktop/unstable/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control?rev=41668&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control	[utf-8] Sat May 10 00:22:39 2014
@@ -2,11 +2,12 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: gnome-documents
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at ubuntu.com>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: dh-autoreconf,
                debhelper (>= 9),
                desktop-file-utils,
@@ -24,8 +25,8 @@
                libgoa-1.0-dev (>= 3.2.0),
                libgtk-3-dev (>= 3.7.10),
                libsoup2.4-dev (>= 2.41.3),
-               libtracker-miner-0.16-dev (>= 0.16.0),
-               libtracker-sparql-0.16-dev (>= 0.16.0),
+               libtracker-miner-1.0-dev (>= 0.17.3),
+               libtracker-sparql-1.0-dev (>= 0.17.3),
                libwebkitgtk-3.0-dev (>= 1.10.0),
                libzapojit-dev (>= 0.0.2-2),
                poppler-utils,
@@ -45,9 +46,9 @@
          gir1.2-gnomedesktop-3.0,
          gir1.2-goa-1.0,
          gir1.2-gtk-3.0,
-         gir1.2-tracker-0.16,
+         gir1.2-tracker-1.0,
          gir1.2-webkit-3.0,
-         tracker (>= 0.16.0),
+         tracker (>= 0.17.3),
          gjs (>= 1.32.0-3)
 Recommends: gnome-user-guide,
             unoconv

Modified: desktop/unstable/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control.in?rev=41668&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control.in	[utf-8] Sat May 10 00:22:39 2014
@@ -20,8 +20,8 @@
                libgoa-1.0-dev (>= 3.2.0),
                libgtk-3-dev (>= 3.7.10),
                libsoup2.4-dev (>= 2.41.3),
-               libtracker-miner-0.16-dev (>= 0.16.0),
-               libtracker-sparql-0.16-dev (>= 0.16.0),
+               libtracker-miner-1.0-dev (>= 0.17.3),
+               libtracker-sparql-1.0-dev (>= 0.17.3),
                libwebkitgtk-3.0-dev (>= 1.10.0),
                libzapojit-dev (>= 0.0.2-2),
                poppler-utils,
@@ -41,9 +41,9 @@
          gir1.2-gnomedesktop-3.0,
          gir1.2-goa-1.0,
          gir1.2-gtk-3.0,
-         gir1.2-tracker-0.16,
+         gir1.2-tracker-1.0,
          gir1.2-webkit-3.0,
-         tracker (>= 0.16.0),
+         tracker (>= 0.17.3),
          gjs (>= 1.32.0-3)
 Recommends: gnome-user-guide,
             unoconv

Added: desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch?rev=41668&op=file
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch	(added)
+++ desktop/unstable/gnome-documents/debian/patches/01-tracker-1.0.patch	[utf-8] Sat May 10 00:22:39 2014
@@ -0,0 +1,103 @@
+diff --git a/configure.ac b/configure.ac
+index 3404888..89298ea 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,7 +66,7 @@ GTK_MIN_VERSION=3.7.7
+ GOBJECT_INTROSPECTION_MIN_VERSION=1.31.6
+ GDATA_MIN_VERSION=0.13.3
+ GOA_MIN_VERSION=3.2.0
+-TRACKER_MIN_VERSION=0.13.1
++TRACKER_MIN_VERSION=0.17.3
+ ZAPOJIT_MIN_VERSION=0.0.2
+ SOUP_MIN_VERSION=2.41.3
+ 
+@@ -82,8 +82,8 @@ PKG_CHECK_MODULES(DOCUMENTS,
+                   gtk+-3.0 >= $GTK_MIN_VERSION
+                   libsoup-2.4 >= $SOUP_MIN_VERSION
+                   gnome-desktop-3.0
+-                  tracker-miner-0.16 >= $TRACKER_MIN_VERSION
+-                  tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
++                  tracker-control-1.0 >= $TRACKER_MIN_VERSION
++                  tracker-sparql-1.0 >= $TRACKER_MIN_VERSION
+                   goa-1.0 >= $GOA_MIN_VERSION
+                   libgdata >= $GDATA_MIN_VERSION
+                   zapojit-0.0 >= $ZAPOJIT_MIN_VERSION
+diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
+index 6b7385f..51347b5 100644
+--- a/src/Makefile-lib.am
++++ b/src/Makefile-lib.am
+@@ -63,7 +63,6 @@ GdPrivate_1_0_gir_INCLUDES = \
+    Gtk-3.0 \
+    EvinceDocument-3.0 \
+    EvinceView-3.0 \
+-   TrackerMiner-0.16 \
+    Zpj-0.0
+ 
+ GdPrivate_1_0_gir_FILES = \
+diff --git a/src/application.js b/src/application.js
+index 85eb613..d70c169 100644
+--- a/src/application.js
++++ b/src/application.js
+@@ -28,8 +28,8 @@ const _ = imports.gettext.gettext;
+ // Import versions go here
+ imports.gi.versions.GdPrivate = '1.0';
+ imports.gi.versions.Gd = '1.0';
+-imports.gi.versions.Tracker = '0.16';
+-imports.gi.versions.TrackerMiner = '0.16';
++imports.gi.versions.Tracker = '1.0';
++imports.gi.versions.TrackerControl = '1.0';
+ imports.gi.versions.EvinceDocument = '3.0';
+ imports.gi.versions.Goa = '1.0';
+ 
+@@ -41,7 +41,7 @@ const Goa = imports.gi.Goa;
+ const Gtk = imports.gi.Gtk;
+ const GLib = imports.gi.GLib;
+ const Tracker = imports.gi.Tracker;
+-const TrackerMiner = imports.gi.TrackerMiner;
++const TrackerControl = imports.gi.TrackerControl;
+ 
+ const ChangeMonitor = imports.changeMonitor;
+ const Documents = imports.documents;
+@@ -107,7 +107,7 @@ const Application = new Lang.Class({
+     },
+ 
+     _initGettingStarted: function() {
+-        let manager = TrackerMiner.MinerManager.new_full(false);
++        let manager = TrackerControl.MinerManager.new_full(false);
+ 
+         let languages = GLib.get_language_names();
+         let files = languages.map(
+diff --git a/src/lib/gd-utils.h b/src/lib/gd-utils.h
+index fe0bb6a..5595761 100644
+--- a/src/lib/gd-utils.h
++++ b/src/lib/gd-utils.h
+@@ -24,7 +24,6 @@
+ 
+ #include <gtk/gtk.h>
+ #include <evince-view.h>
+-#include <libtracker-miner/tracker-miner.h>
+ 
+ void gd_queue_thumbnail_job_for_file_async (GFile *file,
+                                             GAsyncReadyCallback callback,
+diff --git a/src/notifications.js b/src/notifications.js
+index a32e353..179add3 100644
+--- a/src/notifications.js
++++ b/src/notifications.js
+@@ -23,7 +23,7 @@ const Gd = imports.gi.Gd;
+ const Gio = imports.gi.Gio;
+ const GLib = imports.gi.GLib;
+ const Gtk = imports.gi.Gtk;
+-const TrackerMiner = imports.gi.TrackerMiner;
++const TrackerControl = imports.gi.TrackerControl;
+ const _ = imports.gettext.gettext;
+ 
+ const Application = imports.application;
+@@ -105,7 +105,7 @@ const IndexingNotification = new Lang.Class({
+         this._timeoutId = 0;
+ 
+         try {
+-            this._manager = TrackerMiner.MinerManager.new_full(false);
++            this._manager = TrackerControl.MinerManager.new_full(false);
+             this._manager.connect('miner-progress', Lang.bind(this, this._checkNotification));
+         } catch(e) {
+             log('Unable to create a TrackerMinerManager, indexing progress ' +

Modified: desktop/unstable/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/series?rev=41668&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/series	[utf-8] Sat May 10 00:22:39 2014
@@ -1,2 +1,3 @@
+01-tracker-1.0.patch
 02-no-gettext.patch
 90_drop-onlyshowin.patch




More information about the pkg-gnome-commits mailing list