From 1ba8cdf7b07afa0fa2e0fe5200a8fce6887e7682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 09:58:29 +0100 Subject: New patches/0175-icm_profile_field.patch to fix bogus icm_profile field in output --- debian/patches/0175-icm_profile_field.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 debian/patches/0175-icm_profile_field.patch (limited to 'debian/patches') diff --git a/debian/patches/0175-icm_profile_field.patch b/debian/patches/0175-icm_profile_field.patch new file mode 100644 index 0000000..b35da77 --- /dev/null +++ b/debian/patches/0175-icm_profile_field.patch @@ -0,0 +1,20 @@ +Description: Fix bogus icm_profile field in output +Author: Reuben Thomas +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864486 +Reviewed-by: Jörg Frings-Fürst +Last-Update: 2017-12-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/xsane-save.c +=================================================================== +--- trunk.orig/src/xsane-save.c ++++ trunk/src/xsane-save.c +@@ -427,6 +427,8 @@ void xsane_read_pnm_header(FILE *file, I + char buf[TEXTBUFSIZE]; + int items_done; + ++ memset(image_info, '\0', sizeof(Image_info)); ++ + fgets(buf, sizeof(buf)-1, file); + DBG(DBG_info, "filetype header :%s", buf); + diff --git a/debian/patches/series b/debian/patches/series index e976a26..ec70fb1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -23,3 +23,4 @@ 0005-m4.patch 0010-fix_missing_sane-config.patch 0915-i18n_typo_geometrie.patch +0175-icm_profile_field.patch -- cgit v1.2.3 From 99282428af8e60b98991cac98cab36a02b6de328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 11:43:12 +0100 Subject: Refresh patches --- debian/patches/0170-typo.patch | 243 +++++++++++++++++++++ debian/patches/0900-i18n_po_update_es_add_gl.patch | 2 +- 2 files changed, 244 insertions(+), 1 deletion(-) (limited to 'debian/patches') diff --git a/debian/patches/0170-typo.patch b/debian/patches/0170-typo.patch index ed8b537..bcf8dcf 100644 --- a/debian/patches/0170-typo.patch +++ b/debian/patches/0170-typo.patch @@ -17,6 +17,15 @@ Index: trunk/src/xsane-text.h #define DESC_OVERWRITE_WARNING _("Warn before overwriting an existing file") #define DESC_SKIP_EXISTING _("If filename counter is automatically increased, used numbers are skipped") #define DESC_SAVE_PS_FLATEDECODED _("compress postscript image with zlib algorithm (flatedecode). " \ +@@ -737,7 +737,7 @@ + #define ERR_CHANGE_WORKING_DIR _("Failed to change working directory to") + #define ERR_FILENAME_TOO_LONG _("Filename too long") + #define ERR_CREATE_TEMP_FILE _("Could not create temporary file.\n\ +-Open Menue Preferences->Setup Tab Save and\n\ ++Open Menu Preferences->Setup Tab Save and\n\ + select a temporary directory where you have\n\ + write permissions." ) + #define ERR_SET_OPTION _("Failed to set value of option") @@ -854,7 +854,7 @@ The format of [DEVICE] is backendname:de -n, --no-mode-selection disable menu for XSane mode selection\n\ \n\ @@ -92,6 +101,15 @@ Index: trunk/po/sv.po msgstr "Spara enhetsberoende inställningar i standardfilen när xsane avslutas" #. DESC_OVERWRITE_WARNING +@@ -2632,7 +2632,7 @@ msgstr "Filnamnet är för långt" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/tr.po =================================================================== --- trunk.orig/po/tr.po @@ -105,6 +123,15 @@ Index: trunk/po/tr.po msgstr "Xsane'den çıkarken öntanımlı dosyadaki aygıt bağımlı tercihleri sakla" #. DESC_OVERWRITE_WARNING +@@ -2617,7 +2617,7 @@ msgstr "Dosya adı çok uzun" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/vi.po =================================================================== --- trunk.orig/po/vi.po @@ -118,6 +145,15 @@ Index: trunk/po/vi.po msgstr "" "Lưu các tùy thích phụ thuộc thiết bị vào tập tin mặc định khi thoát khỏi " "XSane" +@@ -2646,7 +2646,7 @@ msgstr "Tên tập tin quá dài" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/zh.po =================================================================== --- trunk.orig/po/zh.po @@ -131,6 +167,15 @@ Index: trunk/po/zh.po msgstr "" #. DESC_OVERWRITE_WARNING +@@ -2562,7 +2562,7 @@ msgstr "檔名太長" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/zh_CN.po =================================================================== --- trunk.orig/po/zh_CN.po @@ -144,6 +189,15 @@ Index: trunk/po/zh_CN.po msgstr "" #. DESC_OVERWRITE_WARNING +@@ -2537,7 +2537,7 @@ msgstr "档名太长" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ca.po =================================================================== --- trunk.orig/po/ca.po @@ -157,6 +211,15 @@ Index: trunk/po/ca.po msgstr "" "En sortir de l'XSane, desa les preferències que depenen del dispositiu en el " "fitxer per defecte" +@@ -2553,7 +2553,7 @@ msgstr "Nom de fitxer massa llarg" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/cs.po =================================================================== --- trunk.orig/po/cs.po @@ -170,6 +233,15 @@ Index: trunk/po/cs.po msgstr "" "Při skončení zapsat do standardního souboru předvolby závislé na zařízení" +@@ -2603,7 +2603,7 @@ msgstr "Jméno souboru je příliš dlou + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/da.po =================================================================== --- trunk.orig/po/da.po @@ -183,6 +255,15 @@ Index: trunk/po/da.po msgstr "Gem enhedsafhængige værdier i standardfil, ved afslutning af XSane" #. DESC_OVERWRITE_WARNING +@@ -2516,7 +2516,7 @@ msgstr "Filnavn er for langt" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/de.po =================================================================== --- trunk.orig/po/de.po @@ -196,6 +277,15 @@ Index: trunk/po/de.po msgstr "" "Geräteabhängige Einstellungen werden in der Default-Datei beim Beenden von " "xsane gespeichert" +@@ -2530,7 +2530,7 @@ msgstr "Dateiname zu lang" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/es.po =================================================================== --- trunk.orig/po/es.po @@ -209,6 +299,15 @@ Index: trunk/po/es.po msgstr "" "Guardar preferencias dependientes del dispositivo en archivo por omisión al " "salir de XSane" +@@ -2660,7 +2660,7 @@ msgstr "Archivo demasiado grande" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/fi.po =================================================================== --- trunk.orig/po/fi.po @@ -222,6 +321,15 @@ Index: trunk/po/fi.po msgstr "" "Tallenna laiteriippuvaiset asetukset oletustiedostoon poistuttaessa xsanesta" +@@ -2506,7 +2506,7 @@ msgstr "Liian pitkä tiedostonimi" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/fr.po =================================================================== --- trunk.orig/po/fr.po @@ -235,6 +343,15 @@ Index: trunk/po/fr.po msgstr "" "Enregister les paramètres du scanner dans le fichier par défaut en quittant " "XSane" +@@ -2648,7 +2648,7 @@ msgstr "Nom de fichier trop long" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/hu.po =================================================================== --- trunk.orig/po/hu.po @@ -248,6 +365,15 @@ Index: trunk/po/hu.po msgstr "" "Az eszközfüggő beállításokat kilépéskor mentsük el az alapértelmezett fájlba" +@@ -2596,7 +2596,7 @@ msgstr "A fájlnév túl hosszú" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/it.po =================================================================== --- trunk.orig/po/it.po @@ -261,6 +387,15 @@ Index: trunk/po/it.po msgstr "" "Salva le impostazioni del dispositivo nel file prestabilito all'uscita da " "XSane" +@@ -2546,7 +2546,7 @@ msgstr "Il nome file è troppo lungo" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ja.po =================================================================== --- trunk.orig/po/ja.po @@ -274,6 +409,15 @@ Index: trunk/po/ja.po msgstr "XSane終了時にデバイス依存の設定を既定値としてファイル保存" #. DESC_OVERWRITE_WARNING +@@ -2602,7 +2602,7 @@ msgstr "ファイル名が長すぎま + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/nl.po =================================================================== --- trunk.orig/po/nl.po @@ -287,6 +431,15 @@ Index: trunk/po/nl.po msgstr "" "Bewaar apparaatspecifieke instellingen in standaard bestand als XSane eindigt" +@@ -2612,7 +2612,7 @@ msgstr "Bestandsnaam te lang" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pa.po =================================================================== --- trunk.orig/po/pa.po @@ -300,6 +453,15 @@ Index: trunk/po/pa.po msgstr "xsane ਬੰਦ ਕਰਨ ਸਮੇਂ ਡਿਫਾਲਟ ਫਾਇਲ ਵਿੱਚ ਜੰਤਰ ਨਿਰਭਰਤਾ ਪਸੰਦ ਸੰਭਾਲੋ" #. DESC_OVERWRITE_WARNING +@@ -2483,7 +2483,7 @@ msgstr "ਫਾਇਲ ਨਾਂ ਬਹੁ + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pl.po =================================================================== --- trunk.orig/po/pl.po @@ -313,6 +475,15 @@ Index: trunk/po/pl.po msgstr "" "Zapisz ustawienia urządzenia w domyślnym pliku przy wychodzeniu z XSane" +@@ -2630,7 +2630,7 @@ msgstr "Zbyt długa nazwa pliku" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pt.po =================================================================== --- trunk.orig/po/pt.po @@ -326,6 +497,15 @@ Index: trunk/po/pt.po msgstr "" "Salva preferências dependentes do dispositivo em arquivo padrão na saída do " "xsane" +@@ -2643,7 +2643,7 @@ msgstr "Nome de arquivo longo demais" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pt_BR.po =================================================================== --- trunk.orig/po/pt_BR.po @@ -339,6 +519,15 @@ Index: trunk/po/pt_BR.po msgstr "" "Salva preferências dependentes do dispositivo em arquivo padrão na saída do " "xsane" +@@ -2643,7 +2643,7 @@ msgstr "Nome de arquivo longo demais" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ro.po =================================================================== --- trunk.orig/po/ro.po @@ -352,6 +541,15 @@ Index: trunk/po/ro.po msgstr "" "Salvează preferinţele dependente de dispozitiv în fişierul implicit la " "terminarea XSane" +@@ -2648,7 +2648,7 @@ msgstr "Nume fişier prea lung" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ru.po =================================================================== --- trunk.orig/po/ru.po @@ -365,6 +563,15 @@ Index: trunk/po/ru.po msgstr "" "Сохранять параметры устройства в файле по умолчанию при выходе из XSane" +@@ -2629,7 +2629,7 @@ msgstr "Название файла сл + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/sk.po =================================================================== --- trunk.orig/po/sk.po @@ -378,6 +585,15 @@ Index: trunk/po/sk.po msgstr "" "Uložiť nastavenia závislé na zariadení v štandardnom súbore pri ukončení " "XSane" +@@ -2528,7 +2528,7 @@ msgstr "Názov súboru príliš dlhý" + #, fuzzy + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/sl.po =================================================================== --- trunk.orig/po/sl.po @@ -391,6 +607,15 @@ Index: trunk/po/sl.po msgstr "Shrani odgovarjajoče nastavitve naprave v privzeto datoteko ob izhodu" #. DESC_OVERWRITE_WARNING +@@ -2602,7 +2602,7 @@ msgstr "Predolgo ime datoteke" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/sr.po =================================================================== --- trunk.orig/po/sr.po @@ -404,6 +629,15 @@ Index: trunk/po/sr.po msgstr "" "Памти одговарајуће конфигурације уређаја у подразумеваној фајли при " "напуштању XSane" +@@ -2506,7 +2506,7 @@ msgstr "Назив фајле је пр + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/xsane.pot =================================================================== --- trunk.orig/po/xsane.pot @@ -417,3 +651,12 @@ Index: trunk/po/xsane.pot msgstr "" #. DESC_OVERWRITE_WARNING +@@ -2433,7 +2433,7 @@ msgstr "" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" diff --git a/debian/patches/0900-i18n_po_update_es_add_gl.patch b/debian/patches/0900-i18n_po_update_es_add_gl.patch index 7c730db..965f50a 100644 --- a/debian/patches/0900-i18n_po_update_es_add_gl.patch +++ b/debian/patches/0900-i18n_po_update_es_add_gl.patch @@ -5726,7 +5726,7 @@ Index: trunk/po/gl.po +#. ERR_CREATE_TEMP_FILE +msgid "" +"Could not create temporary file.\n" -+"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" +"select a temporary directory where you have\n" +"write permissions." +msgstr "" -- cgit v1.2.3 From ece1c5b1e0e65e1421ef11ad4b2af57b34e5ea54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 10 Sep 2018 21:47:36 +0200 Subject: d/control: Add missing depend sensible-utils; Declare compliance with Debian Policy 4.2.1 --- debian/patches/0001-lcms2_configure.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/patches') diff --git a/debian/patches/0001-lcms2_configure.patch b/debian/patches/0001-lcms2_configure.patch index 66612c8..e394246 100644 --- a/debian/patches/0001-lcms2_configure.patch +++ b/debian/patches/0001-lcms2_configure.patch @@ -1,4 +1,4 @@ -Description: patch confgure becase broken autoreconf +Description: patch confgure because broken autoreconf Author: Nils Philippsen Last-Update: 2014-10-17 --- -- cgit v1.2.3 From f4dae788451f2ae0c72f644f3ddaf070b2ff5a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 19:49:58 +0200 Subject: d/p/0905-i18n_po_update_fr.patch: Correct typos --- debian/patches/0905-i18n_po_update_fr.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/patches') diff --git a/debian/patches/0905-i18n_po_update_fr.patch b/debian/patches/0905-i18n_po_update_fr.patch index dfa81bf..e7dd8a1 100644 --- a/debian/patches/0905-i18n_po_update_fr.patch +++ b/debian/patches/0905-i18n_po_update_fr.patch @@ -1065,7 +1065,7 @@ Index: xsane-0.998/po/fr.po #. DESC_DISPLAY_ICM_PROFILE msgid "Display ICM-profile" -msgstr "" -+msgstr "Affichage du profil ICM" ++msgstr "Profil ICM d'affichage" #. TEXT_SETUP_CUSTOM_PROOFING_ICM_PROFILE #. DESC_CUSTOM_PROOFING_ICM_PROFILE @@ -2436,7 +2436,7 @@ Index: xsane-0.998/po/fr.po -#, fuzzy msgid "Browse for printer ICM-profile" -msgstr "Parcourir pour un nom d'image" -+msgstr "Ouvrir un profi ICM d'imprimante" ++msgstr "Ouvrir un profil ICM d'imprimante" #. DESC_BUTTON_CUSTOM_PROOFING_ICM_PROFILE_BROWSE -#, fuzzy -- cgit v1.2.3 From 4423c3cf19b5ca8af8938aef42a44c6955a58b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 20:13:07 +0200 Subject: d/p/0125-desktop_file.patch: Correct some inconsistencies --- debian/patches/0125-desktop_file.patch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'debian/patches') 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 +Description: insert missing Categories, Keywords fields, implement GenericName fields +Author: Jörg Frings-Fürst , Vladimir Kudrya 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 -+ -- cgit v1.2.3 From 4d31517e42d61770912afbf948129f002c74e6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 20:57:23 +0200 Subject: d/p/0125-desktop_file.patch: Remove obsolate key Encoding; Remove double key Type --- debian/patches/0125-desktop_file.patch | 8 ++++---- debian/patches/0125-desktop_file.patch~ | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 debian/patches/0125-desktop_file.patch~ (limited to 'debian/patches') 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 , Vladimir Kudrya +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 -- cgit v1.2.3 From d65612a409e90db150e7d44e71f939aca5c27036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 21:09:18 +0200 Subject: Add (>= 1.0.27) to b-d libsane.dev --- debian/patches/0125-desktop_file.patch~ | 35 --------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 debian/patches/0125-desktop_file.patch~ (limited to 'debian/patches') diff --git a/debian/patches/0125-desktop_file.patch~ b/debian/patches/0125-desktop_file.patch~ deleted file mode 100644 index 0a1d619..0000000 --- a/debian/patches/0125-desktop_file.patch~ +++ /dev/null @@ -1,35 +0,0 @@ -Description: insert missing Categories, Keywords fields, implement GenericName fields -Author: Jörg Frings-Fürst , Vladimir Kudrya -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 -- cgit v1.2.3