[Git][debian-gis-team/saga][master] Add upstream patches to update AppStream metadata for non-legacy format.

Bas Couwenberg gitlab at salsa.debian.org
Thu Aug 16 09:00:11 BST 2018


Bas Couwenberg pushed to branch master at Debian GIS Project / saga


Commits:
81fa65ca by Bas Couwenberg at 2018-08-16T07:56:19Z
Add upstream patches to update AppStream metadata for non-legacy format.

- - - - -


7 changed files:

- debian/changelog
- + debian/patches/0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
- + debian/patches/0001-update-AppStream-metadata-to-conform-with-specificat.patch
- + debian/patches/0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
- debian/patches/series
- debian/saga.install
- debian/saga.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+saga (2.3.1+dfsg-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add upstream patches to update AppStream metadata for non-legacy format.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 15 Aug 2018 16:31:10 +0200
+
 saga (2.3.1+dfsg-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
=====================================
--- /dev/null
+++ b/debian/patches/0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
@@ -0,0 +1,114 @@
+Description: further fixes to AppStream metadata, refers to [bugs:#264]
+Author: Volker Wichmann <wichmann at laserdata.at>
+Origin: https://sourceforge.net/p/saga-gis/code/ci/3fb9cbbd03c15d90f41d8b800a839649c5d36871/
+Bug: https://sourceforge.net/p/saga-gis/bugs/264/
+
+--- a/src/saga_core/saga_gui/Makefile.am
++++ b/src/saga_core/saga_gui/Makefile.am
+@@ -234,7 +234,7 @@ install-icons:
+ 	$(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
+ 
+ appdatadir = $(datadir)/metainfo
+-dist_appdata_DATA = res/org.saga-gis.saga-gui.metainfo.xml
++dist_appdata_DATA = res/org.saga-gis.saga-gui.appdata.xml
+ 
+ dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
+ 
+--- a/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.metainfo.xml
++++ /dev/null
+@@ -1,47 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<component>
+-  <id type="desktop.application">org.saga_gis.saga.desktop</id>
+-  <metadata_license>CC0-1.0</metadata_license>
+-  <name>SAGA</name>
+-  <summary>System for Automated Geoscientific Analyses</summary>
+-  <icon type="remote" width="192" height="192">https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/src/saga_core/saga_gui/res/saga_icon_192.png</icon>
+-  <description>
+-    <p>
+-        SAGA is a Geographic Information System (GIS) software with 
+-        immense capabilities for geodata processing and analysis. 
+-        Due to the modular organization of the geoprocessing tools, they can 
+-        be accessed either through the graphical user interface or 
+-        via the command line application.
+-    </p>
+-    <p>
+-        Furthermore, SAGA provides an effective Application Programming Interface 
+-        (API) which makes it easy to implement new tools and functionality.
+-    </p>
+-  </description>
+-  <categories>
+-    <category>Education</category>
+-    <category>Science</category>
+-    <category>Geoscience</category>
+-  </categories>
+-  <url type="homepage">http://www.saga-gis.org</url>
+-  <url type="bugtracker">https://sourceforge.net/p/saga-gis/bugs/</url>
+-  <url type="help">http://www.saga-gis.org/saga_tool_doc/index.html</url>
+-  <launchable type="desktop-id">org.saga_gis.saga.desktop</launchable>
+-  <releases>
+-    <release version="6.5.0">
+-  </releases>
+-  <provides>
+-    <binary>saga_gui</binary>
+-    <binary>saga_cmd</binary>
+-  </provides>
+-  <project_license>GPL-2.0-or-later and LGPL-2.1-or-later</project_license>
+-  <developer_name>SAGA Development Team</developer_name>
+-  <screenshots>
+-    <screenshot type="default">
+-      <caption>The FooBar main window.</caption>
+-      <image type="source" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</image>
+-    </screenshot>
+-  </screenshots>
+-  <updatecontact>https://sourceforge.net/p/saga-gis/feature-requests/</updatecontact>
+-</component>
+-
+--- /dev/null
++++ b/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
+@@ -0,0 +1,45 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2018 SAGA Development Team -->
++<component type="desktop">
++  <id type="desktop.application">org.saga_gis.saga.desktop</id>
++  <metadata_license>CC0-1.0</metadata_license>
++  <name>SAGA</name>
++  <summary>System for Automated Geoscientific Analyses</summary>
++  <icon type="remote" width="192" height="192">https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/src/saga_core/saga_gui/res/saga_icon_192.png</icon>
++  <description>
++    <p>
++        SAGA is a Geographic Information System (GIS) software with 
++        immense capabilities for geodata processing and analysis. 
++        Due to the modular organization of the geoprocessing tools, they can 
++        be accessed either through the graphical user interface or 
++        via the command line application.
++    </p>
++    <p>
++        Furthermore, SAGA provides an effective Application Programming Interface 
++        (API) which makes it easy to implement new tools and functionality.
++    </p>
++  </description>
++  <categories>
++    <category>Education</category>
++    <category>Science</category>
++    <category>Geoscience</category>
++  </categories>
++  <url type="homepage">http://www.saga-gis.org</url>
++  <url type="bugtracker">https://sourceforge.net/p/saga-gis/bugs/</url>
++  <url type="help">http://www.saga-gis.org/saga_tool_doc/index.html</url>
++  <launchable type="desktop-id">org.saga_gis.saga.desktop</launchable>
++  <provides>
++    <binary>saga_gui</binary>
++    <binary>saga_cmd</binary>
++  </provides>
++  <project_license>GPL-2.0-or-later and LGPL-2.1-or-later</project_license>
++  <developer_name>SAGA Development Team</developer_name>
++  <screenshots>
++    <screenshot type="default">
++      <caption>The SAGA GUI main window</caption>
++      <image type="source" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</image>
++    </screenshot>
++  </screenshots>
++  <update_contact>https://sourceforge.net/p/saga-gis/feature-requests/</update_contact>
++</component>
++


=====================================
debian/patches/0001-update-AppStream-metadata-to-conform-with-specificat.patch
=====================================
--- /dev/null
+++ b/debian/patches/0001-update-AppStream-metadata-to-conform-with-specificat.patch
@@ -0,0 +1,108 @@
+Description: update AppStream metadata to conform with specification 0.12
+ refers to [bugs:#264] Legacy AppStream metadata format
+Author: Volker Wichmann <wichmann at laserdata.at>
+Origin: https://sourceforge.net/p/saga-gis/code/ci/42dbd92e0f45a44ae5a55e79da523061691bdab0/
+
+--- a/src/saga_core/saga_gui/Makefile.am
++++ b/src/saga_core/saga_gui/Makefile.am
+@@ -233,8 +233,8 @@ install-icons:
+ 	mkdir -p $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps; \
+ 	$(INSTALL_DATA) res/saga.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/saga.png
+ 
+-appdatadir = $(datadir)/appdata
+-dist_appdata_DATA = res/saga.appdata.xml
++appdatadir = $(datadir)/metainfo
++dist_appdata_DATA = res/org.saga-gis.saga-gui.metainfo.xml
+ 
+ dist_pkgdata_DATA = res/saga_tip.txt res/saga_dic.txt res/saga_srs.txt
+ 
+--- /dev/null
++++ b/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.metainfo.xml
+@@ -0,0 +1,47 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component>
++  <id type="desktop.application">org.saga_gis.saga.desktop</id>
++  <metadata_license>CC0-1.0</metadata_license>
++  <name>SAGA</name>
++  <summary>System for Automated Geoscientific Analyses</summary>
++  <icon type="remote" width="192" height="192">https://sourceforge.net/p/saga-gis/code/ci/master/tree/saga-gis/src/saga_core/saga_gui/res/saga_icon_192.png</icon>
++  <description>
++    <p>
++        SAGA is a Geographic Information System (GIS) software with 
++        immense capabilities for geodata processing and analysis. 
++        Due to the modular organization of the geoprocessing tools, they can 
++        be accessed either through the graphical user interface or 
++        via the command line application.
++    </p>
++    <p>
++        Furthermore, SAGA provides an effective Application Programming Interface 
++        (API) which makes it easy to implement new tools and functionality.
++    </p>
++  </description>
++  <categories>
++    <category>Education</category>
++    <category>Science</category>
++    <category>Geoscience</category>
++  </categories>
++  <url type="homepage">http://www.saga-gis.org</url>
++  <url type="bugtracker">https://sourceforge.net/p/saga-gis/bugs/</url>
++  <url type="help">http://www.saga-gis.org/saga_tool_doc/index.html</url>
++  <launchable type="desktop-id">org.saga_gis.saga.desktop</launchable>
++  <releases>
++    <release version="6.5.0">
++  </releases>
++  <provides>
++    <binary>saga_gui</binary>
++    <binary>saga_cmd</binary>
++  </provides>
++  <project_license>GPL-2.0-or-later and LGPL-2.1-or-later</project_license>
++  <developer_name>SAGA Development Team</developer_name>
++  <screenshots>
++    <screenshot type="default">
++      <caption>The FooBar main window.</caption>
++      <image type="source" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</image>
++    </screenshot>
++  </screenshots>
++  <updatecontact>https://sourceforge.net/p/saga-gis/feature-requests/</updatecontact>
++</component>
++
+--- a/src/saga_core/saga_gui/res/saga.appdata.xml
++++ /dev/null
+@@ -1,27 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!-- Copyright 2014 SAGA Development Team -->
+-<application>
+-    <id type="desktop">saga.desktop</id>
+-    <metadata_license>CC0-1.0</metadata_license>
+-    <project_license>GPL-2.0 and LGPL-2.1</project_license>
+-    <name>SAGA</name>
+-    <summary>System for Automated Geoscientific Analyses</summary>
+-    <description>
+-        <p>
+-            SAGA is a Geographic Information System (GIS) software with 
+-            immense capabilities for geodata processing and analysis. 
+-            Due to the modular organization of the geoprocessing tools, they can 
+-            be accessed either through the graphical user interface or 
+-            via the command line application.
+-        </p>
+-        <p>
+-            Furthermore, SAGA provides an effective Application Programming Interface 
+-            which makes it easy to implement new tools and functionality.
+-        </p>
+-    </description>
+-    <screenshots>
+-        <screenshot type="default" width="1280" height="720">http://sourceforge.net/projects/saga-gis/files/SAGA%20-%20Documentation/Other/AppData/screenshot_SAGA_GUI.png</screenshot>
+-    </screenshots>
+-    <url type="homepage">http://www.saga-gis.org</url>
+-    <updatecontact>http://sourceforge.net/p/saga-gis/feature-requests/?source=navbar</updatecontact>
+-</application>
+--- a/src/saga_core/saga_gui/res/saga.desktop
++++ b/src/saga_core/saga_gui/res/saga.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Name=SAGA GIS
+-GenericName=A System for Automated Geoscientific Analyses 
++GenericName=System for Automated Geoscientific Analyses 
+ Comment=Geodata Processing and Analysis
+ Type=Application
+ Exec=saga_gui


=====================================
debian/patches/0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
=====================================
--- /dev/null
+++ b/debian/patches/0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
@@ -0,0 +1,16 @@
+Description: further fixes to AppStream metadata, refers to [bugs:#264]
+Author: Volker Wichmann <wichmann at laserdata.at>
+Origin: https://sourceforge.net/p/saga-gis/code/ci/de7f1d450af2ac5a078466499297a8efb5165104/
+Bug: https://sourceforge.net/p/saga-gis/bugs/264/
+
+--- a/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
++++ b/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2018 SAGA Development Team -->
+ <component type="desktop">
+-  <id type="desktop.application">org.saga_gis.saga.desktop</id>
++  <id>org.saga_gis.saga.desktop</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <name>SAGA</name>
+   <summary>System for Automated Geoscientific Analyses</summary>


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,6 @@ disable-imagery_isocluster.patch
 Fix_projections_gcc6.patch
 spelling-errors.patch
 spelling-errors2.patch
+0001-update-AppStream-metadata-to-conform-with-specificat.patch
+0001-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch
+0002-further-fixes-to-AppStream-metadata-refers-to-bugs-2.patch


=====================================
debian/saga.install
=====================================
--- a/debian/saga.install
+++ b/debian/saga.install
@@ -1,7 +1,7 @@
 usr/bin
 usr/lib/*/saga/*.so
 usr/share/man/man1
-usr/share/appdata
 usr/share/applications
 usr/share/icons
+usr/share/metainfo
 usr/share/pixmaps


=====================================
debian/saga.lintian-overrides
=====================================
--- a/debian/saga.lintian-overrides
+++ b/debian/saga.lintian-overrides
@@ -11,7 +11,3 @@ saga: hardening-no-fortify-functions *
 #  the version number 2.1.]
 saga: spelling-error-in-binary usr/bin/saga_gui GNU Library Public License GNU Library General Public License
 
-# Needs to be fixed upstream: https://sourceforge.net/p/saga-gis/bugs/264/
-saga: appstream-metadata-in-legacy-location usr/share/appdata/saga.appdata.xml
-saga: appstream-metadata-legacy-format usr/share/appdata/saga.appdata.xml
-



View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/commit/81fa65ca74cc9579fadd129a15f8d8b131752b07

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/commit/81fa65ca74cc9579fadd129a15f8d8b131752b07
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180816/997443cc/attachment-0001.html>


More information about the Pkg-grass-devel mailing list