From afd8f48f9b71f68953bc8e6bf4859031475aee0f Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 26 Jan 2021 10:56:28 +0100 Subject: build: Use PACKAGE_URL variable --- configure.ac | 6 ++++- data/Makefile.am | 28 ++++++++++++---------- data/eom.appdata.xml.in | 19 --------------- data/eom.appdata.xml.in.in | 19 +++++++++++++++ plugins/Makefile.am | 5 ++-- plugins/fullscreen/fullscreen.plugin.desktop.in | 9 ------- plugins/fullscreen/fullscreen.plugin.desktop.in.in | 9 +++++++ plugins/reload/reload.plugin.desktop.in | 9 ------- plugins/reload/reload.plugin.desktop.in.in | 9 +++++++ .../statusbar-date.plugin.desktop.in | 8 ------- .../statusbar-date.plugin.desktop.in.in | 8 +++++++ po/POTFILES.in | 8 +++---- src/eom-window.c | 2 +- 13 files changed, 73 insertions(+), 66 deletions(-) delete mode 100644 data/eom.appdata.xml.in create mode 100644 data/eom.appdata.xml.in.in delete mode 100644 plugins/fullscreen/fullscreen.plugin.desktop.in create mode 100644 plugins/fullscreen/fullscreen.plugin.desktop.in.in delete mode 100644 plugins/reload/reload.plugin.desktop.in create mode 100644 plugins/reload/reload.plugin.desktop.in.in delete mode 100644 plugins/statusbar-date/statusbar-date.plugin.desktop.in create mode 100644 plugins/statusbar-date/statusbar-date.plugin.desktop.in.in diff --git a/configure.ac b/configure.ac index b259469..bf4ca02 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ m4_define(eom_minor_version, 25) m4_define(eom_micro_version, 0) m4_define(eom_version, eom_major_version.eom_minor_version.eom_micro_version) -AC_INIT([eom], eom_version, [http://www.mate-desktop.org], [eom]) +AC_INIT([eom], eom_version, https://github.com/mate-desktop/eom/issues, [eom], [https://mate-desktop.org]) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz check-news]) # Support silencing the build output if supported (automake-1.11+) @@ -394,6 +394,7 @@ help/Makefile po/Makefile.in data/Makefile data/eom.pc +data/eom.appdata.xml.in data/eom.desktop.in data/org.mate.eom.gschema.xml data/pixmaps/Makefile @@ -403,6 +404,9 @@ doc/reference/Makefile doc/reference/version.xml doc/reference/eom-docs.sgml plugins/Makefile +plugins/fullscreen/fullscreen.plugin.desktop.in +plugins/reload/reload.plugin.desktop.in +plugins/statusbar-date/statusbar-date.plugin.desktop.in thumbnailer/Makefile thumbnailer/eom-thumbnailer.thumbnailer ]) diff --git a/data/Makefile.am b/data/Makefile.am index 4842527..b7b61a2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,16 +1,16 @@ SUBDIRS = pixmaps icons -DESKTOP_IN_FILES= eom.desktop.in.in -DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop) - desktopdir = $(datadir)/applications -desktop_DATA = $(DESKTOP_FILES) -$(desktop_DATA): $(DESKTOP_IN_FILES) +desktop_DATA = eom.desktop +desktop_in_files = $(desktop_DATA:.desktop=.desktop.in) +desktop_in_in_files = $(desktop_in_files:.desktop.in=.desktop.in.in) +$(desktop_DATA): $(desktop_in_files) $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Name --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@ appdatadir = $(datadir)/metainfo -appdata_in_files = eom.appdata.xml.in -appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_DATA = eom.appdata.xml +appdata_in_files = $(appdata_DATA:.xml=.xml.in) +appdata_in_in_files = $(appdata_in_files:.xml.in=.xml.in.in) $(appdata_DATA): $(appdata_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ @@ -29,7 +29,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = eom.pc EXTRA_DIST = \ - $(ui_DATA) \ + $(ui_DATA) \ eom.css \ eom-image-properties-dialog.ui \ eom-multiple-save-as-dialog.ui \ @@ -37,14 +37,16 @@ EXTRA_DIST = \ eom-ui.xml \ metadata-sidebar.ui \ eom.about \ - $(DESKTOP_IN_FILES) \ - $(appdata_in_files) + $(appdata_in_in_files) \ + $(desktop_in_in_files) CLEANFILES = \ - $(appdata_DATA) + $(appdata_DATA) \ + $(desktop_DATA) DISTCLEANFILES = \ - $(DESKTOP_FILES) \ - $(gsettings_SCHEMAS) + $(appdata_in_files) \ + $(desktop_in_files) \ + $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk diff --git a/data/eom.appdata.xml.in b/data/eom.appdata.xml.in deleted file mode 100644 index b1a2635..0000000 --- a/data/eom.appdata.xml.in +++ /dev/null @@ -1,19 +0,0 @@ - - - - eom.desktop - CC0-1.0 - Eye of MATE - Simple image viewer - -

- Eye of MATE is a simple viewer for browsing images on your computer. - Once an image is loaded, you can zoom and rotate the image, and also view - subsequent images in the directory the image was loaded from. -

- - http://mate-desktop.org/ - - http://mate-desktop.org/gallery/1.8/eom.png - - diff --git a/data/eom.appdata.xml.in.in b/data/eom.appdata.xml.in.in new file mode 100644 index 0000000..3aa83a4 --- /dev/null +++ b/data/eom.appdata.xml.in.in @@ -0,0 +1,19 @@ + + + + eom.desktop + CC0-1.0 + Eye of MATE + Simple image viewer + +

+ Eye of MATE is a simple viewer for browsing images on your computer. + Once an image is loaded, you can zoom and rotate the image, and also view + subsequent images in the directory the image was loaded from. +

+ + @PACKAGE_URL@ + + https://mate-desktop.org/gallery/1.8/eom.png + + diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 614f435..8e11b07 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -46,14 +46,15 @@ endif # Generate plugin info files +plugins_in_in_files = $(plugins_in_files:.desktop.in=.desktop.in.in) plugins_DATA = $(plugins_in_files:.plugin.desktop.in=.plugin) %.plugin: %.plugin.desktop.in $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -DISTCLEANFILES = $(plugins_DATA) +DISTCLEANFILES = $(plugins_in_files) CLEANFILES = $(plugins_DATA) -EXTRA_DIST = $(plugins_in_files) +EXTRA_DIST = $(plugins_in_in_files) -include $(top_srcdir)/git.mk diff --git a/plugins/fullscreen/fullscreen.plugin.desktop.in b/plugins/fullscreen/fullscreen.plugin.desktop.in deleted file mode 100644 index 34e5988..0000000 --- a/plugins/fullscreen/fullscreen.plugin.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Plugin] -Module=fullscreen -IAge=2 -Name=Fullscreen with double-click -Icon=view-fullscreen -Description=Activate fullscreen mode with double-click -Authors=Lucas Rocha -Copyright=Copyright © 2007 Lucas Rocha -Website=http://www.mate-desktop.org/ diff --git a/plugins/fullscreen/fullscreen.plugin.desktop.in.in b/plugins/fullscreen/fullscreen.plugin.desktop.in.in new file mode 100644 index 0000000..c7bb757 --- /dev/null +++ b/plugins/fullscreen/fullscreen.plugin.desktop.in.in @@ -0,0 +1,9 @@ +[Plugin] +Module=fullscreen +IAge=2 +Name=Fullscreen with double-click +Icon=view-fullscreen +Description=Activate fullscreen mode with double-click +Authors=Lucas Rocha +Copyright=Copyright © 2007 Lucas Rocha +Website=@PACKAGE_URL@ diff --git a/plugins/reload/reload.plugin.desktop.in b/plugins/reload/reload.plugin.desktop.in deleted file mode 100644 index 60087a3..0000000 --- a/plugins/reload/reload.plugin.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Plugin] -Module=reload -IAge=2 -Name=Reload Image -Icon=view-refresh -Description=Reload current image -Authors=Lucas Rocha -Copyright=Copyright © 2007 Lucas Rocha -Website=http://www.mate-desktop.org/ diff --git a/plugins/reload/reload.plugin.desktop.in.in b/plugins/reload/reload.plugin.desktop.in.in new file mode 100644 index 0000000..db791a7 --- /dev/null +++ b/plugins/reload/reload.plugin.desktop.in.in @@ -0,0 +1,9 @@ +[Plugin] +Module=reload +IAge=2 +Name=Reload Image +Icon=view-refresh +Description=Reload current image +Authors=Lucas Rocha +Copyright=Copyright © 2007 Lucas Rocha +Website=@PACKAGE_URL@ diff --git a/plugins/statusbar-date/statusbar-date.plugin.desktop.in b/plugins/statusbar-date/statusbar-date.plugin.desktop.in deleted file mode 100644 index c87848e..0000000 --- a/plugins/statusbar-date/statusbar-date.plugin.desktop.in +++ /dev/null @@ -1,8 +0,0 @@ -[Plugin] -Module=statusbar-date -IAge=2 -Name=Date in statusbar -Description=Shows the image date in the window statusbar -Authors=Claudio Saavedra -Copyright=Copyright © 2008 Free Software Foundation -Website=http://www.mate-desktop.org/ diff --git a/plugins/statusbar-date/statusbar-date.plugin.desktop.in.in b/plugins/statusbar-date/statusbar-date.plugin.desktop.in.in new file mode 100644 index 0000000..3898ae6 --- /dev/null +++ b/plugins/statusbar-date/statusbar-date.plugin.desktop.in.in @@ -0,0 +1,8 @@ +[Plugin] +Module=statusbar-date +IAge=2 +Name=Date in statusbar +Description=Shows the image date in the window statusbar +Authors=Claudio Saavedra +Copyright=Copyright © 2008 Free Software Foundation +Website=@PACKAGE_URL@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 459f76f..fc2bf10 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,7 +2,7 @@ # Please keep this file sorted alphabetically. cut-n-paste/toolbar-editor/egg-editable-toolbar.c cut-n-paste/toolbar-editor/egg-toolbar-editor.c -data/eom.appdata.xml.in +data/eom.appdata.xml.in.in data/eom.desktop.in.in data/eom-image-properties-dialog.ui data/eom-multiple-save-as-dialog.ui @@ -10,10 +10,10 @@ data/eom-preferences-dialog.ui data/metadata-sidebar.ui data/org.mate.eom.gschema.xml.in plugins/fullscreen/eom-fullscreen-plugin.c -plugins/fullscreen/fullscreen.plugin.desktop.in +plugins/fullscreen/fullscreen.plugin.desktop.in.in plugins/reload/eom-reload-plugin.c -plugins/reload/reload.plugin.desktop.in -plugins/statusbar-date/statusbar-date.plugin.desktop.in +plugins/reload/reload.plugin.desktop.in.in +plugins/statusbar-date/statusbar-date.plugin.desktop.in.in src/eom-application.c src/eom-close-confirmation-dialog.c src/eom-file-chooser.c diff --git a/src/eom-window.c b/src/eom-window.c index a455ba5..337f16f 100644 --- a/src/eom-window.c +++ b/src/eom-window.c @@ -2636,7 +2636,7 @@ eom_window_cmd_about (GtkAction *action, gpointer user_data) "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), - "website", "http://www.mate-desktop.org/", + "website", PACKAGE_URL, "logo-icon-name", "eom", "wrap-license", TRUE, "license", license_trans, -- cgit v1.2.1