d/p/0125-desktop_file.patch: Correct some inconsistencies

2 files changed, 17 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index b4986a2..3f52801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,8 @@ xsane (0.999-6) UNRELEASED; urgency=medium
   * Change to my new mail address:
     - debian/control,
     - debian/copyright
-  * New patches/0175-icm_profile_field.patch to fix bogus icm_profile field
-    in output (Closes: #864486). Thanks to Reuben Thomas <rrt@sc3d.org>.
+  * New debian/patches/0175-icm_profile_field.patch to fix bogus icm_profile
+    field in output (Closes: #864486). Thanks to Reuben Thomas <rrt@sc3d.org>.
   * Use the automatic debug symbol packages:
     - Remove simple-scan-dbg section from debian/control.
     - Remove override_dh_strip from debian/rules.
@@ -31,6 +31,9 @@ xsane (0.999-6) UNRELEASED; urgency=medium
   * debian/patches/0905-i18n_po_update_fr.patch:
     - Correct typos (Closes: #891666).
       Thanks to Stéphane Blondon <stephane.blondon@gmail.com>.
+  * debian/patches/0125-desktop_file.patch:
+    - Correct some inconsistencies (Closes: #888433).
+      Thanks to Vladimir Kudrya <pzs-fs@yandex.ru>.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Fri, 19 May 2017 18:24:37 +0200
 
diff --git a/debian/patches/0125-desktop_file.patch b/debian/patches/0125-desktop_file.patch
index 43e57bd..0a1d619 100644
--- a/debian/patches/0125-desktop_file.patch
+++ b/debian/patches/0125-desktop_file.patch
@@ -1,23 +1,25 @@
-Description: insert missing tag Keywords and some other changes
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Description: insert missing Categories, Keywords fields, implement GenericName fields
+Author: Jörg Frings-Fürst <debian@jff.email>, Vladimir Kudrya <pzs-fs@yandex.ru>
 Forwarded: not-needed
-Last-Update: 2014-10-17
+Last-Update: 2018-01-25
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/src/xsane.desktop
 ===================================================================
 --- trunk.orig/src/xsane.desktop
 +++ trunk/src/xsane.desktop
-@@ -1,9 +1,19 @@
+@@ -1,9 +1,21 @@
  [Desktop Entry]
--Encoding=UTF-8
++Type=Application
+ Encoding=UTF-8
 -Name=XSane - Scanning
 -Comment=Acquire images from a scanner
-+Name=XSane Image scanning program
-+Name[ru]=Программа для сканирования изображений
-+Name[ca]=Programa d'escaneig d'imatges XSane
-+Name[es]=Programa de escaneo de imágenes XSane
-+Name[fr]=Programme d'acquisition d'images XSane
++Name=XSane
++GenericName=Image scanning program
++GenericName[ru]=Программа для сканирования изображений
++GenericName[ca]=Programa d'escaneig d'imatges
++GenericName[es]=Programa de escaneo de imágenes
++GenericName[fr]=Programme d'acquisition d'images
 +Comment=A program to work with scanner. Can be used as a scanning, copier, OCR, fax tools.
 +Comment[ru]=Программа для работы со сканером. Может быть использована в качестве копировального аппарата, факса, и др.
 +Comment[ca]=Un programa per a treballar amb escànners. Es pot utilitzar com una eina d'escanejat, copiat, OCR i fax.
@@ -31,4 +33,3 @@ Index: trunk/src/xsane.desktop
 +Categories=Application;Graphics;GTK;RasterGraphics;Scanning;OCR;2DGraphics;
 +Keywords=scannerfrontend
 +StartupNotify=true
-+