From 77ae01b92666ab5554b168cf207ce37ded4deb2e Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 26 Jan 2021 10:10:20 +0100 Subject: build: Use PACKAGE_URL variable --- configure.ac | 7 ++++++- data/Makefile.am | 6 ++++-- data/caja.appdata.xml.in | 41 ----------------------------------------- data/caja.appdata.xml.in.in | 41 +++++++++++++++++++++++++++++++++++++++++ po/POTFILES.in | 2 +- src/caja-window-menus.c | 2 +- 6 files changed, 53 insertions(+), 46 deletions(-) delete mode 100644 data/caja.appdata.xml.in create mode 100644 data/caja.appdata.xml.in.in diff --git a/configure.ac b/configure.ac index 606a1c83..646d86f8 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,11 @@ dnl Interface break is not allowed. m4_define(caja_extension_current, 5) m4_define(caja_extension_revision, 0) -AC_INIT([caja], [1.25.2], [https://mate-desktop.org]) +AC_INIT([caja], + [1.25.2], + [https://github.com/mate-desktop/caja/issues], + [caja], + [https://mate-desktop.org]) dnl --------------------------------------------------------------------------- @@ -275,6 +279,7 @@ AC_CONFIG_FILES([ Makefile libegg/Makefile data/Makefile +data/caja.appdata.xml.in data/icons/Makefile data/patterns/Makefile docs/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 788b37c1..f6e3d14f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -53,13 +53,14 @@ cajadata_DATA = \ # app data file appdatadir = $(datadir)/metainfo -appdata_in_files = caja.appdata.xml.in +appdata_in_in_files = caja.appdata.xml.in.in +appdata_in_files = $(appdata_in_in_files:.appdata.xml.in.in=.appdata.xml.in) appdata_DATA = $(appdata_in_files:.xml.in=.xml) $(appdata_DATA): $(appdata_in_files) $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = \ - $(appdata_in_files) \ + $(appdata_in_in_files) \ $(cajadata_DATA) \ $(cajadata_in_files) \ $(desktop_in_in_files) \ @@ -69,6 +70,7 @@ EXTRA_DIST = \ $(NULL) DISTCLEANFILES = \ + $(appdata_in_files) \ $(desktop_in_files) \ $(NULL) diff --git a/data/caja.appdata.xml.in b/data/caja.appdata.xml.in deleted file mode 100644 index 5f07f4b8..00000000 --- a/data/caja.appdata.xml.in +++ /dev/null @@ -1,41 +0,0 @@ - - - - caja.desktop - CC0-1.0 - GPL-2.0+ - Caja - File manager for the MATE desktop environment - -

- Caja is the official file manager for the MATE desktop. It allows for - browsing directories, as well as previewing files and launching applications - associated with them. It is also responsible for handling the icons on - the MATE desktop. It works on local and remote file systems. -

-

- Caja is extensible through a plugin system, similar to that of GNOME Nautilus, - of which Caja is a fork. -

- - - - - https://alexpl.fedorapeople.org/AppData/caja/screens/caja_01.png - - - - - https://alexpl.fedorapeople.org/AppData/caja/screens/caja_02.png - - - - - https://alexpl.fedorapeople.org/AppData/caja/screens/caja_03.png - - - - https://mate-desktop.org - mate-dev@ml.mate-desktop.org - MATE - diff --git a/data/caja.appdata.xml.in.in b/data/caja.appdata.xml.in.in new file mode 100644 index 00000000..16102a82 --- /dev/null +++ b/data/caja.appdata.xml.in.in @@ -0,0 +1,41 @@ + + + + caja.desktop + CC0-1.0 + GPL-2.0+ + Caja + File manager for the MATE desktop environment + +

+ Caja is the official file manager for the MATE desktop. It allows for + browsing directories, as well as previewing files and launching applications + associated with them. It is also responsible for handling the icons on + the MATE desktop. It works on local and remote file systems. +

+

+ Caja is extensible through a plugin system, similar to that of GNOME Nautilus, + of which Caja is a fork. +

+ + + + + https://alexpl.fedorapeople.org/AppData/caja/screens/caja_01.png + + + + + https://alexpl.fedorapeople.org/AppData/caja/screens/caja_02.png + + + + + https://alexpl.fedorapeople.org/AppData/caja/screens/caja_03.png + + + + @PACKAGE_URL@ + mate-dev@ml.mate-desktop.org + MATE + diff --git a/po/POTFILES.in b/po/POTFILES.in index da1c332c..c0ca3a7f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/browser.xml.in -data/caja.appdata.xml.in +data/caja.appdata.xml.in.in data/caja-autorun-software.desktop.in.in data/caja-browser.desktop.in.in data/caja-computer.desktop.in.in diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index 67b88077..b3380a85 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -585,7 +585,7 @@ action_about_caja_callback (GtkAction *action, "documenters", documenters, "translator-credits", _("translator-credits"), "logo-icon-name", "system-file-manager", - "website", "https://mate-desktop.org", + "website", PACKAGE_URL, "website-label", _("Website"), NULL); -- cgit v1.2.1