From f1d8ac226c12140eadf6268f2164f8755585b8ac Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 26 Jan 2021 10:43:30 +0100 Subject: build: Use PACKAGE_URL variable --- caja/Makefile.am | 7 ++- caja/libcaja-engrampa.caja-extension.desktop.in.in | 2 +- configure.ac | 3 +- data/Makefile.am | 39 ++++++------ data/engrampa.appdata.xml.in | 72 ---------------------- data/engrampa.appdata.xml.in.in | 72 ++++++++++++++++++++++ po/POTFILES.in | 2 +- src/actions.c | 2 +- 8 files changed, 102 insertions(+), 97 deletions(-) delete mode 100644 data/engrampa.appdata.xml.in create mode 100644 data/engrampa.appdata.xml.in.in diff --git a/caja/Makefile.am b/caja/Makefile.am index 3ef86f4..b8310c5 100644 --- a/caja/Makefile.am +++ b/caja/Makefile.am @@ -19,12 +19,15 @@ libcaja_engrampa_la_LDFLAGS = -module -avoid-version -no-undefined libcaja_engrampa_la_LIBADD = $(CAJA_LIBS) extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-engrampa.caja-extension.desktop.in +extension_in_in_files = libcaja-engrampa.caja-extension.desktop.in.in +extension_in_files = $(extension_in_in_files:.caja-extension.desktop.in.in=.caja-extension.desktop.in) extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) $(extension_DATA): $(extension_in_files) $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ +DISTCLEANFILES = $(extension_in_files) CLEANFILES = $(extension_DATA) -EXTRA_DIST = $(extension_in_files) +EXTRA_DIST = $(extension_in_in_files) + -include $(top_srcdir)/git.mk diff --git a/caja/libcaja-engrampa.caja-extension.desktop.in.in b/caja/libcaja-engrampa.caja-extension.desktop.in.in index 91a234d..840c900 100644 --- a/caja/libcaja-engrampa.caja-extension.desktop.in.in +++ b/caja/libcaja-engrampa.caja-extension.desktop.in.in @@ -6,4 +6,4 @@ Description=Allows to create and extract archives Author=Paolo Bacchilega ;Perberos Copyright=Copyright (C) 2001–2010 Free Software Foundation, Inc.\nCopyright (C) 2012–2021 The MATE developers Version=@VERSION@ -Website=http://www.mate-desktop.org/ +Website=@PACKAGE_URL@ diff --git a/configure.ac b/configure.ac index 04c86c6..640c208 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([engrampa], [1.25.0], [https://mate-desktop.org]) +AC_INIT([engrampa], [1.25.0], [https://github.com/mate-desktop/engrampa/issues], [engrampa], [https://mate-desktop.org]) AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip check-news]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -228,6 +228,7 @@ dnl ****************************** AC_CONFIG_FILES([Makefile data/Makefile + data/engrampa.appdata.xml.in data/engrampa.desktop.in data/org.mate.engrampa.gschema.xml data/icons/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index f52df44..fdc4dde 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = icons desktopdir = $(datadir)/applications desktop_in_in_files = engrampa.desktop.in.in -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) +desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.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 $@ @@ -17,7 +17,8 @@ $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ appdatadir = $(datadir)/metainfo -appdata_in_files = engrampa.appdata.xml.in +appdata_in_in_files = engrampa.appdata.xml.in.in +appdata_in_files = $(appdata_in_in_files:.xml.in.in=.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 $@ @@ -44,27 +45,27 @@ update-cache: fi EXTRA_DIST = \ - packages.match.in \ - packages.match \ - $(desktop_in_in_files) \ - $(desktop_in_files) \ - $(desktop_DATA) \ - $(gsettingsschema_in_files) \ - $(appdata_in_files) \ - $(man_MANS) \ - $(service_in_files) \ - $(NULL) + packages.match.in \ + packages.match \ + $(appdata_in_in_files) \ + $(desktop_in_in_files) \ + $(gsettingsschema_in_files) \ + $(man_MANS) \ + $(service_in_files) \ + $(NULL) DISTCLEANFILES = \ - $(desktop_in_files) \ - $(desktop_DATA) \ - $(service_DATA) \ - $(NULL) + $(appdata_in_files) \ + $(desktop_in_files) \ + $(service_DATA) \ + $(NULL) CLEANFILES = \ - $(gsettings_SCHEMAS) \ - engrampa.appdata.xml \ - $(NULL) + $(appdata_DATA) \ + $(desktop_DATA) \ + $(gsettings_SCHEMAS) \ + engrampa.appdata.xml \ + $(NULL) dist-hook: cd $(distdir); rm -f $(CLEANFILES) diff --git a/data/engrampa.appdata.xml.in b/data/engrampa.appdata.xml.in deleted file mode 100644 index 421638b..0000000 --- a/data/engrampa.appdata.xml.in +++ /dev/null @@ -1,72 +0,0 @@ - - - - engrampa.desktop - CC0-1.0 - GPL-2.0+ - Engrampa Archive Manager - An Archive Manager for the MATE desktop environment - -

