diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0170-typo.patch | 349 | ||||
| -rw-r--r-- | debian/patches/0900-i18n_po_update_es_add_gl.patch | 4 | ||||
| -rw-r--r-- | debian/xsane.lintian-overrides | 1 |
4 files changed, 355 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 7602329..3570264 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,9 +16,12 @@ xsane (0.999-4) unstable; urgency=medium - New debian/patches/0005-m4.patch to add missing tags. * debian/watch: - Bump Version to 4 (no changes required). - * Refresh debian/patches/0170-typo.patch. + * Refresh patches: + - debian/patches/0170-typo.patch. + - debian/patches/0900-i18n_po_update_es_add_gl.patch + * Remove useless debian/xsane.lintian-overrides. - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 03 Oct 2016 23:14:25 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 15 Oct 2016 05:58:43 +0200 xsane (0.999-3) unstable; urgency=medium diff --git a/debian/patches/0170-typo.patch b/debian/patches/0170-typo.patch index f84270a..ed8b537 100644 --- a/debian/patches/0170-typo.patch +++ b/debian/patches/0170-typo.patch @@ -1,13 +1,22 @@ Description: correct some typos in source Author: Jörg Frings-Fürst <debian@jff-webhosting.net> Forwarded: not-needed -Last-Update: 2014-10-17 +Last-Update: 2016-10-15 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/src/xsane-text.h =================================================================== --- trunk.orig/src/xsane-text.h +++ trunk/src/xsane-text.h +@@ -593,7 +593,7 @@ + #define DESC_TIFF_COMPRESSION_16 _("Compression type if 16 bit image is saved as TIFF") + #define DESC_TIFF_COMPRESSION_8 _("Compression type if 8 bit image is saved as TIFF") + #define DESC_TIFF_COMPRESSION_1 _("Compression type if lineart image is saved as TIFF") +-#define DESC_SAVE_DEVPREFS_AT_EXIT _("Save device dependant preferences in default file at exit of xsane") ++#define DESC_SAVE_DEVPREFS_AT_EXIT _("Save device dependent preferences in default file at exit of xsane") + #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). " \ @@ -854,7 +854,7 @@ The format of [DEVICE] is backendname:de -n, --no-mode-selection disable menu for XSane mode selection\n\ \n\ @@ -70,3 +79,341 @@ Index: trunk/src/xsane-preview.c gtk_widget_show(p->valid_pixmap); gtk_widget_hide(p->scanning_pixmap); +Index: trunk/po/sv.po +=================================================================== +--- trunk.orig/po/sv.po ++++ trunk/po/sv.po +@@ -2105,7 +2105,7 @@ msgid "Compression type if lineart image + msgstr "Kompressionstyp om grafisk bild sparas som tiff" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "Spara enhetsberoende inställningar i standardfilen när xsane avslutas" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/tr.po +=================================================================== +--- trunk.orig/po/tr.po ++++ trunk/po/tr.po +@@ -2089,7 +2089,7 @@ msgid "Compression type if lineart image + msgstr "Eğer lineart resim tiff olarak saklanacaksa sıkıştırma tipi" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "Xsane'den çıkarken öntanımlı dosyadaki aygıt bağımlı tercihleri sakla" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/vi.po +=================================================================== +--- trunk.orig/po/vi.po ++++ trunk/po/vi.po +@@ -2123,7 +2123,7 @@ msgid "Compression type if lineart image + msgstr "Kiểu nén nếu ảnh lineart được lưu là tiff" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + 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" +Index: trunk/po/zh.po +=================================================================== +--- trunk.orig/po/zh.po ++++ trunk/po/zh.po +@@ -2070,7 +2070,7 @@ msgid "Compression type if lineart image + msgstr "如果存成png檔的話,就壓縮" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/zh_CN.po +=================================================================== +--- trunk.orig/po/zh_CN.po ++++ trunk/po/zh_CN.po +@@ -2045,7 +2045,7 @@ msgid "Compression type if lineart image + msgstr "如果存成png档的话,就压缩" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/ca.po +=================================================================== +--- trunk.orig/po/ca.po ++++ trunk/po/ca.po +@@ -2032,7 +2032,7 @@ msgstr "" + "(mode línia)" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "En sortir de l'XSane, desa les preferències que depenen del dispositiu en el " + "fitxer per defecte" +Index: trunk/po/cs.po +=================================================================== +--- trunk.orig/po/cs.po ++++ trunk/po/cs.po +@@ -2081,7 +2081,7 @@ msgid "Compression type if lineart image + msgstr "Typ komprese, je-li obrázek zapisován jako TIFF čárová grafika" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Při skončení zapsat do standardního souboru předvolby závislé na zařízení" + +Index: trunk/po/da.po +=================================================================== +--- trunk.orig/po/da.po ++++ trunk/po/da.po +@@ -2019,7 +2019,7 @@ msgid "Compression type if lineart image + msgstr "Kompressionstype når stregtegningsbilleder gemmes som TIFF" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "Gem enhedsafhængige værdier i standardfil, ved afslutning af XSane" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/de.po +=================================================================== +--- trunk.orig/po/de.po ++++ trunk/po/de.po +@@ -2022,7 +2022,7 @@ msgid "Compression type if lineart image + msgstr "Kompression wenn lineart Bild im TIFF-Format gespeichert wird" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Geräteabhängige Einstellungen werden in der Default-Datei beim Beenden von " + "xsane gespeichert" +Index: trunk/po/es.po +=================================================================== +--- trunk.orig/po/es.po ++++ trunk/po/es.po +@@ -2111,7 +2111,7 @@ msgid "Compression type if lineart image + msgstr "Tipo de compresión si la imagen de línea de arte es guardada como tiff" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Guardar preferencias dependientes del dispositivo en archivo por omisión al " + "salir de XSane" +Index: trunk/po/fi.po +=================================================================== +--- trunk.orig/po/fi.po ++++ trunk/po/fi.po +@@ -2005,7 +2005,7 @@ msgid "Compression type if lineart image + msgstr "Pakkaustapa tallennettaessa 8-bittistä kuvaa TIFFinä" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Tallenna laiteriippuvaiset asetukset oletustiedostoon poistuttaessa xsanesta" + +Index: trunk/po/fr.po +=================================================================== +--- trunk.orig/po/fr.po ++++ trunk/po/fr.po +@@ -2105,7 +2105,7 @@ msgid "Compression type if lineart image + msgstr "Type de compression si l'image trait est enregistrée en tiff" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Enregister les paramètres du scanner dans le fichier par défaut en quittant " + "XSane" +Index: trunk/po/hu.po +=================================================================== +--- trunk.orig/po/hu.po ++++ trunk/po/hu.po +@@ -2078,7 +2078,7 @@ msgid "Compression type if lineart image + msgstr "A tömörítés módja vonalas tiff kép esetén" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Az eszközfüggő beállításokat kilépéskor mentsük el az alapértelmezett fájlba" + +Index: trunk/po/it.po +=================================================================== +--- trunk.orig/po/it.po ++++ trunk/po/it.po +@@ -2024,7 +2024,7 @@ msgid "Compression type if lineart image + msgstr "Tipo compressione se l'immagine lineart viene salvata come TIFF" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Salva le impostazioni del dispositivo nel file prestabilito all'uscita da " + "XSane" +Index: trunk/po/ja.po +=================================================================== +--- trunk.orig/po/ja.po ++++ trunk/po/ja.po +@@ -2093,7 +2093,7 @@ msgid "Compression type if lineart image + msgstr "ラインアート画像がTIFFで保存されている場合の圧縮タイプ" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "XSane終了時にデバイス依存の設定を既定値としてファイル保存" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/nl.po +=================================================================== +--- trunk.orig/po/nl.po ++++ trunk/po/nl.po +@@ -2091,7 +2091,7 @@ msgid "Compression type if lineart image + msgstr "Compressie van zwart wit TIFF afbeeldingen" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Bewaar apparaatspecifieke instellingen in standaard bestand als XSane eindigt" + +Index: trunk/po/pa.po +=================================================================== +--- trunk.orig/po/pa.po ++++ trunk/po/pa.po +@@ -2008,7 +2008,7 @@ msgid "Compression type if lineart image + msgstr "ਜੇ ਲੀਨੀਅਰਟ ਚਿੱਤਰ ਨੂੰ TIFF ਵਾਂਗ ਸੰਭਾਲਣ ਹੋਵੇ ਤਾਂ ਕੰਪਰੈੱਸਨ ਕਿਸਮ" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "xsane ਬੰਦ ਕਰਨ ਸਮੇਂ ਡਿਫਾਲਟ ਫਾਇਲ ਵਿੱਚ ਜੰਤਰ ਨਿਰਭਰਤਾ ਪਸੰਦ ਸੰਭਾਲੋ" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/pl.po +=================================================================== +--- trunk.orig/po/pl.po ++++ trunk/po/pl.po +@@ -2096,7 +2096,7 @@ msgid "Compression type if lineart image + msgstr "Typ kompresji przy zapisie jako TIFF obrazka w trybie kreski" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Zapisz ustawienia urządzenia w domyślnym pliku przy wychodzeniu z XSane" + +Index: trunk/po/pt.po +=================================================================== +--- trunk.orig/po/pt.po ++++ trunk/po/pt.po +@@ -2103,7 +2103,7 @@ msgid "Compression type if lineart image + msgstr "Tipo de compressão se imagem em linha artística é salvada como tiff" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Salva preferências dependentes do dispositivo em arquivo padrão na saída do " + "xsane" +Index: trunk/po/pt_BR.po +=================================================================== +--- trunk.orig/po/pt_BR.po ++++ trunk/po/pt_BR.po +@@ -2103,7 +2103,7 @@ msgid "Compression type if lineart image + msgstr "Tipo de compressão se imagem em linha artística é salvada como tiff" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Salva preferências dependentes do dispositivo em arquivo padrão na saída do " + "xsane" +Index: trunk/po/ro.po +=================================================================== +--- trunk.orig/po/ro.po ++++ trunk/po/ro.po +@@ -2106,7 +2106,7 @@ msgid "Compression type if lineart image + msgstr "Tip compresie dacă o imagine alb/negru este salvată ca TIFF" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Salvează preferinţele dependente de dispozitiv în fişierul implicit la " + "terminarea XSane" +Index: trunk/po/ru.po +=================================================================== +--- trunk.orig/po/ru.po ++++ trunk/po/ru.po +@@ -2089,7 +2089,7 @@ msgid "Compression type if lineart image + msgstr "Тип сжатия для формата TIFF при сохранении штриховых изображений" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Сохранять параметры устройства в файле по умолчанию при выходе из XSane" + +Index: trunk/po/sk.po +=================================================================== +--- trunk.orig/po/sk.po ++++ trunk/po/sk.po +@@ -2030,7 +2030,7 @@ msgid "Compression type if lineart image + msgstr "Typ kompresie, ak je obrázok čiarovej grafiky uložený ako TIFF " + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Uložiť nastavenia závislé na zariadení v štandardnom súbore pri ukončení " + "XSane" +Index: trunk/po/sl.po +=================================================================== +--- trunk.orig/po/sl.po ++++ trunk/po/sl.po +@@ -2081,7 +2081,7 @@ msgid "Compression type if lineart image + msgstr "Vrsta stiskanja pri shranjevanju slik v načinu lineart v zapisu TIFF" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "Shrani odgovarjajoče nastavitve naprave v privzeto datoteko ob izhodu" + + #. DESC_OVERWRITE_WARNING +Index: trunk/po/sr.po +=================================================================== +--- trunk.orig/po/sr.po ++++ trunk/po/sr.po +@@ -2017,7 +2017,7 @@ msgid "Compression type if lineart image + msgstr "Врста компресије ако се lineart слика памти као TIFF" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + "Памти одговарајуће конфигурације уређаја у подразумеваној фајли при " + "напуштању XSane" +Index: trunk/po/xsane.pot +=================================================================== +--- trunk.orig/po/xsane.pot ++++ trunk/po/xsane.pot +@@ -1967,7 +1967,7 @@ msgid "Compression type if lineart image + msgstr "" + + #. DESC_SAVE_DEVPREFS_AT_EXIT +-msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" + msgstr "" + + #. DESC_OVERWRITE_WARNING 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 df493f4..7c730db 100644 --- a/debian/patches/0900-i18n_po_update_es_add_gl.patch +++ b/debian/patches/0900-i18n_po_update_es_add_gl.patch @@ -1930,7 +1930,7 @@ Index: trunk/po/es.po +msgstr "Tipo de compresión si la imagen de línea de arte es guardada como TIFF" #. DESC_SAVE_DEVPREFS_AT_EXIT - msgid "Save device dependant preferences in default file at exit of xsane" + msgid "Save device dependent preferences in default file at exit of xsane" -msgstr "" -"Guardar preferencias dependientes del dispositivo en archivo por omisión al " -"salir de XSane" @@ -5277,7 +5277,7 @@ Index: trunk/po/gl.po +msgstr "Tipo de compresión se a imaxe de liña de arte se gardada como TIFF" + +#. DESC_SAVE_DEVPREFS_AT_EXIT -+msgid "Save device dependant preferences in default file at exit of xsane" ++msgid "Save device dependent preferences in default file at exit of xsane" +msgstr "Gardar as preferencias dependentes do dispositivo no ficheiro por omisión ao saír de XSane" + +#. DESC_OVERWRITE_WARNING diff --git a/debian/xsane.lintian-overrides b/debian/xsane.lintian-overrides deleted file mode 100644 index efe5ce6..0000000 --- a/debian/xsane.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -spelling-error-in-binary usr/bin/xsane dependant dependent |