[redeclipse] 22/23: Include AppData file
Martin Werner
arand-guest at moszumanska.debian.org
Sat Apr 4 00:47:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
arand-guest pushed a commit to branch next
in repository redeclipse.
commit 19fb024f9ff5db92e2dff307b88b983d91803649
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Sat Apr 4 02:17:20 2015 +0200
Include AppData file
Add upstream patches for AppData file and include in package.
---
debian/changelog | 6 +
debian/patches/appdata-Fill-in-remove-FIXMEs.patch | 49 +++++++
.../appdata-Update-description-screenshots.patch | 62 +++++++++
.../appdata-Upgrade-via-appstream-util.patch | 65 +++++++++
.../appdate-Use-template-set-at-install-name.patch | 25 ++++
debian/patches/series | 5 +
.../patches/system-install-Install-appdata.patch | 149 +++++++++++++++++++++
debian/redeclipse.install | 1 +
8 files changed, 362 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 823b663..e014175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ redeclipse (1.5.1-1) UNRELEASED; urgency=medium
* Bump standards-version to 3.9.6, no changes
* Add redeclipse-common package for client/server shared files
- Add system-install-Add-common-install-target-for-common-.patch
+ * Add AppData file via upstream patches
+ - Add appdate-Use-template-set-at-install-name.patch
+ - Add appdata-Upgrade-via-appstream-util.patch
+ - Add appdata-Fill-in-remove-FIXMEs.patch
+ - Add appdata-Update-description-screenshots.patch
+ - Add system-install-Install-appdata.patch
-- Martin Erik Werner <martinerikwerner at gmail.com> Sun, 29 Mar 2015 16:02:22 +0200
diff --git a/debian/patches/appdata-Fill-in-remove-FIXMEs.patch b/debian/patches/appdata-Fill-in-remove-FIXMEs.patch
new file mode 100644
index 0000000..95d7111
--- /dev/null
+++ b/debian/patches/appdata-Fill-in-remove-FIXMEs.patch
@@ -0,0 +1,49 @@
+From 70c58d5eb9adc611dd210b2ed68fc80b0aba3f3f Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Fri, 3 Apr 2015 20:46:14 +0200
+Subject: [PATCH 3/5] appdata: Fill in/remove FIXMEs
+
+---
+ src/install/nix/redeclipse.appdata.xml | 20 ++++----------------
+ 1 file changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/src/install/nix/redeclipse.appdata.xml b/src/install/nix/redeclipse.appdata.xml
+index d6f2b3e..30a642b 100644
+--- a/src/install/nix/redeclipse.appdata.xml
++++ b/src/install/nix/redeclipse.appdata.xml
+@@ -1,11 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <component type="desktop">
+ <id>@APPNAME at .desktop</id>
+-
+- <!--FIXME: convert to an SPDX ID-->
+ <metadata_license>CC-BY-SA-3.0+</metadata_license>
+-
+- <!--FIXME: convert to an SPDX ID-->
+ <project_license>ZLIB and CC-BY-SA-3.0+</project_license>
+ <description>
+ <p>
+@@ -34,16 +30,8 @@
+ </screenshot>
+ </screenshots>
+ <updatecontact>http://redeclipse.net/forum/</updatecontact>
+-
+- <!--FIXME: You can use a project or developer name if there's no company-->
+- <developer_name><!-- Company Name --></developer_name>
+-
+- <!--FIXME: where to report bugs for the application-->
+- <url type="bugtracker"><!-- http://www.homepage.com/where-to-report_bug.html --></url>
+-
+- <!--FIXME: where to donate to the application-->
+- <url type="donation"><!-- http://www.homepage.com/donation.html --></url>
+-
+- <!--FIXME: where to report bugs for the application-->
+- <url type="help"><!-- http://www.homepage.com/docs/ --></url>
++ <developer_name>Red Eclipse Team</developer_name>
++ <url type="bugtracker">https://github.com/red-eclipse/base/issues</url>
++ <url type="donation">http://redeclipse.net/donate</url>
++ <url type="help">http://redeclipse.net/faq</url>
+ </component>
+--
+2.1.4
+
diff --git a/debian/patches/appdata-Update-description-screenshots.patch b/debian/patches/appdata-Update-description-screenshots.patch
new file mode 100644
index 0000000..51b4923
--- /dev/null
+++ b/debian/patches/appdata-Update-description-screenshots.patch
@@ -0,0 +1,62 @@
+From 6276a48eca296b0e98c829f9911ce22e14d7224f Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Fri, 3 Apr 2015 22:04:45 +0200
+Subject: [PATCH 4/5] appdata: Update description & screenshots
+
+* Match readme description, but add "cross-platform multiplayer" instead
+ of platform list
+* Pick nicest (my arbitrary opionion) three screenshots and add captions
+---
+ src/install/nix/redeclipse.appdata.xml | 27 +++++++++++++++------------
+ 1 file changed, 15 insertions(+), 12 deletions(-)
+
+diff --git a/src/install/nix/redeclipse.appdata.xml b/src/install/nix/redeclipse.appdata.xml
+index 30a642b..60b9e2f 100644
+--- a/src/install/nix/redeclipse.appdata.xml
++++ b/src/install/nix/redeclipse.appdata.xml
+@@ -6,27 +6,30 @@
+ <description>
+ <p>
+ Red Eclipse is a fun-filled new take on the casual first person arena
+- shooter with a general theme of agility in a variety of environments.
+- </p>
+- <p>
+- Red Eclipse features parkour, impulse boosts, dashing, other tricks,
+- and favourite game modes with an array of mutators and variables.
+- A builtin editor lets you create your own maps cooperatively online.
++ shooter, built as a total conversion of Cube Engine 2, which lends itself
++ toward a balanced gameplay, with a general theme of agility in a variety
++ of environments.
+ </p>
++ <ul>
++ <li>Cross-platform multiplayer</li>
++ <li>Features parkour, impulse boosts, dashing, and other tricks</li>
++ <li>Favourite gamemodes with an array of mutators and variables</li>
++ <li>Builtin editor lets you create your own maps cooperatively online</li>
++ </ul>
+ </description>
+ <url type="homepage">http://redeclipse.net/</url>
+ <screenshots>
+ <screenshot type="default">
+- <image>http://redeclipse.net/bits/images/003.jpg</image>
+- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
++ <image>http://redeclipse.net/bits/images/053.jpg</image>
++ <caption>Posing with fire on the map venus</caption>
+ </screenshot>
+ <screenshot>
+- <image>http://redeclipse.net/bits/images/006.jpg</image>
+- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
++ <image>http://redeclipse.net/bits/images/045.jpg</image>
++ <caption>Mine fireworks on the map vault</caption>
+ </screenshot>
+ <screenshot>
+- <image>http://redeclipse.net/bits/images/007.jpg</image>
+- <caption><!-- Describe this screenshot in less than ~10 words --></caption>
++ <image>http://redeclipse.net/bits/images/019.jpg</image>
++ <caption>Overlooking friendly fire on the map cutec</caption>
+ </screenshot>
+ </screenshots>
+ <updatecontact>http://redeclipse.net/forum/</updatecontact>
+--
+2.1.4
+
diff --git a/debian/patches/appdata-Upgrade-via-appstream-util.patch b/debian/patches/appdata-Upgrade-via-appstream-util.patch
new file mode 100644
index 0000000..81af29a
--- /dev/null
+++ b/debian/patches/appdata-Upgrade-via-appstream-util.patch
@@ -0,0 +1,65 @@
+From d0d18dad4ed19a8c7ccc24beb6f16c01e6d57978 Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Fri, 3 Apr 2015 20:39:01 +0200
+Subject: [PATCH 2/5] appdata: Upgrade via appstream-util
+
+---
+ src/install/nix/redeclipse.appdata.xml | 37 ++++++++++++++++++++++++++++------
+ 1 file changed, 31 insertions(+), 6 deletions(-)
+
+diff --git a/src/install/nix/redeclipse.appdata.xml b/src/install/nix/redeclipse.appdata.xml
+index d5487f7..d6f2b3e 100644
+--- a/src/install/nix/redeclipse.appdata.xml
++++ b/src/install/nix/redeclipse.appdata.xml
+@@ -1,7 +1,11 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<application>
+- <id type="desktop">@APPNAME at .desktop</id>
++<component type="desktop">
++ <id>@APPNAME at .desktop</id>
++
++ <!--FIXME: convert to an SPDX ID-->
+ <metadata_license>CC-BY-SA-3.0+</metadata_license>
++
++ <!--FIXME: convert to an SPDX ID-->
+ <project_license>ZLIB and CC-BY-SA-3.0+</project_license>
+ <description>
+ <p>
+@@ -16,9 +20,30 @@
+ </description>
+ <url type="homepage">http://redeclipse.net/</url>
+ <screenshots>
+- <screenshot type="default">http://redeclipse.net/bits/images/003.jpg</screenshot>
+- <screenshot>http://redeclipse.net/bits/images/006.jpg</screenshot>
+- <screenshot>http://redeclipse.net/bits/images/007.jpg</screenshot>
++ <screenshot type="default">
++ <image>http://redeclipse.net/bits/images/003.jpg</image>
++ <caption><!-- Describe this screenshot in less than ~10 words --></caption>
++ </screenshot>
++ <screenshot>
++ <image>http://redeclipse.net/bits/images/006.jpg</image>
++ <caption><!-- Describe this screenshot in less than ~10 words --></caption>
++ </screenshot>
++ <screenshot>
++ <image>http://redeclipse.net/bits/images/007.jpg</image>
++ <caption><!-- Describe this screenshot in less than ~10 words --></caption>
++ </screenshot>
+ </screenshots>
+ <updatecontact>http://redeclipse.net/forum/</updatecontact>
+-</application>
++
++ <!--FIXME: You can use a project or developer name if there's no company-->
++ <developer_name><!-- Company Name --></developer_name>
++
++ <!--FIXME: where to report bugs for the application-->
++ <url type="bugtracker"><!-- http://www.homepage.com/where-to-report_bug.html --></url>
++
++ <!--FIXME: where to donate to the application-->
++ <url type="donation"><!-- http://www.homepage.com/donation.html --></url>
++
++ <!--FIXME: where to report bugs for the application-->
++ <url type="help"><!-- http://www.homepage.com/docs/ --></url>
++</component>
+--
+2.1.4
+
diff --git a/debian/patches/appdate-Use-template-set-at-install-name.patch b/debian/patches/appdate-Use-template-set-at-install-name.patch
new file mode 100644
index 0000000..c6cdc25
--- /dev/null
+++ b/debian/patches/appdate-Use-template-set-at-install-name.patch
@@ -0,0 +1,25 @@
+From de17926dab1d68d266c0c4ab044c2ef1851c7091 Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Fri, 3 Apr 2015 20:29:02 +0200
+Subject: [PATCH 1/5] appdate: Use template set-at-install name
+
+This is to allow for installing as 'redeclipse-develop' and similar.
+---
+ src/install/nix/redeclipse.appdata.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/install/nix/redeclipse.appdata.xml b/src/install/nix/redeclipse.appdata.xml
+index b52cd7b..d5487f7 100644
+--- a/src/install/nix/redeclipse.appdata.xml
++++ b/src/install/nix/redeclipse.appdata.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <application>
+- <id type="desktop">redeclipse.desktop</id>
++ <id type="desktop">@APPNAME at .desktop</id>
+ <metadata_license>CC-BY-SA-3.0+</metadata_license>
+ <project_license>ZLIB and CC-BY-SA-3.0+</project_license>
+ <description>
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index a0b9767..5644225 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,8 @@
windowed-by-default.patch
build-with-system-enet.patch
system-install-Add-common-install-target-for-common-.patch
+appdate-Use-template-set-at-install-name.patch
+appdata-Upgrade-via-appstream-util.patch
+appdata-Fill-in-remove-FIXMEs.patch
+appdata-Update-description-screenshots.patch
+system-install-Install-appdata.patch
diff --git a/debian/patches/system-install-Install-appdata.patch b/debian/patches/system-install-Install-appdata.patch
new file mode 100644
index 0000000..2e046fc
--- /dev/null
+++ b/debian/patches/system-install-Install-appdata.patch
@@ -0,0 +1,149 @@
+From c4b2cce04173f1a679d7febd2f3e46b6e6a21c73 Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner at gmail.com>
+Date: Fri, 3 Apr 2015 22:18:15 +0200
+Subject: [PATCH 5/5] system-install: Install appdata
+
+---
+ src/install/nix/redeclipse.appdata.xml | 40 -------------------------------
+ src/install/nix/redeclipse.appdata.xml.am | 40 +++++++++++++++++++++++++++++++
+ src/system-install.mk | 9 +++++++
+ 3 files changed, 49 insertions(+), 40 deletions(-)
+ delete mode 100644 src/install/nix/redeclipse.appdata.xml
+ create mode 100644 src/install/nix/redeclipse.appdata.xml.am
+
+diff --git a/src/install/nix/redeclipse.appdata.xml b/src/install/nix/redeclipse.appdata.xml
+deleted file mode 100644
+index 60b9e2f..0000000
+--- a/src/install/nix/redeclipse.appdata.xml
++++ /dev/null
+@@ -1,40 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<component type="desktop">
+- <id>@APPNAME at .desktop</id>
+- <metadata_license>CC-BY-SA-3.0+</metadata_license>
+- <project_license>ZLIB and CC-BY-SA-3.0+</project_license>
+- <description>
+- <p>
+- Red Eclipse is a fun-filled new take on the casual first person arena
+- shooter, built as a total conversion of Cube Engine 2, which lends itself
+- toward a balanced gameplay, with a general theme of agility in a variety
+- of environments.
+- </p>
+- <ul>
+- <li>Cross-platform multiplayer</li>
+- <li>Features parkour, impulse boosts, dashing, and other tricks</li>
+- <li>Favourite gamemodes with an array of mutators and variables</li>
+- <li>Builtin editor lets you create your own maps cooperatively online</li>
+- </ul>
+- </description>
+- <url type="homepage">http://redeclipse.net/</url>
+- <screenshots>
+- <screenshot type="default">
+- <image>http://redeclipse.net/bits/images/053.jpg</image>
+- <caption>Posing with fire on the map venus</caption>
+- </screenshot>
+- <screenshot>
+- <image>http://redeclipse.net/bits/images/045.jpg</image>
+- <caption>Mine fireworks on the map vault</caption>
+- </screenshot>
+- <screenshot>
+- <image>http://redeclipse.net/bits/images/019.jpg</image>
+- <caption>Overlooking friendly fire on the map cutec</caption>
+- </screenshot>
+- </screenshots>
+- <updatecontact>http://redeclipse.net/forum/</updatecontact>
+- <developer_name>Red Eclipse Team</developer_name>
+- <url type="bugtracker">https://github.com/red-eclipse/base/issues</url>
+- <url type="donation">http://redeclipse.net/donate</url>
+- <url type="help">http://redeclipse.net/faq</url>
+-</component>
+diff --git a/src/install/nix/redeclipse.appdata.xml.am b/src/install/nix/redeclipse.appdata.xml.am
+new file mode 100644
+index 0000000..60b9e2f
+--- /dev/null
++++ b/src/install/nix/redeclipse.appdata.xml.am
+@@ -0,0 +1,40 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop">
++ <id>@APPNAME at .desktop</id>
++ <metadata_license>CC-BY-SA-3.0+</metadata_license>
++ <project_license>ZLIB and CC-BY-SA-3.0+</project_license>
++ <description>
++ <p>
++ Red Eclipse is a fun-filled new take on the casual first person arena
++ shooter, built as a total conversion of Cube Engine 2, which lends itself
++ toward a balanced gameplay, with a general theme of agility in a variety
++ of environments.
++ </p>
++ <ul>
++ <li>Cross-platform multiplayer</li>
++ <li>Features parkour, impulse boosts, dashing, and other tricks</li>
++ <li>Favourite gamemodes with an array of mutators and variables</li>
++ <li>Builtin editor lets you create your own maps cooperatively online</li>
++ </ul>
++ </description>
++ <url type="homepage">http://redeclipse.net/</url>
++ <screenshots>
++ <screenshot type="default">
++ <image>http://redeclipse.net/bits/images/053.jpg</image>
++ <caption>Posing with fire on the map venus</caption>
++ </screenshot>
++ <screenshot>
++ <image>http://redeclipse.net/bits/images/045.jpg</image>
++ <caption>Mine fireworks on the map vault</caption>
++ </screenshot>
++ <screenshot>
++ <image>http://redeclipse.net/bits/images/019.jpg</image>
++ <caption>Overlooking friendly fire on the map cutec</caption>
++ </screenshot>
++ </screenshots>
++ <updatecontact>http://redeclipse.net/forum/</updatecontact>
++ <developer_name>Red Eclipse Team</developer_name>
++ <url type="bugtracker">https://github.com/red-eclipse/base/issues</url>
++ <url type="donation">http://redeclipse.net/donate</url>
++ <url type="help">http://redeclipse.net/faq</url>
++</component>
+diff --git a/src/system-install.mk b/src/system-install.mk
+index 1f0b1cd..eaa3c41 100644
+--- a/src/system-install.mk
++++ b/src/system-install.mk
+@@ -17,6 +17,7 @@ mandir=$(DESTDIR)$(prefix)/share/man
+ menudir=$(DESTDIR)$(prefix)/share/applications
+ icondir=$(DESTDIR)$(prefix)/share/icons/hicolor
+ pixmapdir=$(DESTDIR)$(prefix)/share/pixmaps
++appdatadir=$(DESTDIR)$(prefix)/share/appdata
+
+ ICONS= \
+ install/nix/$(appsrcname)_x16.png \
+@@ -124,6 +125,7 @@ system-install-docs: $(MANPAGES)
+
+ system-install-menus: icons
+ $(MKDIR) $(menudir)
++ $(MKDIR) $(appdatadir)
+ $(MKDIR) $(icondir)/16x16/apps
+ $(MKDIR) $(icondir)/32x32/apps
+ $(MKDIR) $(icondir)/48x48/apps
+@@ -136,6 +138,12 @@ system-install-menus: icons
+ -e 's, at APPNAME@,$(appname),g' \
+ install/nix/$(appsrcname).desktop.am > \
+ $(menudir)/$(appname).desktop
++ sed -e 's, at LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
++ -e 's, at DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
++ -e 's, at DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
++ -e 's, at APPNAME@,$(appname),g' \
++ install/nix/$(appsrcname).appdata.xml.am > \
++ $(appdatadir)/$(appname).appdata.xml
+ install -m644 install/nix/$(appsrcname)_x16.png \
+ $(icondir)/16x16/apps/$(appname).png
+ install -m644 install/nix/$(appsrcname)_x32.png \
+@@ -184,6 +192,7 @@ system-uninstall-docs:
+
+ system-uninstall-menus:
+ @rm -fv $(menudir)/$(appname).desktop
++ @rm -fv $(appdatadir)/$(appname).appdata.xml
+ @rm -fv $(icondir)/16x16/apps/$(appname).png
+ @rm -fv $(icondir)/32x32/apps/$(appname).png
+ @rm -fv $(icondir)/48x48/apps/$(appname).png
+--
+2.1.4
+
diff --git a/debian/redeclipse.install b/debian/redeclipse.install
index 3f6db8d..eca3dfb 100644
--- a/debian/redeclipse.install
+++ b/debian/redeclipse.install
@@ -1,5 +1,6 @@
usr/games/redeclipse
usr/lib/games/redeclipse/redeclipse
usr/share/applications
+usr/share/appdata
usr/share/icons
usr/share/pixmaps
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git
More information about the Pkg-games-commits
mailing list