[redeclipse] 490/494: Drop all backported patches now in new release
Martin Werner
arand-guest at moszumanska.debian.org
Sun Jun 21 20:53:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
arand-guest pushed a commit to branch debdir
in repository redeclipse.
commit 4309e002a39f1f41bfcf8dc5be8bf40273b0d130
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Fri Jun 19 14:08:20 2015 +0200
Drop all backported patches now in new release
---
changelog | 12 +-
patches/appdata-Fill-in-remove-FIXMEs.patch | 49 -------
.../appdata-Update-description-screenshots.patch | 62 ---------
patches/appdata-Upgrade-via-appstream-util.patch | 65 ---------
.../appdate-Use-template-set-at-install-name.patch | 25 ----
patches/series | 8 --
...all-Add-common-install-target-for-common-.patch | 87 ------------
...all-Add-doc-link-for-client-finding-guide.patch | 52 -------
patches/system-install-Install-appdata.patch | 149 ---------------------
...tall-Move-guidelines.txt-to-common-target.patch | 78 -----------
10 files changed, 8 insertions(+), 579 deletions(-)
diff --git a/changelog b/changelog
index 4882832..7c082e8 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,15 @@
redeclipse (1.5.2+ds1-1) UNRELEASED; urgency=medium
* New upstream patch release 1.5 "Aurora Edition" Patch 2
- * Move guidelines.txt to redeclipse-common via upstream patch, symlink
- doc->data instead of other way around, avoiding §12.3 policy
- semi-violation (file was used but not *needed*).
- - Add system-install-Move-guidelines.txt-to-common-target.patch
* Use uscan to repack tarball via Files-Ecluded in debian/copyright
+ * Drop backported patches which are now in new release
+ - Delete appdata-Fill-in-remove-FIXMEs.patch
+ - Delete appdata-Update-description-screenshots.patch
+ - Delete appdata-Upgrade-via-appstream-util.patch
+ - Delete appdate-Use-template-set-at-install-name.patch
+ - Delete system-install-Add-common-install-target-for-common-.patch
+ - Delete system-install-Add-doc-link-for-client-finding-guide.patch
+ - Delete system-install-Install-appdata.patch
-- Martin Erik Werner <martinerikwerner at gmail.com> Wed, 22 Apr 2015 21:42:31 +0200
diff --git a/patches/appdata-Fill-in-remove-FIXMEs.patch b/patches/appdata-Fill-in-remove-FIXMEs.patch
deleted file mode 100644
index 95d7111..0000000
--- a/patches/appdata-Fill-in-remove-FIXMEs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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/patches/appdata-Update-description-screenshots.patch b/patches/appdata-Update-description-screenshots.patch
deleted file mode 100644
index 51b4923..0000000
--- a/patches/appdata-Update-description-screenshots.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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/patches/appdata-Upgrade-via-appstream-util.patch b/patches/appdata-Upgrade-via-appstream-util.patch
deleted file mode 100644
index 81af29a..0000000
--- a/patches/appdata-Upgrade-via-appstream-util.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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/patches/appdate-Use-template-set-at-install-name.patch b/patches/appdate-Use-template-set-at-install-name.patch
deleted file mode 100644
index c6cdc25..0000000
--- a/patches/appdate-Use-template-set-at-install-name.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/patches/series b/patches/series
index d8cb28a..18371e9 100644
--- a/patches/series
+++ b/patches/series
@@ -1,9 +1 @@
windowed-by-default.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
-system-install-Add-doc-link-for-client-finding-guide.patch
-system-install-Move-guidelines.txt-to-common-target.patch
diff --git a/patches/system-install-Add-common-install-target-for-common-.patch b/patches/system-install-Add-common-install-target-for-common-.patch
deleted file mode 100644
index a156397..0000000
--- a/patches/system-install-Add-common-install-target-for-common-.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 0e67905e42fae53e7d1f377fe8cd7e6a88f3cbb9 Mon Sep 17 00:00:00 2001
-From: Martin Erik Werner <martinerikwerner at gmail.com>
-Date: Fri, 3 Apr 2015 11:23:59 +0200
-Subject: [PATCH] system-install: Add common install target for common config
-
-version.cfg is needed by both client and server, in order to cater to
-this the simplest solution seems to be to stuff the whole config dir in
-a common install target (instead of picking out the version.cfg file
-specifically, and mess with exclusion when handling the config dir in
-other targets). In distro packaging, this might make a separate package.
----
- src/system-install.mk | 24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/src/system-install.mk b/src/system-install.mk
-index e6eae10..1f0b1cd 100644
---- a/src/system-install.mk
-+++ b/src/system-install.mk
-@@ -55,6 +55,7 @@ icons: $(ICONS)
- system-install-client: client
- $(MKDIR) $(libexecdir)/$(appname)
- $(MKDIR) $(gamesbindir)
-+ $(MKDIR) $(datadir)/$(appname)
- install -m755 $(appclient) $(libexecdir)/$(appname)/$(appname)
- install -m755 install/nix/$(appsrcname).am \
- $(gamesbindir)/$(appname)
-@@ -89,14 +90,17 @@ system-install-server: server
- g, at APPNAME@,\
- s, at APPNAME@,$(appname),g\n\
- w\n" | ed -s $(gamesbindir)/$(appname)-server
-- install -m644 ../config/version.cfg \
-- $(datadir)/$(appname)/version.cfg
-- ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/version.cfg \
-- $(libexecdir)/$(appname)/version.cfg
-+
-+system-install-common:
-+ $(MKDIR) $(libexecdir)/$(appname)
-+ $(MKDIR) $(datadir)/$(appname)
-+ cp -r ../config $(datadir)/$(appname)/config
-+ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/config \
-+ $(libexecdir)/$(appname)/config
-
- system-install-data:
-+ $(MKDIR) $(datadir)/$(appname)
- cp -r ../data $(datadir)/$(appname)/data
-- rm -f $(datadir)/$(appname)/data/misc/largeandincharge.png
-
- system-install-docs: $(MANPAGES)
- $(MKDIR) $(mandir)/man6
-@@ -154,12 +158,15 @@ system-install-cube2font-docs: ../doc/man/cube2font.1
- gzip -9 -n -c < ../doc/man/cube2font.1 \
- > $(mandir)/man1/cube2font.1.gz
-
--system-install: system-install-client system-install-server system-install-data system-install-docs system-install-menus
-+system-install: system-install-client system-install-server system-install-common system-install-data system-install-docs system-install-menus
-+
-+system-uninstall-common:
-+ rm -rf $(datadir)/$(appname)/config
-+ @rm -fv $(libexecdir)/$(appname)/config
-
- system-uninstall-client:
- @rm -fv $(libexecdir)/$(appname)/$(appname)
- @rm -fv $(libexecdir)/$(appname)/data
-- @rm -fv $(libexecdir)/$(appname)/version.cfg
- @rm -fv $(gamesbindir)/$(appname)
-
- system-uninstall-server:
-@@ -168,7 +175,6 @@ system-uninstall-server:
-
- system-uninstall-data:
- rm -rf $(datadir)/$(appname)/data
-- rm -fv $(datadir)/$(appname)/version.cfg
-
- system-uninstall-docs:
- @rm -rfv $(docdir)/$(appname)/examples
-@@ -185,7 +191,7 @@ system-uninstall-menus:
- @rm -fv $(icondir)/128x128/apps/$(appname).png
- @rm -fv $(pixmapdir)/$(appname).xpm
-
--system-uninstall: system-uninstall-client system-uninstall-server system-uninstall-data system-uninstall-docs system-uninstall-menus
-+system-uninstall: system-uninstall-client system-uninstall-server system-uninstall-common system-uninstall-data system-uninstall-docs system-uninstall-menus
- - at rmdir -v $(libexecdir)/$(appname)
- - at rmdir -v $(datadir)/$(appname)
- - at rmdir -v $(docdir)/$(appname)
---
-2.1.4
-
diff --git a/patches/system-install-Add-doc-link-for-client-finding-guide.patch b/patches/system-install-Add-doc-link-for-client-finding-guide.patch
deleted file mode 100644
index 1e67670..0000000
--- a/patches/system-install-Add-doc-link-for-client-finding-guide.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 38ba0f83dd7a27e90c44cb124f8b34e83429c561 Mon Sep 17 00:00:00 2001
-From: Martin Erik Werner <martinerikwerner at gmail.com>
-Date: Sat, 4 Apr 2015 15:30:08 +0200
-Subject: [PATCH] system-install: Add doc link for client finding
- guidelines.txt
-
-Since the client needs to read guidelines.txt the first time the user
-connects to the master server, it needs to be installed in an accessible
-location for the client, add a symlink for this purpose.
-
-Also re-arrange so that the install target which has the real data also
-takes care of the link, avoiding broken symlinks.
----
- src/system-install.mk | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/system-install.mk b/src/system-install.mk
-index eaa3c41..27fc5c1 100644
---- a/src/system-install.mk
-+++ b/src/system-install.mk
-@@ -70,8 +70,6 @@ system-install-client: client
- g, at APPNAME@,\
- s, at APPNAME@,$(appname),g\n\
- w\n" | ed -s $(gamesbindir)/$(appname)
-- ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/data \
-- $(libexecdir)/$(appname)/data
-
- system-install-server: server
- $(MKDIR) $(libexecdir)/$(appname)
-@@ -101,7 +99,10 @@ system-install-common:
-
- system-install-data:
- $(MKDIR) $(datadir)/$(appname)
-+ $(MKDIR) $(libexecdir)/$(appname)
- cp -r ../data $(datadir)/$(appname)/data
-+ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/data \
-+ $(libexecdir)/$(appname)/data
-
- system-install-docs: $(MANPAGES)
- $(MKDIR) $(mandir)/man6
-@@ -122,6 +123,8 @@ system-install-docs: $(MANPAGES)
- gzip -9 -n -c > $(mandir)/man6/$(appname)-server.6.gz
- cp -r ../doc/examples $(docdir)/$(appname)/examples
- cp ../doc/guidelines.txt $(docdir)/$(appname)/guidelines.txt
-+ ln -s $(patsubst $(DESTDIR)%,%,$(docdir))/$(appname) \
-+ $(libexecdir)/$(appname)/doc
-
- system-install-menus: icons
- $(MKDIR) $(menudir)
---
-2.1.4
-
diff --git a/patches/system-install-Install-appdata.patch b/patches/system-install-Install-appdata.patch
deleted file mode 100644
index 2e046fc..0000000
--- a/patches/system-install-Install-appdata.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-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/patches/system-install-Move-guidelines.txt-to-common-target.patch b/patches/system-install-Move-guidelines.txt-to-common-target.patch
deleted file mode 100644
index 91a1c8c..0000000
--- a/patches/system-install-Move-guidelines.txt-to-common-target.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 96ea04d527d40dd67f8894a9e86e7ffbec22adab Mon Sep 17 00:00:00 2001
-From: Martin Erik Werner <martinerikwerner at gmail.com>
-Date: Wed, 22 Apr 2015 15:52:25 +0200
-Subject: [PATCH] system-install: Move guidelines.txt to common target
-
-According to Debian policy
-https://www.debian.org/doc/debian-policy/ch-docs.html#fr115
-
- Packages must not require the existence of any files in /usr/share/doc/
- in order to function. Any files that are referenced by programs but are
- also useful as stand alone documentation should be installed under
- /usr/share/package/ with symbolic links from /usr/share/doc/package.
-
-Currently we kind-of violate this, and since Debian/Ubuntu is a main
-packageing target, let's not:
-
-Move the installation of guidelines.txt into the system-install-common
-target where guidelines.txt is now installed into
-$(datadir)/$(appname)/doc and two symlinks point towards this location.
-This allows keeping guidelines.txt available for both client (to display
-in GUI) and server (to be read by admin in plaintext), whilst not
-duplicating the file.
----
- src/system-install.mk | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/system-install.mk b/src/system-install.mk
-index 27fc5c1..d9ec838 100644
---- a/src/system-install.mk
-+++ b/src/system-install.mk
-@@ -93,9 +93,16 @@ system-install-server: server
- system-install-common:
- $(MKDIR) $(libexecdir)/$(appname)
- $(MKDIR) $(datadir)/$(appname)
-+ $(MKDIR) $(datadir)/$(appname)/doc
-+ $(MKDIR) $(docdir)/$(appname)
- cp -r ../config $(datadir)/$(appname)/config
- ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/config \
- $(libexecdir)/$(appname)/config
-+ install -m644 ../doc/guidelines.txt $(datadir)/$(appname)/doc
-+ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/doc \
-+ $(libexecdir)/$(appname)/doc
-+ ln -s $(patsubst $(DESTDIR)%,%,$(datadir))/$(appname)/doc/guidelines.txt \
-+ $(docdir)/$(appname)/guidelines.txt
-
- system-install-data:
- $(MKDIR) $(datadir)/$(appname)
-@@ -122,9 +129,6 @@ system-install-docs: $(MANPAGES)
- ../doc/man/$(appsrcname)-server.6.am | \
- gzip -9 -n -c > $(mandir)/man6/$(appname)-server.6.gz
- cp -r ../doc/examples $(docdir)/$(appname)/examples
-- cp ../doc/guidelines.txt $(docdir)/$(appname)/guidelines.txt
-- ln -s $(patsubst $(DESTDIR)%,%,$(docdir))/$(appname) \
-- $(libexecdir)/$(appname)/doc
-
- system-install-menus: icons
- $(MKDIR) $(menudir)
-@@ -174,6 +178,9 @@ system-install: system-install-client system-install-server system-install-commo
- system-uninstall-common:
- rm -rf $(datadir)/$(appname)/config
- @rm -fv $(libexecdir)/$(appname)/config
-+ rm -rf $(datadir)/$(appname)/doc
-+ @rm -fv $(libexecdir)/$(appname)/doc
-+ @rm -fv $(docdir)/$(appname)/guidelines.txt
-
- system-uninstall-client:
- @rm -fv $(libexecdir)/$(appname)/$(appname)
-@@ -189,7 +196,6 @@ system-uninstall-data:
-
- system-uninstall-docs:
- @rm -rfv $(docdir)/$(appname)/examples
-- @rm -fv $(docdir)/$(appname)/guidelines.txt
- @rm -fv $(mandir)/man6/$(appname).6.gz
- @rm -fv $(mandir)/man6/$(appname)-server.6.gz
-
---
-2.1.4
-
--
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