New patches/0700-appstream-metadata.patch; d/copyright: Update to the new upstream release

4 files changed, 52 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 01f934f..e18686e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,11 +37,14 @@ rapid-photo-downloader (0.9.7-1.0) UNRELEASED; urgency=medium
     - debian/copyright
   * debian/copyright:
     - Add year 2018 to debian/*.
+    - Update to the new upstream release.
   * debian/watch:
     - Bump version to 4.
     - Allow only numerical versions.
   * debian/changelog:
     - Remove trailing whitespaces.
+  * New patches/0700-appstream-metadata.patch:
+    - Rewrite package metadata to the latest version.
 
  -- Antoine Beaupré <anarcat@debian.org>  Sat, 30 Dec 2017 12:20:05 -0500
 
diff --git a/debian/copyright b/debian/copyright
index a9988f4..7b904df 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,20 +4,40 @@ Upstream-Contact: Damon Lynch <damonlynch@gmail.com>
 Source: https://launchpad.net/rapid
 
 Files: *
-Copyright: 2007-2014 Damon Lynch <damonlynch@gmail.com>
+Copyright: 2007-2018 Damon Lynch <damonlynch@gmail.com>
            2002-2006 Stephen Kennedy <stevek@gnome.org>
 License: GPL-2+
 
+Files: setup.py
+Copyright: 2009-2017 Damon Lynch <damonlynch@gmail.com>
+           2004-2012 Canonical Ltd
+           2014      Donald Stufft
+License: GPL-2+
+
+Files: raphodo/storage.py
+Copyright: 2015-2017 Damon Lynch <damonlynch@gmail.com>
+           2008-2015 Canonical Ltd.
+           2013      Bernard Baeyens
+License: GPL-2+
+
+Files: raphodo/aboutdialog.py
+Copyright: 2007-2018 Damon Lynch <damonlynch@gmail.com>
+           2008-2015 Canonical Ltd.
+           2013      Bernard Baeyens
+           2012-2015 Jim Easterbrook
+           2012      Sven Marnach
+License: GPL-2+
+
+Files: po/*
+Copyright: 2009-2017 Rosetta Contributors and Canonical Ltd
+License: GPL-2+
+
 Files: debian/*
 Copyright: 2009      Damon Lynch <damonlynch@gmail.com>
            2009-2014 Julien Valroff <julien@debian.org>
            2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
-Files: rapid/ValidatedEntry.py
-Copyright: 2006      Daniel J. Popowich <dpopowich@astro.umass.edu>
-License: Expat
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -35,14 +55,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public
  License can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
diff --git a/debian/patches/0700-appstream-metadata.patch b/debian/patches/0700-appstream-metadata.patch
new file mode 100644
index 0000000..dcd9156
--- /dev/null
+++ b/debian/patches/0700-appstream-metadata.patch
@@ -0,0 +1,23 @@
+Description: Rewrite package metadata latest version
+Author: Jölrg Frings-Fürst <debian@jff.email>
+Last-Update: 2018-01-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/data/net.damonlynch.rapid-photo-downloader.appdata.xml.in
+===================================================================
+--- trunk.orig/data/net.damonlynch.rapid-photo-downloader.appdata.xml.in
++++ trunk/data/net.damonlynch.rapid-photo-downloader.appdata.xml.in
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014-2017 Damon Lynch <damonlynch@gmail.com> -->
+-<application>
++<component>
+   <id type="desktop">net.damonlynch.rapid-photo-downloader</id>
+   <provides>
+     <id>rapid-photo-downloader.desktop</id>
+@@ -67,4 +67,4 @@
+     </screenshot>
+   </screenshots>
+   <updatecontact>damonlynch@gmail.com</updatecontact>
+-</application>
++</component>
diff --git a/debian/patches/series b/debian/patches/series
index be91c62..0fba879 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 #05_removed-empty-directory.diff
 #10-keywords_desktop.patch
 #0001-intltool_utf8.patch
+0700-appstream-metadata.patch