Merge branch 'wip/carlosg/fix-manpages-install' into 'master'

Fix manpages install

See merge request GNOME/tracker!311

7 files changed, 80 insertions, 76 deletions

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index ffaf40e03..f90c757cf 100644
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -1,16 +1,20 @@
 manpages = [
-    'endpoint',
-    'export',
-    'import',
-    'sparql',
-    'sql',
-    'xdg-portal',
+    ['endpoint', 'tracker3-endpoint', 1],
+    ['export', 'tracker3-export', 1],
+    ['import', 'tracker3-import', 1],
+    ['sparql', 'tracker3-sparql', 1],
+    ['sql', 'tracker3-sql', 1],
+    ['xdg-portal', 'tracker-xdg-portal-3', 1],
 ]
 
 foreach m : manpages
-  manpage_src = 'tracker-@0@.1.txt'.format(m)
-  manpage_xml = 'tracker-@0@.1.xml'.format(m)
-  manpage = 'tracker@0@-@1@.1'.format(tracker_api_major, m)
+  src = m[0]
+  dst = m[1]
+  section = m[2]
+
+  manpage_src = 'tracker-@0@.@1@.txt'.format(src, section)
+  manpage_xml = '@0@.@1@.xml'.format(dst, section)
+  manpage = '@0@.@1@'.format(dst, section)
 
   xml = custom_target(manpage_xml,
     command: [asciidoc,
@@ -26,12 +30,12 @@ foreach m : manpages
 
   custom_target(manpage,
     command: [xsltproc,
+              '--output', '@OUTPUT@',
               '--stringparam', 'man.authors.section.enabled', '0',
               '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'],
-    capture: true,
     input: xml,
     output: manpage,
     install: true,
-    install_dir: get_option('mandir') / 'man1',
+    install_dir: get_option('mandir') / 'man@0@'.format(section),
   )
 endforeach
diff --git a/docs/manpages/tracker-endpoint.1.txt b/docs/manpages/tracker-endpoint.1.txt
index c791cdd80..d0d894e08 100644
--- a/docs/manpages/tracker-endpoint.1.txt
+++ b/docs/manpages/tracker-endpoint.1.txt
@@ -1,17 +1,17 @@
-tracker-endpoint(1)
-===================
+tracker3-endpoint(1)
+====================
 
 == NAME
-tracker-endpoint - Create a SPARQL endpoint
+tracker3-endpoint - Create a SPARQL endpoint
 
 == SYNOPSIS
 
 ....
-tracker endpoint [--dbus-service | -b] <service_name>
-                 [--database-path | -d] <database_path>
-                 [[--ontology | -o] <ontology_name> |
-                  [--ontology-path | -p] <ontology_path>]
-                 [[--system | --session]]
+tracker3 endpoint [--dbus-service | -b] <service_name>
+                  [--database-path | -d] <database_path>
+                  [[--ontology | -o] <ontology_name> |
+                   [--ontology-path | -p] <ontology_path>]
+                  [[--system | --session]]
 ....
 
 == DESCRIPTION
@@ -53,11 +53,11 @@ The database itself will be stored according to _database_path_.
 
 Export a Nepomuk endpoint with the _org.example.Example1_ bus name.
 
-  $ tracker endpoint -b org.example.Example1 -o nepomuk -d /tmp/example1
+  $ tracker3 endpoint -b org.example.Example1 -o nepomuk -d /tmp/example1
 
-Access this endpoint with the *tracker-sparql(1)* subcommand.
+Access this endpoint with the *tracker3-sparql(1)* subcommand.
 
-  $ tracker sparql --dbus-service org.example.Example1 -q "
+  $ tracker3 sparql --dbus-service org.example.Example1 -q "
     SELECT ?s ?o
     WHERE {
       ?u a ?o
@@ -65,6 +65,6 @@ Access this endpoint with the *tracker-sparql(1)* subcommand.
 
 == SEE ALSO
 
-*tracker-sparql*(1),
+*tracker3-sparql*(1),
 
 <https://www.w3.org/TR/sparql11-query/>
diff --git a/docs/manpages/tracker-export.1.txt b/docs/manpages/tracker-export.1.txt
index e4c13d7af..cb1a653e7 100644
--- a/docs/manpages/tracker-export.1.txt
+++ b/docs/manpages/tracker-export.1.txt
@@ -1,17 +1,17 @@
-tracker-export(1)
-=================
+tracker3-export(1)
+==================
 
 == NAME
 
-tracker-export - Export all data from a Tracker database.
+tracker3-export - Export all data from a Tracker database.
 
 == SYNOPSIS
 
-*tracker export* [_options_...] [*IRI*...]
+*tracker3 export* [_options_...] [*IRI*...]
 
 == DESCRIPTION
 
-*tracker export* exports data stored in a Tracker database, in
+*tracker3 export* exports data stored in a Tracker database, in
 Turtle format. By default all data is exported, if any *IRI*, only those
 resources will be printed.
 
@@ -23,7 +23,7 @@ tool such as rapper(1) to convert the data to different formats.
 *-g, --show-graphs*::
   Tracker can separate data into multiple graphs. This feature is used
   by the filesystem miner to separate different types of content. This
-  flag causes the releveant GRAPH statements to be output along with
+  flag causes the relevant GRAPH statements to be output along with
   the data.
 
   In this mode the output is TriG syntax rather than Turtle, due to
@@ -44,9 +44,9 @@ Export all data from Tracker Index and prettify the output using
 rapper(1).::
 
 ....
-$ tracker export -b org.freedesktop.Tracker1.Miner.Files | rapper - -I . -i turtle -o turtle
+$ tracker3 export -b org.freedesktop.Tracker1.Miner.Files | rapper - -I . -i turtle -o turtle
 ....
 
 == SEE ALSO
 
-*tracker-import*(1), *tracker-sparql*(1).
+*tracker3-import*(1), *tracker3-sparql*(1).
diff --git a/docs/manpages/tracker-import.1.txt b/docs/manpages/tracker-import.1.txt
index 01286725e..d1d5d07df 100644
--- a/docs/manpages/tracker-import.1.txt
+++ b/docs/manpages/tracker-import.1.txt
@@ -1,17 +1,17 @@
-tracker-import(1)
-=================
+tracker3-import(1)
+==================
 
 == NAME
 
-tracker-import - Import data into a Tracker database.
+tracker3-import - Import data into a Tracker database.
 
 == SYNOPSIS
 
-*tracker import* FILE.ttl
+*tracker3 import* FILE.ttl
 
 == DESCRIPTION
 
-*tracker import* imports data into a Tracker database.
+*tracker3 import* imports data into a Tracker database.
 
 The data must conform to the existing ontology of the database.
 
@@ -20,4 +20,4 @@ to convert the data from other formats to Turtle.
 
 == SEE ALSO
 
-*tracker-export*(1), *tracker-sparql*(1).
+*tracker3-export*(1), *tracker3-sparql*(1).
diff --git a/docs/manpages/tracker-sparql.1.txt b/docs/manpages/tracker-sparql.1.txt
index 31c1b2388..304b0feb1 100644
--- a/docs/manpages/tracker-sparql.1.txt
+++ b/docs/manpages/tracker-sparql.1.txt
@@ -1,17 +1,17 @@
-tracker-sparql(1)
-=================
+tracker3-sparql(1)
+==================
 
 == NAME
 
-tracker-sparql - Use SparQL to query the Tracker databases.
+tracker3-sparql - Use SparQL to query the Tracker databases.
 
 == SYNOPSIS
 
 ....
-tracker sparql -q <sparql> [-u] | -f <file>
-tracker sparql -t [class] [-s <needle>] [-p]
-tracker sparql [-c] [-p] [-x] [-n [class]] [-i [property]] [-s <needle>]
-tracker sparql [--get-longhand <class>] [--get-shorthand <class>]
+tracker3 sparql -q <sparql> [-u] | -f <file>
+tracker3 sparql -t [class] [-s <needle>] [-p]
+tracker3 sparql [-c] [-p] [-x] [-n [class]] [-i [property]] [-s <needle>]
+tracker3 sparql [--get-longhand <class>] [--get-shorthand <class>]
 ....
 
 == DESCRIPTION
@@ -38,7 +38,7 @@ not have to be an absolute path.
 *-q, --query=<__sparql__>*::
   Use a _sparql_ string to query the database with.
 *-u, --update*::
-  This has to be used with *--query*. This tells "tracker sparql" to use
+  This has to be used with *--query*. This tells "tracker3 sparql" to use
   the SPARQL update extensions so it knows it isn't a regular data
   lookup request. So if your query is intended to change data in the
   database, this option is needed.
@@ -64,7 +64,7 @@ not have to be an absolute path.
 This gives the following result:
 
 ----
-$ tracker sparql -p nfo:Video
+$ tracker3 sparql -p nfo:Video
 
 Properties: 2
   http://tracker.api.gnome.org/ontology/v3/nfo#frameRate
@@ -98,7 +98,7 @@ See also *--tree* and *--query*.
   *--get-shorthand* and *--get-longhand* for details). For example:
 
 ----
-$ tracker sparql -t nmo:MMSMessage
+$ tracker3 sparql -t nmo:MMSMessage
 ROOT
   +-- rdfs:Resource (C)
   |  +-- nie:InformationElement (C)
@@ -118,7 +118,7 @@ The *--properties* command line option can be used to show properties
 for each class displayed, for example:
 
 ----
-$ tracker sparql -t nfo:FileDataObject -p
+$ tracker3 sparql -t nfo:FileDataObject -p
 ROOT
   +-- rdfs:Resource (C)
   |  --> http://purl.org/dc/elements/1.1/contributor (P)
@@ -175,7 +175,7 @@ ROOT
   example:
 
 ----
-$ tracker sparql -s text
+$ tracker3 sparql -s text
 
 Classes: 4
   http://tracker.api.gnome.org/ontology/v3/nfo#TextDocument
@@ -196,7 +196,7 @@ See also *--tree*.
   Returns the shorthand for a class given by a URL. For example:
 
 ----
-$ tracker sparql --get-shorthand http://tracker.api.gnome.org/ontology/v3/nmo#plainTextMessageContent
+$ tracker3 sparql --get-shorthand http://tracker.api.gnome.org/ontology/v3/nmo#plainTextMessageContent
 nmo:plainTextMessageContent
 ----
 
@@ -205,7 +205,7 @@ nmo:plainTextMessageContent
   For example:
 
 ----
-$ tracker sparql --get-longhand nmm:MusicPiece
+$ tracker3 sparql --get-longhand nmm:MusicPiece
 http://tracker.api.gnome.org/ontology/v3/nmm#MusicPiece
 ----
 
@@ -214,13 +214,13 @@ http://tracker.api.gnome.org/ontology/v3/nmm#MusicPiece
 List all classes::
 +
 ....
-$ tracker sparql -q "SELECT ?cl WHERE { ?cl a rdfs:Class }"
+$ tracker3 sparql -q "SELECT ?cl WHERE { ?cl a rdfs:Class }"
 ....
 
 List all properties for the Resources class (see --list-properties)::
 +
 ----
-$ tracker sparql -q "SELECT ?prop WHERE {
+$ tracker3 sparql -q "SELECT ?prop WHERE {
     ?prop a rdf:Property ;
     rdfs:domain <http://www.w3.org/2000/01/rdf-schema#Resource>
 }"
@@ -229,7 +229,7 @@ $ tracker sparql -q "SELECT ?prop WHERE {
 List all class namespace prefixes::
 +
 ----
-$ tracker sparql -q "SELECT ?prefix ?ns WHERE {
+$ tracker3 sparql -q "SELECT ?prefix ?ns WHERE {
     ?ns a nrl:Namespace ;
     nrl:prefix ?prefix
 }"
