From 97e1fe87f7cb362e0731b4aceec5b8f21e5632d1 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Tue, 26 Jan 2021 13:08:32 +0100
Subject: build: Use PACKAGE_URL variable

---
 data/Makefile.am             | 32 ++++++++++++++++++--------------
 data/pluma.appdata.xml.in    | 43 -------------------------------------------
 data/pluma.appdata.xml.in.in | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 57 deletions(-)
 delete mode 100644 data/pluma.appdata.xml.in
 create mode 100644 data/pluma.appdata.xml.in.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 21c26baa..ca29ef57 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,14 @@
-desktopdir 	 = $(datadir)/applications
-desktop_in_files = pluma.desktop.in
-desktop_DATA 	 = $(desktop_in_files:.desktop.in=.desktop)
+desktopdir          = $(datadir)/applications
+desktop_DATA        = pluma.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 --template $< -d $(top_srcdir)/po -o $@
 
 appdatadir = $(datadir)/metainfo
-appdata_in_files = pluma.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdata_DATA = pluma.appdata.xml
+appdata_in_files = $(appdata_DATA:.appdata.xml=.appdata.xml.in)
+appdata_in_in_files = $(appdata_in_files:.appdata.xml.in=.appdata.xml.in.in)
 $(appdata_DATA): $(appdata_in_files)
 	$(AM_V_GEN) GETTEXTDATADIRS=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
@@ -22,19 +24,21 @@ bugreportdir = $(libexecdir)/pluma
 bugreport_SCRIPTS = pluma-bugreport.sh
 
 EXTRA_DIST = 			\
-	$(appdata_in_files)	\
-	$(desktop_in_files)	\
-	$(man_MANS)			\
-	pluma.pc.in			\
+	$(appdata_in_in_files)	\
+	$(desktop_in_in_files)	\
+	$(man_MANS)		\
+	pluma.pc.in		\
 	pluma-bugreport.sh.in
 
-CLEANFILES =	 			\
-	$(desktop_DATA)			\
+CLEANFILES =	 		\
+	$(appdata_DATA)		\
+	$(desktop_DATA)		\
 	$(gsettings_SCHEMAS)	\
-	$(pkgconfig_DATA)		\
-	$(appdata_DATA)
-
+	$(pkgconfig_DATA)
 
+DISTCLEANFILES =		\
+	$(appdata_in_files)	\
+	$(desktop_in_files)
 
 
 -include $(top_srcdir)/git.mk
diff --git a/data/pluma.appdata.xml.in b/data/pluma.appdata.xml.in
deleted file mode 100644
index 5ef27402..00000000
--- a/data/pluma.appdata.xml.in
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 MATE team <mate-dev@ml.mate-desktop.org> -->
-<component type="desktop">
- <id>pluma.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0+</project_license>
- <name>Pluma</name>
- <summary>A Text Editor for the MATE desktop environment</summary>
- <description>
-  <p>
-   Pluma is a small, but powerful text editor designed specifically for
-   the MATE desktop. It has most standard text editor functions and fully
-   supports international text in Unicode. Advanced features include syntax
-   highlighting and automatic indentation of source code, printing and editing
-   of multiple documents in one window.
-  </p>
-  <p>
-   Pluma is extensible through a plugin system, which currently includes
-   support for spell checking, comparing files, viewing CVS ChangeLogs, and
-   adjusting indentation levels.
-  </p>
- </description>
- <screenshots>
-  <screenshot type="default">
-   <image width="960" height="540">
-    https://alexpl.fedorapeople.org/AppData/pluma/screens/pluma_01.png
-   </image>
-  </screenshot>
-  <screenshot>
-   <image width="960" height="540">
-    https://alexpl.fedorapeople.org/AppData/pluma/screens/pluma_02.png
-   </image>
-  </screenshot>
-  <screenshot>
-   <image width="960" height="540">
-    https://alexpl.fedorapeople.org/AppData/pluma/screens/pluma_03.png
-   </image>
-  </screenshot>
- </screenshots>
- <url type="homepage">https://mate-desktop.org</url>
- <updatecontact>mate-dev@ml.mate-desktop.org</updatecontact>
- <project_group>MATE</project_group>
-</component>
diff --git a/data/pluma.appdata.xml.in.in b/data/pluma.appdata.xml.in.in
new file mode 100644
index 00000000..5ef27402
--- /dev/null
+++ b/data/pluma.appdata.xml.in.in
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 MATE team <mate-dev@ml.mate-desktop.org> -->
+<component type="desktop">
+ <id>pluma.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>Pluma</name>
+ <summary>A Text Editor for the MATE desktop environment</summary>
+ <description>
+  <p>
+   Pluma is a small, but powerful text editor designed specifically for
+   the MATE desktop. It has most standard text editor functions and fully
+   supports international text in Unicode. Advanced features include syntax
+   highlighting and automatic indentation of source code, printing and editing
+   of multiple documents in one window.
+  </p>
+  <p>
+   Pluma is extensible through a plugin system, which currently includes
+   support for spell checking, comparing files, viewing CVS ChangeLogs, and
+   adjusting indentation levels.
+  </p>
+ </description>
+ <screenshots>
+  <screenshot type="default">
+   <image width="960" height="540">
+    https://alexpl.fedorapeople.org/AppData/pluma/screens/pluma_01.png
+   </image>
+  </screenshot>
+  <screenshot>
+   <image width="960" height="540">
+    https://alexpl.fedorapeople.org/AppData/pluma/screens/pluma_02.png
+   </image>
+  </screenshot>
+  <screenshot>
+   <image width="960" height="540">
+    https://alexpl.fedorapeople.org/AppData/pluma/screens/pluma_03.png
+   </image>
+  </screenshot>
+ </screenshots>
+ <url type="homepage">https://mate-desktop.org</url>
+ <updatecontact>mate-dev@ml.mate-desktop.org</updatecontact>
+ <project_group>MATE</project_group>
+</component>
-- 
cgit v1.2.1