[tracker-miners: 2/2] Merge branch 'sam/config.h-subproject-warning' into 'master'

From: Sam Thursfield <sthursfield src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker-miners: 2/2] Merge branch 'sam/config.h-subproject-warning' into 'master'
Date: Sun, 14 Jul 2019 10:47:07 +0000 (UTC)
commit 7d28aa87ff85940c50e7fb8eb64ef209f01dbb65
Merge: f3550b4ad 54144c9a0
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Jul 14 10:46:50 2019 +0000

    Merge branch 'sam/config.h-subproject-warning' into 'master'
    
    Rename config.h to config-miners.h
    
    See merge request GNOME/tracker-miners!84

 config.h.meson.in => config-miners.h.meson.in                     | 0
 meson.build                                                       | 4 ++--
 src/libtracker-extract/tracker-encoding-enca.c                    | 2 +-
 src/libtracker-extract/tracker-encoding-libicu.c                  | 2 +-
 src/libtracker-extract/tracker-encoding.c                         | 2 +-
 src/libtracker-extract/tracker-exif.c                             | 2 +-
 src/libtracker-extract/tracker-extract-info.c                     | 2 +-
 src/libtracker-extract/tracker-guarantee.c                        | 2 +-
 src/libtracker-extract/tracker-iptc.c                             | 2 +-
 src/libtracker-extract/tracker-module-manager.c                   | 2 +-
 src/libtracker-extract/tracker-utils.c                            | 2 +-
 src/libtracker-extract/tracker-xmp.c                              | 2 +-
 src/libtracker-miners-common/tracker-date-time.c                  | 2 +-
 src/libtracker-miners-common/tracker-dbus.c                       | 2 +-
 src/libtracker-miners-common/tracker-domain-ontology.c            | 2 +-
 src/libtracker-miners-common/tracker-file-utils.c                 | 2 +-
 src/libtracker-miners-common/tracker-ioprio.c                     | 2 +-
 src/libtracker-miners-common/tracker-locale.c                     | 2 +-
 src/libtracker-miners-common/tracker-log.c                        | 2 +-
 src/libtracker-miners-common/tracker-miners-enum-types.c.template | 2 +-
 src/libtracker-miners-common/tracker-sched.c                      | 2 +-
 src/libtracker-miners-common/tracker-seccomp.c                    | 2 +-
 src/libtracker-miners-common/tracker-type-utils.c                 | 2 +-
 src/libtracker-miners-common/tracker-utils.c                      | 2 +-
 src/miners/fs/tracker-config.c                                    | 2 +-
 src/miners/fs/tracker-extract-watchdog.c                          | 2 +-
 src/miners/fs/tracker-main.c                                      | 2 +-
 src/miners/fs/tracker-miner-files-index.c                         | 2 +-
 src/miners/fs/tracker-miner-files.c                               | 2 +-
 src/miners/fs/tracker-power-hal.c                                 | 2 +-
 src/miners/fs/tracker-power-upower.c                              | 2 +-
 src/miners/fs/tracker-storage.c                                   | 2 +-
 src/miners/fs/tracker-thumbnailer.c                               | 2 +-
 src/miners/fs/tracker-writeback-dispatcher.c                      | 2 +-
 src/miners/fs/tracker-writeback-listener.c                        | 2 +-
 src/miners/fs/tracker-writeback.c                                 | 2 +-
 src/miners/rss/tracker-main.c                                     | 2 +-
 src/miners/rss/tracker-miner-rss.c                                | 2 +-
 src/tracker-extract/tracker-config.c                              | 2 +-
 src/tracker-extract/tracker-cue-sheet.c                           | 2 +-
 src/tracker-extract/tracker-extract-abw.c                         | 2 +-
 src/tracker-extract/tracker-extract-bmp.c                         | 2 +-
 src/tracker-extract/tracker-extract-controller.c                  | 2 +-
 src/tracker-extract/tracker-extract-decorator.c                   | 2 +-
 src/tracker-extract/tracker-extract-desktop.c                     | 2 +-
 src/tracker-extract/tracker-extract-dummy.c                       | 2 +-
 src/tracker-extract/tracker-extract-flac.c                        | 2 +-
 src/tracker-extract/tracker-extract-gif.c                         | 2 +-
 src/tracker-extract/tracker-extract-gstreamer.c                   | 2 +-
 src/tracker-extract/tracker-extract-html.c                        | 2 +-
 src/tracker-extract/tracker-extract-icon.c                        | 2 +-
 src/tracker-extract/tracker-extract-iso.c                         | 2 +-
 src/tracker-extract/tracker-extract-jpeg.c                        | 2 +-
 src/tracker-extract/tracker-extract-mp3.c                         | 2 +-
 src/tracker-extract/tracker-extract-msoffice-xml.c                | 2 +-
 src/tracker-extract/tracker-extract-msoffice.c                    | 2 +-
 src/tracker-extract/tracker-extract-oasis.c                       | 2 +-
 src/tracker-extract/tracker-extract-pdf.c                         | 2 +-
 src/tracker-extract/tracker-extract-playlist.c                    | 2 +-
 src/tracker-extract/tracker-extract-png.c                         | 2 +-
 src/tracker-extract/tracker-extract-ps.c                          | 2 +-
 src/tracker-extract/tracker-extract-raw.c                         | 2 +-
 src/tracker-extract/tracker-extract-text.c                        | 2 +-
 src/tracker-extract/tracker-extract-tiff.c                        | 2 +-
 src/tracker-extract/tracker-extract-vorbis.c                      | 2 +-
 src/tracker-extract/tracker-extract-xmp.c                         | 2 +-
 src/tracker-extract/tracker-extract.c                             | 2 +-
 src/tracker-extract/tracker-main.c                                | 2 +-
 src/tracker-extract/tracker-read.c                                | 2 +-
 src/tracker-writeback/tracker-config.c                            | 2 +-
 src/tracker-writeback/tracker-main.c                              | 2 +-
 src/tracker-writeback/tracker-writeback-file.c                    | 2 +-
 src/tracker-writeback/tracker-writeback-gstreamer.c               | 2 +-
 src/tracker-writeback/tracker-writeback-module.c                  | 2 +-
 src/tracker-writeback/tracker-writeback-playlist.c                | 2 +-
 src/tracker-writeback/tracker-writeback-xmp.c                     | 2 +-
 src/tracker-writeback/tracker-writeback.c                         | 2 +-
 tests/libtracker-extract/tracker-encoding-test.c                  | 2 +-
 tests/libtracker-extract/tracker-guarantee-test.c                 | 2 +-
 tests/libtracker-extract/tracker-iptc-test.c                      | 2 +-
 tests/libtracker-extract/tracker-utils-test.c                     | 2 +-
 tests/libtracker-extract/tracker-xmp-test.c                       | 2 +-
 tests/libtracker-miners-common/tracker-sched-test.c               | 2 +-
 tests/libtracker-miners-common/tracker-utils-test.c               | 2 +-
 84 files changed, 84 insertions(+), 84 deletions(-)
---
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]