r53852 - in /desktop/unstable/gnome-documents/debian: changelog control control.in patches/git_build-with-tracker2.patch patches/series

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Wed Sep 13 20:11:31 UTC 2017


Author: jbicha
Date: Wed Sep 13 20:11:30 2017
New Revision: 53852

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53852
Log:
Depend and Build-Depend on tracker 2 instead of tracker 1

Added:
    desktop/unstable/gnome-documents/debian/patches/git_build-with-tracker2.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=53852&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/changelog	[utf-8] Wed Sep 13 20:11:30 2017
@@ -1,3 +1,9 @@
+gnome-documents (3.22.5-2) UNRELEASED; urgency=medium
+
+  * Depend and Build-Depend on tracker 2 instead of tracker 1
+
+ -- Jeremy Bicha <jbicha at debian.org>  Thu, 31 Aug 2017 19:43:17 -0400
+
 gnome-documents (3.22.5-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control?rev=53852&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control	[utf-8] Wed Sep 13 20:11:30 2017
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: autoconf-archive (>= 20160320),
                debhelper (>= 10),
                desktop-file-utils,
@@ -28,8 +28,8 @@
                libgoa-1.0-dev (>= 3.10),
                libgtk-3-dev (>= 3.19.1),
                libsoup2.4-dev (>= 2.41.3),
-               libtracker-control-1.0-dev (>= 0.17.3),
-               libtracker-sparql-1.0-dev,
+               libtracker-control-2.0-dev (>= 0.17.3),
+               libtracker-sparql-2.0-dev,
                libwebkit2gtk-4.0-dev (>= 2.6.0),
                libzapojit-dev (>= 0.0.2-2),
                poppler-utils,
@@ -49,7 +49,7 @@
          gir1.2-gepub-0.5,
          gir1.2-gdkpixbuf-2.0,
          gir1.2-pango-1.0,
-         gir1.2-tracker-1.0,
+         gir1.2-tracker-2.0,
          gir1.2-webkit2-4.0,
          tracker (>= 0.17.3),
          gjs (>= 1.32.0-3)

Modified: desktop/unstable/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control.in?rev=53852&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control.in	[utf-8] Wed Sep 13 20:11:30 2017
@@ -24,8 +24,8 @@
                libgoa-1.0-dev (>= 3.10),
                libgtk-3-dev (>= 3.19.1),
                libsoup2.4-dev (>= 2.41.3),
-               libtracker-control-1.0-dev (>= 0.17.3),
-               libtracker-sparql-1.0-dev,
+               libtracker-control-2.0-dev (>= 0.17.3),
+               libtracker-sparql-2.0-dev,
                libwebkit2gtk-4.0-dev (>= 2.6.0),
                libzapojit-dev (>= 0.0.2-2),
                poppler-utils,
@@ -45,7 +45,7 @@
          gir1.2-gepub-0.5,
          gir1.2-gdkpixbuf-2.0,
          gir1.2-pango-1.0,
-         gir1.2-tracker-1.0,
+         gir1.2-tracker-2.0,
          gir1.2-webkit2-4.0,
          tracker (>= 0.17.3),
          gjs (>= 1.32.0-3)

Added: desktop/unstable/gnome-documents/debian/patches/git_build-with-tracker2.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/git_build-with-tracker2.patch?rev=53852&op=file
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/git_build-with-tracker2.patch	(added)
+++ desktop/unstable/gnome-documents/debian/patches/git_build-with-tracker2.patch	[utf-8] Wed Sep 13 20:11:30 2017
@@ -0,0 +1,49 @@
+From 92836b1abbae6a832380523f748c9ecaef897148 Mon Sep 17 00:00:00 2001
+From: Carlos Garnacho <carlosg at gnome.org>
+Date: Wed, 28 Jun 2017 23:31:02 +0200
+Subject: build: Depend on libtracker-[sparql|control]-2.0
+
+No code changes needed. They are API compatible with current usage
+in gnome-documents.
+---
+ configure.ac |    8 ++++----
+ src/main.js  |    4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,8 +79,8 @@ PKG_CHECK_MODULES(DOCUMENTS,
+                   gtk+-3.0 >= $GTK_MIN_VERSION
+                   libsoup-2.4 >= $SOUP_MIN_VERSION
+                   gnome-desktop-3.0
+-                  tracker-control-1.0 >= $TRACKER_MIN_VERSION
+-                  tracker-sparql-1.0 >= $TRACKER_MIN_VERSION)
++                  tracker-control-2.0 >= $TRACKER_MIN_VERSION
++                  tracker-sparql-2.0 >= $TRACKER_MIN_VERSION)
+ 
+ # Although GTK+ 3.10 includes hi-dpi functionality, it does not require a cairo with
+ # cairo_surface_set_device_scale(), which we also need if we're to support hi-dpi,
+@@ -113,8 +113,8 @@ AX_CHECK_GIRS_GJS([GObject], [2.0])
+ AX_CHECK_GIR_SYMBOLS_GJS([Gtk], [3.0], [ShortcutsWindow ShortcutsSection
+   ShortcutsGroup ShortcutsShortcut])
+ AX_CHECK_GIRS_GJS([Pango], [1.0])
+-AX_CHECK_GIRS_GJS([Tracker], [1.0])
+-AX_CHECK_GIRS_GJS([TrackerControl], [1.0])
++AX_CHECK_GIRS_GJS([Tracker], [2.0])
++AX_CHECK_GIRS_GJS([TrackerControl], [2.0])
+ AX_CHECK_GIRS_GJS([WebKit2], [4.0])
+ AX_CHECK_GIRS_GJS([Zpj], [0.0])
+ AX_CHECK_GIRS_GJS([Gepub], [0.5])
+--- a/src/main.js
++++ b/src/main.js
+@@ -33,8 +33,8 @@ pkg.require({ 'EvinceDocument': '3.0',
+               'Goa': '1.0',
+               'Gtk': '3.0',
+               'GObject': '2.0',
+-              'Tracker': '1.0',
+-              'TrackerControl': '1.0',
++              'Tracker': '2.0',
++              'TrackerControl': '2.0',
+               'WebKit2': '4.0' });
+ 
+ const Application = imports.application;

Modified: desktop/unstable/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/series?rev=53852&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/series	[utf-8] Wed Sep 13 20:11:30 2017
@@ -1,3 +1,4 @@
 90_drop-onlyshowin.patch
 gnome-documents-xdg-fail.patch
 git_require-gepub-0.5.patch
+git_build-with-tracker2.patch




More information about the pkg-gnome-commits mailing list