d/p/0125-desktop_file.patch: Remove obsolate key Encoding; Remove double key Type

3 files changed, 41 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 3f52801..fab2b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ xsane (0.999-6) UNRELEASED; urgency=medium
   * debian/patches/0125-desktop_file.patch:
     - Correct some inconsistencies (Closes: #888433).
       Thanks to Vladimir Kudrya <pzs-fs@yandex.ru>.
+    - Remove obsolate key Encoding.
+    - Remove double key Type.
 
  -- 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 0a1d619..5613587 100644
--- a/debian/patches/0125-desktop_file.patch
+++ b/debian/patches/0125-desktop_file.patch
@@ -8,12 +8,12 @@ Index: trunk/src/xsane.desktop
 ===================================================================
 --- trunk.orig/src/xsane.desktop
 +++ trunk/src/xsane.desktop
-@@ -1,9 +1,21 @@
+@@ -1,9 +1,19 @@
  [Desktop Entry]
-+Type=Application
- Encoding=UTF-8
+-Encoding=UTF-8
 -Name=XSane - Scanning
 -Comment=Acquire images from a scanner
++Type=Application
 +Name=XSane
 +GenericName=Image scanning program
 +GenericName[ru]=Программа для сканирования изображений
@@ -28,7 +28,7 @@ Index: trunk/src/xsane.desktop
  Exec=xsane
  Icon=xsane
  Terminal=false
- Type=Application
+-Type=Application
 -Categories=Application;Graphics
 +Categories=Application;Graphics;GTK;RasterGraphics;Scanning;OCR;2DGraphics;
 +Keywords=scannerfrontend
diff --git a/debian/patches/0125-desktop_file.patch~ b/debian/patches/0125-desktop_file.patch~
new file mode 100644
index 0000000..0a1d619
--- /dev/null
+++ b/debian/patches/0125-desktop_file.patch~
@@ -0,0 +1,35 @@
+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: 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,21 @@
+ [Desktop Entry]
++Type=Application
+ Encoding=UTF-8
+-Name=XSane - Scanning
+-Comment=Acquire images from a scanner
++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.
++Comment[es]=Un programa para trabajar con escáners. Se puede utilizar como una herramienta para escanear, copiar, OCR y fax.
++Comment[fr]=Un programme d'acquisition d'images pour votre scanner. Peut également photocopier, faxer ou faire de la reconnaissance de caractères.
+ Exec=xsane
+ Icon=xsane
+ Terminal=false
+ Type=Application
+-Categories=Application;Graphics
++Categories=Application;Graphics;GTK;RasterGraphics;Scanning;OCR;2DGraphics;
++Keywords=scannerfrontend
++StartupNotify=true