[gedit-plugins/wip/zeitgeist-from-gedit] plugins: fix installing appstream files

From: Igor Gnatenko <ignatenko src gnome org>
To: commits-list gnome org
Cc:
Subject: [gedit-plugins/wip/zeitgeist-from-gedit] plugins: fix installing appstream files
Date: Fri, 20 Jun 2014 18:02:42 +0000 (UTC)
commit 222fb075dc8fc524451182798b9cdbea830f3a2c
Author: Igor Gnatenko <i gnatenko brain gmail com>
Date:   Fri Jun 20 21:50:59 2014 +0400

    plugins: fix installing appstream files
    
    Reported-by: Sébastien Wilmet <swilmet gnome org>
    Reference: https://bugzilla.gnome.org/show_bug.cgi?id=731799
    Signed-off-by: Igor Gnatenko <i gnatenko brain gmail com>

 plugins/Makefile.am                   |   16 ++++++++--------
 plugins/bookmarks/Makefile.am         |    2 +-
 plugins/bracketcompletion/Makefile.am |    4 ++--
 plugins/charmap/Makefile.am           |    4 ++--
 plugins/codecomment/Makefile.am       |    4 ++--
 plugins/colorpicker/Makefile.am       |    4 ++--
 plugins/colorschemer/Makefile.am      |    4 ++--
 plugins/commander/Makefile.am         |    4 ++--
 plugins/dashboard/Makefile.am         |    4 ++--
 plugins/drawspaces/Makefile.am        |    2 +-
 plugins/git/Makefile.am               |    4 ++--
 plugins/joinlines/Makefile.am         |    4 ++--
 plugins/multiedit/Makefile.am         |    4 ++--
 plugins/smartspaces/Makefile.am       |    4 ++--
 plugins/synctex/Makefile.am           |    4 ++--
 plugins/terminal/Makefile.am          |    4 ++--
 plugins/textsize/Makefile.am          |    4 ++--
 plugins/wordcompletion/Makefile.am    |    2 +-
 plugins/zeitgeist/Makefile.am         |    5 -----
 19 files changed, 39 insertions(+), 44 deletions(-)
---
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 2858e34..2a1da64 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -7,9 +7,9 @@ endif
 plugin_LTLIBRARIES =
 plugin_in_files =
 dist_plugin_in_files =
-appdatadir = $(datadir)/appdata/
-appdata_in_files =
-dist_appdata_in_files =
+appstreamdir = $(datadir)/appdata/
+appstream_in_files =
+dist_appstream_in_files =
 gsettings_SCHEMAS =
 dist_gsettings_SCHEMAS =
 
@@ -41,9 +41,9 @@ GENERATED_PLUGIN_FILES = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 plugin_DATA = $(GENERATED_PLUGIN_FILES)
 
-GENERATED_APPDATA_FILES = $(appdata_in_files:.xml.in=.xml)
+GENERATED_APPSTREAM_FILES = $(appstream_in_files:.xml.in=.xml)
 
-appdata_DATA = $(GENERATED_APPDATA_FILES)
+appstream_DATA = $(GENERATED_APPSTREAM_FILES)
 
 DISTCLEANFILES +=                      \
        plugins/gpdefs.py               \
@@ -52,14 +52,14 @@ DISTCLEANFILES +=                   \
 
 CLEANFILES +=                          \
        $(GENERATED_PLUGIN_FILES)       \
-       $(GENERATED_APPDATA_FILES)      \
+       $(GENERATED_APPSTREAM_FILES)    \
        $(gsettings_SCHEMAS)
 
 EXTRA_DIST +=                                                          \
        plugins/gpdefs.py.in                                            \
        $(plugin_in_files)                                              \
        $(dist_plugin_in_files)                                         \
-       $(appdata_in_files)                                             \
-       $(dist_appdata_in_files)                                        \
+       $(appstream_in_files)                                           \
+       $(dist_appstream_in_files)                                      \
        $(gsettings_SCHEMAS:%.gschema.xml=%.gschema.xml.in.in)          \
        $(dist_gsettings_SCHEMAS:%.gschema.xml=%.gschema.xml.in.in)