@@ -238,16 +238,16 @@ $ tracker sparql -q "SELECT ?prefix ?ns WHERE {
 List all music files::
 +
 ----
-$ tracker sparql -q "SELECT ?song WHERE { ?song a nmm:MusicPiece }"
+$ tracker3 sparql -q "SELECT ?song WHERE { ?song a nmm:MusicPiece }"
 ----
 
 List all music albums, showing title, track count, and length in seconds.::
 +
 ----
-$ tracker sparql -q "SELECT ?title COUNT(?song)
-                    AS songs
-                    SUM(?length) AS totallength
-                    WHERE {
+$ tracker3 sparql -q "SELECT ?title COUNT(?song)
+                      AS songs
+                      SUM(?length) AS totallength
+                      WHERE {
     ?album a nmm:MusicAlbum ;
     nie:title ?title .
     ?song nmm:musicAlbum ?album ;
@@ -258,7 +258,7 @@ $ tracker sparql -q "SELECT ?title COUNT(?song)
 List all music from a particular artist::
 +
 ----
-$ tracker sparql -q "SELECT ?song ?title WHERE {
+$ tracker3 sparql -q "SELECT ?song ?title WHERE {
     ?song nmm:performer [ nmm:artistName 'Artist Name' ] ;
     nie:title ?title
 }"
@@ -267,7 +267,7 @@ $ tracker sparql -q "SELECT ?song ?title WHERE {
 Set the played count for a song::
 +
 ----
-$ tracker sparql -u -q "DELETE {
+$ tracker3 sparql -u -q "DELETE {
     <file:///home/user/Music/song.mp3> nie:usageCounter ?count
 } WHERE {
     <file:///home/user/Music/song.mp3> nie:usageCounter ?count
@@ -279,13 +279,13 @@ $ tracker sparql -u -q "DELETE {
 List all image files::
 +
 ----
-$ tracker sparql -q "SELECT ?image WHERE { ?image a nfo:Image }"
+$ tracker3 sparql -q "SELECT ?image WHERE { ?image a nfo:Image }"
 ----
 
 List all image files with a specific tag::
 +
 ----
-$ tracker sparql -q "SELECT ?image WHERE {
+$ tracker3 sparql -q "SELECT ?image WHERE {
     ?image a nfo:Image ;
     nao:hasTag [ nao:prefLabel 'tag' ]
 }"