- Engrampa is an archive manager for the MATE environment. It allows you - to create and modify archives, view the contents of an archive, view a - file contained in an archive, and extract files from archive. -

-

- Engrampa is only a front-end (a graphical interface) to archiving programs - like tar and zip. The supported file types are: -

-
    -
  • 7-Zip Compressed File (.7z)
    • -
  • WinAce Compressed File (.ace)
    • -
  • ALZip Compressed File (.alz)
    • -
  • AIX Small Indexed Archive (.ar)
    • -
  • ARJ Compressed Archive (.arj)
    • -
  • Cabinet File (.cab)
    • -
  • UNIX CPIO Archive (.cpio)
    • -
  • Debian Package (.deb, .udeb) [Read-only mode]
    • -
  • ISO-9660 Disk Image (.iso) [Read-only mode]
    • -
  • Java Archive (.jar)
    • -
  • Java Enterprise archive (.ear)
    • -
  • Java Web Archive (.war)
    • -
  • LHA Archive (.lzh, .lha)
    • -
  • WinRAR Compressed Archive (.rar)
    • -
  • RAR Archived Comic Book (.cbr)
    • -
  • RPM Package Manager (.rpm) [Read-only mode]
    • -
  • Tape Archive File uncompressed (.tar) or compressed with: gzip (.tar.gz, .tgz), brotli (.tar.br), bzip (.tar.bz, .tbz), bzip2 (.tar.bz2, .tbz2), - compress (.tar.Z, .taz), lrzip (.tar.lrz, .tlrz), lzip (.tar.lz, .tlz), lzop (.tar.lzo, .tzo), 7zip (.tar.7z), xz (.tar.xz), Zstandard (.zst) -
    • -
  • Stuffit Archives (.bin, .sit)
    • -
  • ZIP Archive (.zip)
    • -
  • ZIP Archived Comic Book (.cbz)
    • -
  • ZOO Compressed Archive File (.zoo)
    • -
  • Single files compressed with gzip (.gz), brotli (.br), bzip (.bz), bzip2 (.bz2), compress (.Z), - lrzip (.lrz), lzip (.lz), lzop (.lzo), rzip(.rz), xz (.xz).
    • -
-

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

- - - - - https://alexpl.fedorapeople.org/AppData/engrampa/screens/engrampa_01.png - - - - - https://alexpl.fedorapeople.org/AppData/engrampa/screens/engrampa_02.png - - - - - https://alexpl.fedorapeople.org/AppData/engrampa/screens/engrampa_03.png - - - - http://www.mate-desktop.org - mate-dev@ml.mate-desktop.org - MATE - diff --git a/data/engrampa.appdata.xml.in.in b/data/engrampa.appdata.xml.in.in new file mode 100644 index 0000000..5072b84 --- /dev/null +++ b/data/engrampa.appdata.xml.in.in @@ -0,0 +1,72 @@ + + + + engrampa.desktop + CC0-1.0 + GPL-2.0+ + Engrampa Archive Manager + An Archive Manager for the MATE desktop environment + +

