This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit c3d3d9a5075a2c3f6f10d4c5e2fa2cea44dd53d9
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Aug 13 11:57:37 2017 +0200
Drop AppSteam patch, included upstream. Refresh other patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 6 +-
debian/patches/series | 1 -
...2543_follow-AppStream-metadata-guidelines.patch | 117 ---------------------
4 files changed, 4 insertions(+), 121 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6f8b054..b0083c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
josm (0.0.svn12545+dfsg-1) UNRELEASED; urgency=medium
* New hotfix tested snapshot.
+ * Drop AppSteam patch, included upstream. Refresh other patches.
-- Bas Couwenberg <sebas...@debian.org> Sun, 13 Aug 2017 11:51:22 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index d5c9d76..ee48928 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -228,7 +228,7 @@ Forwarded: not-needed
<target name="init" description="Loads the Ant gettext and contrib tasks">
<taskdef name="gettext-extract"
classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask"
classpath="${gettexttasks.jar}"/>
<!-- for the <foreach> possibility -->
-@@ -59,7 +59,7 @@
+@@ -66,7 +66,7 @@
</exec>
<delete file="po/josm.raw.pot"/>
</target>
@@ -237,7 +237,7 @@ Forwarded: not-needed
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="-k
-ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
-@@ -101,9 +101,14 @@
+@@ -108,9 +108,14 @@
<delete file="${po.build.dir}/data.pot"/>
<delete file="${po.build.dir}/plugins.raw.pot"/>
</target>
@@ -255,7 +255,7 @@ Forwarded: not-needed
</target>
<target name="buildplugins" depends="init">
<foreach param="path" target="plugintrans" parallel="true"
maxThreads="8">
-@@ -152,15 +157,14 @@
+@@ -159,15 +164,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
</target>
diff --git a/debian/patches/series b/debian/patches/series
index ba05430..0e16b21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
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
deleted file mode 100644
index 05b8d1b..0000000
--- a/debian/patches/svn-r12543_follow-AppStream-metadata-guidelines.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-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>
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/josm.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