diff --git a/plugins/bookmarks/Makefile.am b/plugins/bookmarks/Makefile.am
index 58f2d31..b51677c 100644
--- a/plugins/bookmarks/Makefile.am
+++ b/plugins/bookmarks/Makefile.am
@@ -31,4 +31,4 @@ plugins_bookmarks_libbookmarks_la_SOURCES =                                   \
 
 plugin_in_files += plugins/bookmarks/bookmarks.plugin.desktop.in
 
-appdata_in_files += plugins/bookmarks/gedit-bookmarks.metainfo.xml.in
+appstream_in_files += plugins/bookmarks/gedit-bookmarks.metainfo.xml.in
diff --git a/plugins/bracketcompletion/Makefile.am b/plugins/bracketcompletion/Makefile.am
index 1f50551..aad7ede 100644
--- a/plugins/bracketcompletion/Makefile.am
+++ b/plugins/bracketcompletion/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_PYTHON
 plugin_PYTHON += plugins/bracketcompletion/bracketcompletion.py
 plugin_in_files += plugins/bracketcompletion/bracketcompletion.plugin.desktop.in
+appstream_in_files += plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/bracketcompletion/bracketcompletion.plugin.desktop.in
+dist_appstream_in_files += plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/bracketcompletion/gedit-bracketcompletion.metainfo.xml.in
diff --git a/plugins/charmap/Makefile.am b/plugins/charmap/Makefile.am
index e9c474b..8ce7f0b 100644
--- a/plugins/charmap/Makefile.am
+++ b/plugins/charmap/Makefile.am
@@ -5,8 +5,8 @@ plugins_charmap_PYTHON =                        \
        plugins/charmap/charmap/panel.py
 
 plugin_in_files += plugins/charmap/charmap.plugin.desktop.in
+appstream_in_files += plugins/charmap/gedit-charmap.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/charmap/charmap.plugin.desktop.in
+dist_appstream_in_files += plugins/charmap/gedit-charmap.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/charmap/gedit-charmap.metainfo.xml.in
diff --git a/plugins/codecomment/Makefile.am b/plugins/codecomment/Makefile.am
index 7c75b14..a5fd4b6 100644
--- a/plugins/codecomment/Makefile.am
+++ b/plugins/codecomment/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_PYTHON
 plugin_PYTHON += plugins/codecomment/codecomment.py
 plugin_in_files += plugins/codecomment/codecomment.plugin.desktop.in
+appstream_in_files += plugins/codecomment/gedit-codecomment.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/codecomment/codecomment.plugin.desktop.in
+dist_appstream_in_files += plugins/codecomment/gedit-codecomment.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/codecomment/gedit-codecomment.metainfo.xml.in
diff --git a/plugins/colorpicker/Makefile.am b/plugins/colorpicker/Makefile.am
index b8f30ef..c89b2d9 100644
--- a/plugins/colorpicker/Makefile.am
+++ b/plugins/colorpicker/Makefile.am
@@ -3,8 +3,8 @@ plugin_PYTHON +=                                \
        plugins/colorpicker/colorpicker.py
 
 plugin_in_files += plugins/colorpicker/colorpicker.plugin.desktop.in
+appstream_in_files += plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/colorpicker/colorpicker.plugin.desktop.in
+dist_appstream_in_files += plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/colorpicker/gedit-colorpicker.metainfo.xml.in
diff --git a/plugins/colorschemer/Makefile.am b/plugins/colorschemer/Makefile.am
index 04079ca..f5cf8de 100644
--- a/plugins/colorschemer/Makefile.am
+++ b/plugins/colorschemer/Makefile.am
@@ -9,8 +9,8 @@ plugins_schemer_uidir = $(GEDIT_PLUGINS_DATA_DIR)/colorschemer/ui
 dist_plugins_schemer_ui_DATA = plugins/colorschemer/schemer.ui
 
 plugin_in_files += plugins/colorschemer/colorschemer.plugin.desktop.in
+appstream_in_files += plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/colorschemer/colorschemer.plugin.desktop.in
+dist_appstream_in_files += plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/colorschemer/gedit-colorschemer.metainfo.xml.in
diff --git a/plugins/commander/Makefile.am b/plugins/commander/Makefile.am
index eca048c..5920d4c 100644
--- a/plugins/commander/Makefile.am
+++ b/plugins/commander/Makefile.am
@@ -45,8 +45,8 @@ plugins_commander_modules_find_PYTHON =                       \
        plugins/commander/modules/find/regex.py
 
 plugin_in_files += plugins/commander/commander.plugin.desktop.in