+ Engrampa is an archive manager for the MATE environment. It allows you + to create and modify archives, view the contents of an archive, view a + file contained in an archive, and extract files from archive. +

+

+ Engrampa is only a front-end (a graphical interface) to archiving programs + like tar and zip. The supported file types are: +

+
    +
  • 7-Zip Compressed File (.7z)
    • +
  • WinAce Compressed File (.ace)
    • +
  • ALZip Compressed File (.alz)
    • +
  • AIX Small Indexed Archive (.ar)
    • +
  • ARJ Compressed Archive (.arj)
    • +
  • Cabinet File (.cab)
    • +
  • UNIX CPIO Archive (.cpio)
    • +
  • Debian Package (.deb, .udeb) [Read-only mode]
    • +
  • ISO-9660 Disk Image (.iso) [Read-only mode]
    • +
  • Java Archive (.jar)
    • +
  • Java Enterprise archive (.ear)
    • +
  • Java Web Archive (.war)
    • +
  • LHA Archive (.lzh, .lha)
    • +
  • WinRAR Compressed Archive (.rar)
    • +
  • RAR Archived Comic Book (.cbr)
    • +
  • RPM Package Manager (.rpm) [Read-only mode]
    • +
  • Tape Archive File uncompressed (.tar) or compressed with: gzip (.tar.gz, .tgz), brotli (.tar.br), bzip (.tar.bz, .tbz), bzip2 (.tar.bz2, .tbz2), + compress (.tar.Z, .taz), lrzip (.tar.lrz, .tlrz), lzip (.tar.lz, .tlz), lzop (.tar.lzo, .tzo), 7zip (.tar.7z), xz (.tar.xz), Zstandard (.zst) +
    • +
  • Stuffit Archives (.bin, .sit)
    • +
  • ZIP Archive (.zip)
    • +
  • ZIP Archived Comic Book (.cbz)
    • +
  • ZOO Compressed Archive File (.zoo)
    • +
  • Single files compressed with gzip (.gz), brotli (.br), bzip (.bz), bzip2 (.bz2), compress (.Z), + lrzip (.lrz), lzip (.lz), lzop (.lzo), rzip(.rz), xz (.xz).
    • +
+

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

+ + + + + https://alexpl.fedorapeople.org/AppData/engrampa/screens/engrampa_01.png + + + + + https://alexpl.fedorapeople.org/AppData/engrampa/screens/engrampa_02.png + + + + + https://alexpl.fedorapeople.org/AppData/engrampa/screens/engrampa_03.png + + + + @PACKAGE_URL@ + mate-dev@ml.mate-desktop.org + MATE + diff --git a/po/POTFILES.in b/po/POTFILES.in index 1fb515b..4762e92 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,7 @@ mate-submodules/libegg/eggsmclient.c mate-submodules/libegg/eggsmclient.h mate-submodules/libegg/eggsmclient-private.h mate-submodules/libegg/eggsmclient-xsmp.c -data/engrampa.appdata.xml.in +data/engrampa.appdata.xml.in.in data/engrampa.desktop.in.in data/org.mate.engrampa.gschema.xml.in caja/engrampa-module.c diff --git a/src/actions.c b/src/actions.c index 1d3a9ec..b55cab1 100644 --- a/src/actions.c +++ b/src/actions.c @@ -906,7 +906,7 @@ activate_action_about (GtkAction *action, "logo-icon-name", "engrampa", "license", license_text, "wrap-license", TRUE, - "website", "https://mate-desktop.org", + "website", PACKAGE_URL, NULL); g_strfreev (authors); -- cgit v1.2.1