@@ -294,7 +294,7 @@ $ tracker sparql -q "SELECT ?image WHERE {
 List all image files created on a specific month and order by date::
 +
 ----
-$ tracker sparql -q "SELECT ?image ?date WHERE {
+$ tracker3 sparql -q "SELECT ?image ?date WHERE {
     ?image a nfo:Image ;
     nie:contentCreated ?date .
     FILTER (?date >= '2008-07-01T00:00:00' &&
@@ -304,7 +304,7 @@ $ tracker sparql -q "SELECT ?image ?date WHERE {
 
 == SEE ALSO
 
-*tracker-sql*(1), *tracker-store*(1), *tracker-info*(1).
+*tracker3-sql*(1), *tracker3-info*(1).
 
 *http://nepomuk.semanticdesktop.org/*
 *http://www.w3.org/TR/rdf-sparql-query/*
diff --git a/docs/manpages/tracker-sql.1.txt b/docs/manpages/tracker-sql.1.txt
index f389a4eb0..83e58ac21 100644
--- a/docs/manpages/tracker-sql.1.txt
+++ b/docs/manpages/tracker-sql.1.txt
@@ -1,20 +1,20 @@
-tracker-sql(1)
-==============
+tracker3-sql(1)
+===============
 
 == NAME
 
-tracker-sql - Use SQL to query the Tracker databases.
+tracker3-sql - Use SQL to query the Tracker databases.
 
 == SYNOPSIS
 
 ....
-tracker sql -q <sql> | -f <file>
+tracker3 sql -q <sql> | -f <file>
 ....
 
 == DESCRIPTION
 
 This command allows probing of the current database. When using commands
-like *tracker sparql*, the SPARQL used is translated into SQL before
+like *tracker3 sparql*, the SPARQL used is translated into SQL before
 being run on the database. This allows direct use of the database using
 SQL avoiding the SPARQL engine entirely.
 
@@ -40,11 +40,11 @@ not have to be an absolute path.
 Show first 10 "nfo:Document" entries where the TOC is not NULL::
 +
 ----
-$ tracker sql -q 'SELECT * FROM "nfo:Document" WHERE "nfo:tableOfContents" NOT NULL LIMIT 10;'
+$ tracker3 sql -q 'SELECT * FROM "nfo:Document" WHERE "nfo:tableOfContents" NOT NULL LIMIT 10;'
 ----
 
 == SEE ALSO
 
-*tracker-sparql*(1), *tracker-store*(1), *tracker-info*(1).
+*tracker3-sparql*(1), *tracker3-info*(1).
 
 *http://en.wikipedia.org/wiki/SQL*
diff --git a/docs/manpages/tracker-xdg-portal.1.txt b/docs/manpages/tracker-xdg-portal.1.txt
index 29d2ceb65..664db5b77 100644
--- a/docs/manpages/tracker-xdg-portal.1.txt
+++ b/docs/manpages/tracker-xdg-portal.1.txt
@@ -1,14 +1,14 @@
-tracker-xdg-portal(1)
-=====================
+tracker-xdg-portal-3(1)
+=======================
 
 == NAME
 
-tracker-xdg-portal - Portal to Tracker endpoints
+tracker-xdg-portal-3 - Portal to Tracker endpoints
 
 == SYNOPSIS
 
 ....
-tracker-xdg-portal [--version | -v]
+tracker-xdg-portal-3 [--version | -v]
 ....
 
 == DESCRIPTION