Change d/copyright, d/control, new patch 10-keywords_desktop.patch, remove patches from source

6 files changed, 52 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index 703139c..52e6840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,25 @@
 rapid-photo-downloader (0.4.10-2) unstable; urgency=medium
 
-  * add debian/source/options
-  * add upstream changelog
-  * change debian/compat to 9
-  * change VCS
-  * New maintainer ( Closes: #753568 ) 
-
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 05 Jul 2014 21:48:39 +0200
+  * New maintainer (Closes: #753568).
+  * debian/control:
+    - Set myself as maintainer.
+    - Vcs:
+      + Remove upstream Vcs.
+      + Create a new git repository on alioth.
+      + Add the Fields Vcs-Browser and Vcs-Git.
+  * Add debian/source/options:
+    - Set compression to xz & compression-level to 9 to save space.
+  * debian/copyright:
+    - Add myself to the list of authors for debian/*.
+    - Update copyright years for 2014.
+    - Remove non-existing files.
+  * debian/rules:
+    - Install upstream changelog from rapid/ChangeLog.
+  * New debian/patches/10-keywords_desktop.patch
+    - Add missing Keywords entry to the .desktop file.
+  * Change debian/compat to 9 (no changes required).
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 18 Aug 2014 06:33:39 +0200
 
 rapid-photo-downloader (0.4.10-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 245797e..af1f8a9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rapid-photo-downloader
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Build-Depends: 
+Build-Depends:
  debhelper (>= 9),
  python (>= 2.6.6-3),
  gettext
@@ -10,13 +10,13 @@ Standards-Version: 3.9.5
 X-Python-Version: 2.6, 2.7
 Homepage: http://damonlynch.net/rapid
 Vcs-Git: git://anonscm.debian.org/collab-maint/rapid-photo-downloader.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/rapid-photo-downloader.git;a=summary
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/rapid-photo-downloader.git
 
 Package: rapid-photo-downloader
 Architecture: all
-Depends: 
+Depends:
  ${python:Depends},
- ${misc:Depends}, 
+ ${misc:Depends},
  python-dbus,
  python-gtk2 (>= 2.12),
  python-glade2 (>= 2.17),
@@ -30,11 +30,11 @@ Depends:
  libimage-exiftool-perl,
  exiv2,
  exiftran
-Recommends: 
+Recommends:
  python-kaa-metadata,
  python-hachoir-metadata,
  ffmpegthumbnailer
-Description: Photo downloader (importer) from cameras, memory cards other devices
+Description: Photo downloader (importer) from cameras, memory cards, other devices
  Rapid Photo Downloader can be used by both professional and amateur
  photographers to download photos and videos from multiple cameras,
  memory cards and Portable Storage Devices simultaneously. It provides
diff --git a/debian/copyright b/debian/copyright
index 9e7b030..03ac63d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,28 +4,18 @@ Upstream-Contact: Damon Lynch <damonlynch@gmail.com>
 Source: https://launchpad.net/rapid
 
 Files: *
-Copyright: 2007-2010 Damon Lynch <damonlynch@gmail.com>
+Copyright: 2007-2014 Damon Lynch <damonlynch@gmail.com>
+           2002-2006 Stephen Kennedy <stevek@gnome.org>
 License: GPL-2+
 
-Files: rapid/ValidatedEntry.py
-Copyright: 2006 Daniel J. Popowich <dpopowich@astro.umass.edu>
-License: other
- 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.
-
-Files: rapid/gnomeglade.py rapid/misc.py rapid/prefs.py rapid/paths.py
-Copyright: 2002-2006 Stephen Kennedy <stevek@gnome.org>
+Files: debian/*
+Copyright: 2009      Damon Lynch <damonlynch@gmail.com>
+           2009-2014 Julien Valroff <julien@debian.org>
+           2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-2+
 
-Files: rapid/idletube.py
-Copyright: 2005 Antoon Pardon    
+Files: rapid/ValidatedEntry.py
+Copyright: 2006      Daniel J. Popowich <dpopowich@astro.umass.edu>
 License: other
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
@@ -37,12 +27,6 @@ License: other
  The above copyright notice and this permission notice shall be included
  in all copies or substantial portions of the Software.
 
-Files: debian/*
-Copyright: 2009 Damon Lynch <damonlynch@gmail.com>
-           2009-2011 Julien Valroff <julien@debian.org>
-           2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
-License: GPL-2+
-
 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
@@ -60,4 +44,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'.
-
diff --git a/debian/patches/10-keywords_desktop.patch b/debian/patches/10-keywords_desktop.patch
new file mode 100644
index 0000000..6e06a33
--- /dev/null
+++ b/debian/patches/10-keywords_desktop.patch
@@ -0,0 +1,16 @@
+Description: Add _Keywords to .desktop file
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: not-needed
+Last-Update: 2014-08-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/data/rapid-photo-downloader.desktop
+===================================================================
+--- trunk.orig/data/rapid-photo-downloader.desktop	2012-05-30 08:26:48.000000000 +0200
++++ trunk/data/rapid-photo-downloader.desktop	2014-08-18 06:16:54.989481934 +0200
+@@ -9,3 +9,4 @@
+ Terminal=false
+ Type=Application
+ Categories=Graphics;Photography;
++Keywords=photo;download;graphics;photography;
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index bff31eb..924b9ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 05_removed-empty-directory.diff
+10-keywords_desktop.patch
diff --git a/setup.py b/setup.py
index 2d7123d..c640197 100644
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,7 @@ photo and video renaming, and backup.
     data_files=[
         ('share/applications', ['data/rapid-photo-downloader.desktop']),
         ('share/pixmaps', ['data/icons/48x48/apps/rapid-photo-downloader.png', 'data/icons/rapid-photo-downloader.xpm']),
+        ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
         ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
         ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/22x22/apps/*.png')),
         ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')),