From 6b159d0665c67c3c78c2968673e24bf45c2430d2 Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 26 Jan 2021 09:48:19 +0100 Subject: build: Use PACKAGE_URL variable --- data/Makefile.am | 36 ++++++++++++++++++++---------------- data/atril.appdata.xml.in | 44 -------------------------------------------- data/atril.appdata.xml.in.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 60 deletions(-) delete mode 100644 data/atril.appdata.xml.in create mode 100644 data/atril.appdata.xml.in.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index d357c793..f6a99571 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -14,24 +14,23 @@ man_MANS=atril.1 # uidir = $(pkgdatadir) -ui_DATA = \ +ui_DATA = \ hand-open.png # # Desktop file # -DESKTOP_IN_FILES = atril.desktop.in -DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop) - desktopdir = $(datadir)/applications -desktop_DATA = $(DESKTOP_FILES) -$(desktop_DATA): $(DESKTOP_IN_FILES) +desktop_in_files = atril.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +$(desktop_DATA): $(desktop_in_files) $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ # # DBus servide file # + if ENABLE_DBUS servicedir = $(datadir)/dbus-1/services service_in_files = org.mate.atril.Daemon.service.in @@ -44,8 +43,10 @@ endif # # App data file # + appdatadir = $(datadir)/metainfo -appdata_in_files = atril.appdata.xml.in +appdata_in_in_files = atril.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 $@ @@ -53,6 +54,7 @@ $(appdata_DATA): $(appdata_in_files) # # GSettings schema # + gsettings_SCHEMAS = org.mate.Atril.gschema.xml .PRECIOUS: $(gsettings_SCHEMAS) @@ -60,7 +62,6 @@ gsettings_SCHEMAS = org.mate.Atril.gschema.xml # include the appropriate makefile rules for schema handling @GSETTINGS_RULES@ - # # GTK icon cache # @@ -79,18 +80,18 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi - # # Extra files to be included in the tarball # EXTRA_DIST = \ - $(ui_DATA) \ - $(DESKTOP_IN_FILES) \ - $(appdata_in_files) \ + $(appdata_in_in_files) \ + $(desktop_in_files) \ $(gsettings_SCHEMAS) \ - org.mate.atril.Daemon.service.in \ $(man_MANS) \ + $(service_in_files) \ + $(ui_DATA) \ + org.mate.atril.Daemon.service.in \ $(NULL) # @@ -98,10 +99,13 @@ EXTRA_DIST = \ # CLEANFILES = \ - atril.appdata.xml + $(appdata_DATA) \ + $(desktop_DATA) \ + $(service_DATA) \ + $(NULL) DISTCLEANFILES = \ - $(DESKTOP_FILES) \ - $(service_DATA) + $(appdata_in_files) \ + $(NULL) -include $(top_srcdir)/git.mk diff --git a/data/atril.appdata.xml.in b/data/atril.appdata.xml.in deleted file mode 100644 index c54aee98..00000000 --- a/data/atril.appdata.xml.in +++ /dev/null @@ -1,44 +0,0 @@ - - - - atril.desktop - CC0-1.0 - GPL-2.0+ - Atril Document Viewer - A Document Viewer for the MATE desktop environment - -

- Atril is a simple multi-page document viewer. It can display and - print PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI, - XPS and Portable Document Format (PDF) files, as well as comic book - archive files. When supported by the document, it also allows - searching for text, copying text to the clipboard, hypertext navigation - and table-of-contents bookmarks. -

-

- Atril is a fork of Evince and part of the MATE Desktop Environment. - If you would like to know more about MATE and Atril, please visit the - project's home page. -

- - - - - https://alexpl.fedorapeople.org/AppData/atril/screens/atril_01.png - - - - - https://alexpl.fedorapeople.org/AppData/atril/screens/atril_02.png - - - - - https://alexpl.fedorapeople.org/AppData/atril/screens/atril_03.png - - - - https://mate-desktop.org - mate-dev@ml.mate-desktop.org - MATE - diff --git a/data/atril.appdata.xml.in.in b/data/atril.appdata.xml.in.in new file mode 100644 index 00000000..963e6d84 --- /dev/null +++ b/data/atril.appdata.xml.in.in @@ -0,0 +1,44 @@ + + + + atril.desktop + CC0-1.0 + GPL-2.0+ + Atril Document Viewer + A Document Viewer for the MATE desktop environment + +

+ Atril is a simple multi-page document viewer. It can display and + print PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI, + XPS and Portable Document Format (PDF) files, as well as comic book + archive files. When supported by the document, it also allows + searching for text, copying text to the clipboard, hypertext navigation + and table-of-contents bookmarks. +

+

+ Atril is a fork of Evince and part of the MATE Desktop Environment. + If you would like to know more about MATE and Atril, please visit the + project's home page. +

+ + + + + https://alexpl.fedorapeople.org/AppData/atril/screens/atril_01.png + + + + + https://alexpl.fedorapeople.org/AppData/atril/screens/atril_02.png + + + + + https://alexpl.fedorapeople.org/AppData/atril/screens/atril_03.png + + + + @PACKAGE_URL@ + mate-dev@ml.mate-desktop.org + MATE + -- cgit v1.2.1