+appstream_in_files += plugins/commander/gedit-commander.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/commander/commander.plugin.desktop.in
+dist_appstream_in_files += plugins/commander/gedit-commander.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/commander/gedit-commander.metainfo.xml.in
diff --git a/plugins/dashboard/Makefile.am b/plugins/dashboard/Makefile.am
index 389a32f..1e47741 100644
--- a/plugins/dashboard/Makefile.am
+++ b/plugins/dashboard/Makefile.am
@@ -6,8 +6,8 @@ plugins_dashboard_PYTHON =                              \
        plugins/dashboard/dashboard/utils.py
 
 plugin_in_files += plugins/dashboard/dashboard.plugin.desktop.in
+appstream_in_files += plugins/dashboard/gedit-dashboard.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/dashboard/dashboard.plugin.desktop.in
+dist_appstream_in_files += plugins/dashboard/gedit-dashboard.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/dashboard/gedit-dashboard.metainfo.xml.in
diff --git a/plugins/drawspaces/Makefile.am b/plugins/drawspaces/Makefile.am
index 0eb0f38..bc6ef85 100644
--- a/plugins/drawspaces/Makefile.am
+++ b/plugins/drawspaces/Makefile.am
@@ -38,7 +38,7 @@ plugins_drawspaces_libdrawspaces_la_SOURCES =                 \
        $(BUILT_SOURCES)
 
 plugin_in_files += plugins/drawspaces/drawspaces.plugin.desktop.in
-appdata_in_files += plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
+appstream_in_files += plugins/drawspaces/gedit-drawspaces.metainfo.xml.in
 gsettings_SCHEMAS += plugins/drawspaces/org.gnome.gedit.plugins.drawspaces.gschema.xml
 
 EXTRA_DIST +=                                                  \
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index b1d0103..8602243 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -7,8 +7,8 @@ plugins_git_PYTHON =                            \
        plugins/git/git/windowactivatable.py
 
 plugin_in_files += plugins/git/git.plugin.desktop.in
+appstream_in_files += plugins/git/gedit-git.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/git/git.plugin.desktop.in
+dist_appstream_in_files += plugins/git/gedit-git.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/git/gedit-git.metainfo.xml.in
diff --git a/plugins/joinlines/Makefile.am b/plugins/joinlines/Makefile.am
index 1dcba12..36e7fd3 100644
--- a/plugins/joinlines/Makefile.am
+++ b/plugins/joinlines/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_PYTHON
 plugin_PYTHON += plugins/joinlines/joinlines.py
 plugin_in_files += plugins/joinlines/joinlines.plugin.desktop.in
+appstream_in_files += plugins/joinlines/gedit-joinlines.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/joinlines/joinlines.plugin.desktop.in
+dist_appstream_in_files += plugins/joinlines/gedit-joinlines.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/joinlines/gedit-joinlines.metainfo.xml.in
diff --git a/plugins/multiedit/Makefile.am b/plugins/multiedit/Makefile.am
index 5675b02..834d382 100644
--- a/plugins/multiedit/Makefile.am
+++ b/plugins/multiedit/Makefile.am
@@ -8,8 +8,8 @@ plugins_multiedit_PYTHON =                                      \
        plugins/multiedit/multiedit/signals.py
 
 plugin_in_files += plugins/multiedit/multiedit.plugin.desktop.in
+appstream_in_files += plugins/multiedit/gedit-multiedit.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/multiedit/multiedit.plugin.desktop.in
+dist_appstream_in_files += plugins/multiedit/gedit-multiedit.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/multiedit/gedit-multiedit.metainfo.xml.in
diff --git a/plugins/smartspaces/Makefile.am b/plugins/smartspaces/Makefile.am
index 04d82c9..c88e688 100644
--- a/plugins/smartspaces/Makefile.am
+++ b/plugins/smartspaces/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_PYTHON
 plugin_PYTHON += plugins/smartspaces/smartspaces.py
 plugin_in_files += plugins/smartspaces/smartspaces.plugin.desktop.in
