[josm] 07/08: Add upstream patch to fix AppSteam metadata.

Bas Couwenberg sebastic at debian.org
Sun Jul 30 21:39:00 UTC 2017 

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit f85b10c932efc90d197afcb8bd25a4e618be75b7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 30 23:11:56 2017 +0200

    Add upstream patch to fix AppSteam metadata.
---
 debian/changelog                                   |   1 +
 debian/josm.dirs                                   |   4 +-
 debian/patches/series                              |   1 +
 ...2543_follow-AppStream-metadata-guidelines.patch | 117 +++++++++++++++++++++
 debian/rules                                       |   2 +-
 5 files changed, 122 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d96f7c..83e40e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ josm (0.0.svn12542+dfsg-1) UNRELEASED; urgency=medium
   * Refresh patches.
   * Drop license & copyright for DNSNameFix.java, removed upstream.
   * Bump minimum required jmapviewer version to 2.3.
+  * Add upstream patch to fix AppSteam metadata.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 30 Jul 2017 22:47:05 +0200
 
diff --git a/debian/josm.dirs b/debian/josm.dirs
index 1344346..1929c85 100644
--- a/debian/josm.dirs
+++ b/debian/josm.dirs
@@ -1,5 +1,5 @@
 /usr/bin
+/usr/share/applications
 /usr/share/josm
+/usr/share/metainfo
 /usr/share/pixmaps
-/usr/share/applications
-/usr/share/appdata
diff --git a/debian/patches/series b/debian/patches/series
index 0e16b21..ba05430 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch
 08-use_noto_font.patch
+svn-r12543_follow-AppStream-metadata-guidelines.patch
diff --git a/debian/patches/svn-r12543_follow-AppStream-metadata-guidelines.patch b/debian/patches/svn-r12543_follow-AppStream-metadata-guidelines.patch
new file mode 100644
index 0000000..05b8d1b
--- /dev/null
+++ b/debian/patches/svn-r12543_follow-AppStream-metadata-guidelines.patch
@@ -0,0 +1,117 @@
+Description: Follow AppStream metadata guidelines.
+Author: Don-vip
+Origin: https://josm.openstreetmap.de/changeset/12543/josm
+Bug: https://josm.openstreetmap.de/ticket/15096
+
+--- a/linux/latest/usr/share/appdata/josm-latest.appdata.xml
++++ /dev/null
+@@ -1,22 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<application>
+-  <id type="desktop">josm-latest.desktop</id>
+-  <metadata_license>CC-BY-SA-3.0</metadata_license>
+-  <project_license>GPL-2.0+</project_license>
+-  <name>JOSM</name>
+-  <summary>Java OpenStreetMap Editor</summary>
+-  <description>
+-    <p>
+-    JOSM is an extensible off-line editor for ​OpenStreetMap (OSM) written in ​Java.
+-    </p>
+-    <p>
+-    It supports loading stand-alone GPX tracks and GPX track data from the OSM database as well as loading and 
+-    editing existing nodes, ways, metadata tags and relations from the OSM database.
+-    </p>
+-  </description>
+-  <screenshots>
+-    <screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png</screenshot>
+-  </screenshots>
+-  <url type="homepage">https://josm.openstreetmap.de</url>
+-  <updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
+-</application>
+\ No newline at end of file
+--- /dev/null
++++ b/linux/latest/usr/share/metainfo/josm-latest.appdata.xml
+@@ -0,0 +1,27 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop-application">
++  <id>josm-latest.desktop</id>
++  <metadata_license>CC-BY-SA-3.0</metadata_license>
++  <project_license>GPL-2.0+</project_license>
++  <name>JOSM</name>
++  <summary>Java OpenStreetMap Editor</summary>
++  <description>
++    <p>
++    JOSM is an extensible off-line editor for ​OpenStreetMap (OSM) written in ​Java.
++    </p>
++    <p>
++    It supports loading stand-alone GPX tracks and GPX track data from the OSM database as well as loading and 
++    editing existing nodes, ways, metadata tags and relations from the OSM database.
++    </p>
++  </description>
++  <categories>
++    <category>Education</category>
++    <category>Geoscience</category>
++    <category>Maps</category>
++  </categories>
++  <screenshots>
++    <screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png</screenshot>
++  </screenshots>
++  <url type="homepage">https://josm.openstreetmap.de</url>
++  <updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
++</component>
+--- a/linux/tested/usr/share/appdata/josm.appdata.xml
++++ /dev/null
+@@ -1,22 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<application>
+-  <id type="desktop">josm.desktop</id>
+-  <metadata_license>CC-BY-SA-3.0</metadata_license>
+-  <project_license>GPL-2.0+</project_license>
+-  <name>JOSM</name>
+-  <summary>Java OpenStreetMap Editor</summary>
+-  <description>
+-    <p>
+-    JOSM is an extensible off-line editor for ​OpenStreetMap (OSM) written in ​Java.
+-    </p>
+-    <p>
+-    It supports loading stand-alone GPX tracks and GPX track data from the OSM database as well as loading and 
+-    editing existing nodes, ways, metadata tags and relations from the OSM database.
+-    </p>
+-  </description>
+-  <screenshots>
+-    <screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png</screenshot>
+-  </screenshots>
+-  <url type="homepage">https://josm.openstreetmap.de</url>
+-  <updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
+-</application>
+\ No newline at end of file
+--- /dev/null
++++ b/linux/tested/usr/share/metainfo/josm.appdata.xml
+@@ -0,0 +1,27 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component type="desktop-application">
++  <id>josm.desktop</id>
++  <metadata_license>CC-BY-SA-3.0</metadata_license>
++  <project_license>GPL-2.0+</project_license>
++  <name>JOSM</name>
++  <summary>Java OpenStreetMap Editor</summary>
++  <description>
++    <p>
++    JOSM is an extensible off-line editor for ​OpenStreetMap (OSM) written in ​Java.
++    </p>
++    <p>
++    It supports loading stand-alone GPX tracks and GPX track data from the OSM database as well as loading and 
++    editing existing nodes, ways, metadata tags and relations from the OSM database.
++    </p>
++  </description>
++  <categories>
++    <category>Education</category>
++    <category>Geoscience</category>
++    <category>Maps</category>
++  </categories>
++  <screenshots>
++    <screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png</screenshot>
++  </screenshots>
++  <url type="homepage">https://josm.openstreetmap.de</url>
++  <updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
++</component>
diff --git a/debian/rules b/debian/rules
index b6190c8..17f370f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ override_dh_auto_install:
 
 	install -m 644 $(CURDIR)/linux/tested/usr/share/pixmaps/josm.png $(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
 	install -m 644 $(CURDIR)/linux/tested/usr/share/applications/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
-	install -m 644 $(CURDIR)/linux/tested/usr/share/appdata/josm.appdata.xml $(CURDIR)/debian/josm/usr/share/appdata/josm.appdata.xml
+	install -m 644 $(CURDIR)/linux/tested/usr/share/metainfo/josm.appdata.xml $(CURDIR)/debian/josm/usr/share/metainfo/josm.appdata.xml
 
 override_dh_install:
 	dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git

More information about the Pkg-grass-devel mailing list