+appstream_in_files += plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/smartspaces/smartspaces.plugin.desktop.in
+dist_appstream_in_files += plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/smartspaces/gedit-smartspaces.metainfo.xml.in
diff --git a/plugins/synctex/Makefile.am b/plugins/synctex/Makefile.am
index e7d0214..389bdcb 100644
--- a/plugins/synctex/Makefile.am
+++ b/plugins/synctex/Makefile.am
@@ -6,8 +6,8 @@ plugins_synctex_PYTHON =                        \
        plugins/synctex/synctex/evince_dbus.py
 
 plugin_in_files += plugins/synctex/synctex.plugin.desktop.in
+appstream_in_files += plugins/synctex/gedit-synctex.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/synctex/synctex.plugin.desktop.in
+dist_appstream_in_files += plugins/synctex/gedit-synctex.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/synctex/gedit-synctex.metainfo.xml.in
diff --git a/plugins/terminal/Makefile.am b/plugins/terminal/Makefile.am
index 9e397af..adc73a7 100644
--- a/plugins/terminal/Makefile.am
+++ b/plugins/terminal/Makefile.am
@@ -3,10 +3,10 @@ plugins_terminaldir = $(plugindir)
 plugins_terminal_PYTHON = plugins/terminal/terminal.py
 
 plugin_in_files += plugins/terminal/terminal.plugin.desktop.in
+appstream_in_files += plugins/terminal/gedit-terminal.metainfo.xml.in
 gsettings_SCHEMAS += plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml
 else
 dist_plugin_in_files += plugins/terminal/terminal.plugin.desktop.in
+dist_appstream_in_files += plugins/terminal/gedit-terminal.metainfo.xml.in
 dist_gsettings_SCHEMAS += plugins/terminal/org.gnome.gedit.plugins.terminal.gschema.xml
 endif
-
-appdata_in_files += plugins/terminal/gedit-terminal.metainfo.xml.in
diff --git a/plugins/textsize/Makefile.am b/plugins/textsize/Makefile.am
index c9dba64..7674747 100644
--- a/plugins/textsize/Makefile.am
+++ b/plugins/textsize/Makefile.am
@@ -6,8 +6,8 @@ plugins_textsize_PYTHON =                               \
        plugins/textsize/textsize/signals.py
 
 plugin_in_files += plugins/textsize/textsize.plugin.desktop.in
+appstream_in_files += plugins/textsize/gedit-textsize.metainfo.xml.in
 else
 dist_plugin_in_files += plugins/textsize/textsize.plugin.desktop.in
+dist_appstream_in_files += plugins/textsize/gedit-textsize.metainfo.xml.in
 endif
-
-appdata_in_files += plugins/textsize/gedit-textsize.metainfo.xml.in
diff --git a/plugins/wordcompletion/Makefile.am b/plugins/wordcompletion/Makefile.am
index 6e3258e..082d872 100644
--- a/plugins/wordcompletion/Makefile.am
+++ b/plugins/wordcompletion/Makefile.am
@@ -14,7 +14,7 @@ plugins_wordcompletion_libwordcompletion_la_LIBADD = $(GEDIT_LIBS)
 
 plugin_in_files += plugins/wordcompletion/wordcompletion.plugin.desktop.in
 
-appdata_in_files += plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
+appstream_in_files += plugins/wordcompletion/gedit-wordcompletion.metainfo.xml.in
 
 plugins_wordcompletion_resourcedeps =                                          \
        plugins/wordcompletion/gedit-word-completion.gresource.xml              \
diff --git a/plugins/zeitgeist/Makefile.am b/plugins/zeitgeist/Makefile.am
index 881d0c8..315f567 100644
--- a/plugins/zeitgeist/Makefile.am
+++ b/plugins/zeitgeist/Makefile.am
@@ -21,13 +21,8 @@ plugins_zeitgeist_libzeitgeist_la_SOURCES =          \
 EXTRA_DIST += $(zeitgeist_resource_deps)
 
 plugin_in_files += plugins/zeitgeist/zeitgeist.plugin.desktop.in
-
 appstream_in_files += plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in
-
 else
-
 dist_plugin_in_files += plugins/zeitgeist/zeitgeist.plugin.desktop.in
-
 dist_appstream_in_files += plugins/zeitgeist/gedit-zeitgeist.metainfo.xml.in
-
 endif
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]