From f2b9f97e97b9434780faf69c7122979f58dc2bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 09:27:29 +0100 Subject: New README.source to explain the branching model used --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 1 + 2 files changed, 19 insertions(+) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 9dd35a4..5ac10d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xsane (0.999-6) UNRELEASED; urgency=medium * new debian/patches/0915-i18n_typo_geometrie.patch: - Correct typo (Closes: #862972). + * New README.source to explain the branching model used. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 -- cgit v1.2.3 From 2549dee23da71d77505261c232ecabb86418598d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 09:31:25 +0100 Subject: Declare compliance with Debian Policy 4.1.3 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5ac10d0..23643a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xsane (0.999-6) UNRELEASED; urgency=medium * new debian/patches/0915-i18n_typo_geometrie.patch: - Correct typo (Closes: #862972). * New README.source to explain the branching model used. + * Declare compliance with Debian Policy 4.1.3 (No changes needed). -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/control b/debian/control index e33caf9..f2d8a15 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xsane Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 3.9.8 +Standards-Version: 4.1.3 Build-Depends: debhelper (>= 10), dh-autoreconf, -- cgit v1.2.3 From 0a7a1d4657468b906d0bd543ecf12e00b38290e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 09:40:13 +0100 Subject: Migrate to debhelper 11 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23643a0..4270fb4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ xsane (0.999-6) UNRELEASED; urgency=medium - Correct typo (Closes: #862972). * New README.source to explain the branching model used. * Declare compliance with Debian Policy 4.1.3 (No changes needed). + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index f2d8a15..f33e079 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Standards-Version: 4.1.3 Build-Depends: - debhelper (>= 10), + debhelper (>= 11), dh-autoreconf, gettext, libgimp2.0-dev, -- cgit v1.2.3 From 592c74fc5f0817e6d671dcac3cfcf5fbf0f03eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 09:42:38 +0100 Subject: Change to my new mail address --- debian/changelog | 5 ++++- debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4270fb4..abf131f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ xsane (0.999-6) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * Change to my new mail address: + - debian/control, + - debian/copyright - -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 + -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 xsane (0.999-5) unstable; urgency=medium diff --git a/debian/control b/debian/control index f33e079..7928416 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: xsane Section: graphics Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Standards-Version: 4.1.3 Build-Depends: debhelper (>= 11), diff --git a/debian/copyright b/debian/copyright index eedcdca..a8fa15e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -65,7 +65,7 @@ License: GPL-2+ Files: debian/* Copyright: 1999-2002 Oliver Rauch 2002-2011 Julien BLACHE - 2014-2017 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-3+ Files: lib/alloca.c -- cgit v1.2.3 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/changelog | 2 ++ debian/patches/0175-icm_profile_field.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+) create mode 100644 debian/patches/0175-icm_profile_field.patch diff --git a/debian/changelog b/debian/changelog index abf131f..25b4d00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +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. Thanks to Reuben Thomas . -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 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 a223464de927db00cf9e2a3acecb0e8b573ff6d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 10:08:25 +0100 Subject: Use the automatic debug symbol packages --- debian/changelog | 5 ++++- debian/control | 26 -------------------------- debian/rules | 3 --- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25b4d00..998ce44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,10 @@ xsane (0.999-6) UNRELEASED; urgency=medium - debian/control, - debian/copyright * New patches/0175-icm_profile_field.patch to fix bogus icm_profile field - in output. Thanks to Reuben Thomas . + in output (Closes: #864486). Thanks to Reuben Thomas . + * Use the automatic debug symbol packages: + - Remove simple-scan-dbg section from debian/control. + - Remove override_dh_strip from debian/rules. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/control b/debian/control index 7928416..ec287f2 100644 --- a/debian/control +++ b/debian/control @@ -50,32 +50,6 @@ Description: featureful graphical frontend for SANE (Scanner Access Now Easy) under the GNU General Public License (commercial applications and backends are welcome, too, however). -Package: xsane-dbg -Architecture: any -Multi-Arch: same -Section: debug -Priority: extra -Depends: - ${misc:Depends}, - xsane (= ${binary:Version}) -Description: featureful graphical frontend for SANE (Debug files) - xsane can be run as a stand-alone program or through the GIMP image - manipulation program. In stand-alone mode, xsane can save an image - to a file in a variety of image formats, serve as a frontend to a - fax program, or send an image to a printer. - . - SANE stands for "Scanner Access Now Easy" and is an application - programming interface (API) that provides standardized access to any - raster image scanner hardware (flatbed scanner, hand-held scanner, - video- and still-cameras, frame-grabbers, etc.). The SANE standard is - free and its discussion and development are open to everybody. The - current source code is written to support several operating systems, - including GNU/Linux, OS/2, Win32 and various Unices and is available - under the GNU General Public License (commercial applications and - backends are welcome, too, however). - . - This package contains debug files needed by xsane. - Package: xsane-common Architecture: all Multi-Arch: foreign diff --git a/debian/rules b/debian/rules index e4abef4..db67153 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,6 @@ override_dh_auto_clean: rm -f xsane.spec include/config.h rm -f po/*.gmo -override_dh_strip: - dh_strip -pxsane --dbg-package=xsane-dbg - override_dh_auto_install: dh_auto_install -- cgit v1.2.3 From e0699dc7ead3d6560364402598a316076f020fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 11:19:03 +0100 Subject: Drop dh-autoreconf from build-depends and dh --with arguments --- debian/changelog | 2 ++ debian/control | 1 - debian/rules | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 998ce44..9a4ca8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ xsane (0.999-6) UNRELEASED; urgency=medium * Use the automatic debug symbol packages: - Remove simple-scan-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * Drop dh-autoreconf from build-depends and dh --with arguments because + this is all defaults when using dh compat 10. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/control b/debian/control index ec287f2..cc59715 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst Standards-Version: 4.1.3 Build-Depends: debhelper (>= 11), - dh-autoreconf, gettext, libgimp2.0-dev, libgtk2.0-dev, diff --git a/debian/rules b/debian/rules index db67153..9e63675 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --with autoreconf + dh $@ override_dh_auto_configure: dh_auto_configure -- --enable-gimp -- 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/changelog | 3 + debian/patches/0170-typo.patch | 243 +++++++++++++++++++++ debian/patches/0900-i18n_po_update_es_add_gl.patch | 2 +- 3 files changed, 247 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9a4ca8e..a1108e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ xsane (0.999-6) UNRELEASED; urgency=medium - Remove override_dh_strip from debian/rules. * Drop dh-autoreconf from build-depends and dh --with arguments because this is all defaults when using dh compat 10. + * Refresh patches: + - patches/0170-typo.patch + - patches/0900-i18n_po_update_es_add_gl.patch -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 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 6e3718933c6bd84ebd9b5ee2af312619b14d8a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 10 Sep 2018 20:46:33 +0200 Subject: Change Vcs-* to point to the new repository --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1108e2..391e9be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ xsane (0.999-6) UNRELEASED; urgency=medium * Refresh patches: - patches/0170-typo.patch - patches/0900-i18n_po_update_es_add_gl.patch + * debian/control: + - Change Vcs-* to point to the new repository. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/control b/debian/control index cc59715..33f3d41 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ Build-Depends: libtiff-dev, zlib1g-dev Homepage: http://www.xsane.org/ -Vcs-Git: git://anonscm.debian.org/collab-maint/xsane.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xsane.git +Vcs-Git: git://jff.email/opt/git/xsane.git +Vcs-Browser: https://jff.email/cgit/xsane.git Package: xsane Architecture: any -- 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/changelog | 3 ++- debian/control | 3 ++- debian/patches/0001-lcms2_configure.patch | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 391e9be..ae20eb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ xsane (0.999-6) UNRELEASED; urgency=medium * new debian/patches/0915-i18n_typo_geometrie.patch: - Correct typo (Closes: #862972). * New README.source to explain the branching model used. - * Declare compliance with Debian Policy 4.1.3 (No changes needed). + * Declare compliance with Debian Policy 4.2.1 (No changes needed). * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. @@ -22,6 +22,7 @@ xsane (0.999-6) UNRELEASED; urgency=medium - patches/0900-i18n_po_update_es_add_gl.patch * debian/control: - Change Vcs-* to point to the new repository. + - Add missing depend sensible-utils. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/control b/debian/control index 33f3d41..05a689f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xsane Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst -Standards-Version: 4.1.3 +Standards-Version: 4.2.1 Build-Depends: debhelper (>= 11), gettext, @@ -24,6 +24,7 @@ Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, + sensible-utils, xsane-common (= ${source:Version}) Recommends: cups-client, 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 edf17611a8349caa6aac6a0084f336bf6bee9484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 18:54:10 +0200 Subject: d/copyright: Use secure copyright format URI --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ae20eb6..805c4e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ xsane (0.999-6) UNRELEASED; urgency=medium * debian/control: - Change Vcs-* to point to the new repository. - Add missing depend sensible-utils. + * debian/copyright: + - Use secure copyright format URI. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/copyright b/debian/copyright index a8fa15e..198fd14 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xsane Upstream-Contact: Oliver Rauch Source: http://www.xsane.org/ -- cgit v1.2.3 From 8701bb9ff406e4be475a3ea76b8f983d820d3eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 18:55:22 +0200 Subject: d/copyright: Add year 2018 to me --- debian/changelog | 1 + debian/copyright | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 805c4e4..e4bb596 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ xsane (0.999-6) UNRELEASED; urgency=medium - Add missing depend sensible-utils. * debian/copyright: - Use secure copyright format URI. + - Add year 2018 to me. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/copyright b/debian/copyright index 198fd14..096e4d4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -65,7 +65,7 @@ License: GPL-2+ Files: debian/* Copyright: 1999-2002 Oliver Rauch 2002-2011 Julien BLACHE - 2014-2017 Jörg Frings-Fürst + 2014-2018 Jörg Frings-Fürst License: GPL-3+ Files: lib/alloca.c -- cgit v1.2.3 From 8c18b41366be43e765c6258cc53426dca346dac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 19:46:03 +0200 Subject: d/xsane.NEWS: Add new section about absent upstream --- debian/changelog | 2 ++ debian/xsane.NEWS | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index e4bb596..01b2252 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ xsane (0.999-6) UNRELEASED; urgency=medium * debian/copyright: - Use secure copyright format URI. - Add year 2018 to me. + * debian/xsane.NEWS: + - Add new section about absent upstream. -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/xsane.NEWS b/debian/xsane.NEWS index 7bfd03c..e3bcd61 100644 --- a/debian/xsane.NEWS +++ b/debian/xsane.NEWS @@ -1,3 +1,10 @@ +xsane (0.999-6) unstable; urgency=medium + + - Upstream has stopped working on xsane. Many thanks to Oliver Rauch for + your work. + + -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 + xsane (0.999-3) unstable; urgency=medium - New ocr commandline tools -- 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/changelog | 3 +++ debian/patches/0905-i18n_po_update_fr.patch | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01b2252..b4986a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ xsane (0.999-6) UNRELEASED; urgency=medium - Add year 2018 to me. * debian/xsane.NEWS: - Add new section about absent upstream. + * debian/patches/0905-i18n_po_update_fr.patch: + - Correct typos (Closes: #891666). + Thanks to Stéphane Blondon . -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 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/changelog | 7 +++++-- debian/patches/0125-desktop_file.patch | 23 ++++++++++++----------- 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 . + * New debian/patches/0175-icm_profile_field.patch to fix bogus icm_profile + field in output (Closes: #864486). Thanks to Reuben Thomas . * 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 . + * debian/patches/0125-desktop_file.patch: + - Correct some inconsistencies (Closes: #888433). + Thanks to Vladimir Kudrya . -- Jörg Frings-Fürst 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 +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/changelog | 2 ++ debian/patches/0125-desktop_file.patch | 8 ++++---- debian/patches/0125-desktop_file.patch~ | 35 +++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 debian/patches/0125-desktop_file.patch~ 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 . + - Remove obsolate key Encoding. + - Remove double key Type. -- Jörg Frings-Fürst 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 , 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/control | 2 +- debian/patches/0125-desktop_file.patch~ | 35 --------------------------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 debian/patches/0125-desktop_file.patch~ diff --git a/debian/control b/debian/control index 05a689f..b615d82 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: libjpeg62-turbo-dev, liblcms2-dev, libpng-dev, - libsane-dev, + libsane-dev (>= 1.0.27), libtiff-dev, zlib1g-dev Homepage: http://www.xsane.org/ 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 From 6bac7b4beeeb1c02d838833a7feea4095fc6685d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Oct 2018 21:12:37 +0200 Subject: d/changelog, d/xsane.NEWS: change date / time to release --- debian/changelog | 4 ++-- debian/xsane.NEWS | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fab2b3e..54e1a15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xsane (0.999-6) UNRELEASED; urgency=medium +xsane (0.999-6) unstable; urgency=medium * new debian/patches/0915-i18n_typo_geometrie.patch: - Correct typo (Closes: #862972). @@ -37,7 +37,7 @@ xsane (0.999-6) UNRELEASED; urgency=medium - Remove obsolate key Encoding. - Remove double key Type. - -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 + -- Jörg Frings-Fürst Wed, 03 Oct 2018 21:10:29 +0200 xsane (0.999-5) unstable; urgency=medium diff --git a/debian/xsane.NEWS b/debian/xsane.NEWS index e3bcd61..98f703a 100644 --- a/debian/xsane.NEWS +++ b/debian/xsane.NEWS @@ -3,7 +3,7 @@ xsane (0.999-6) unstable; urgency=medium - Upstream has stopped working on xsane. Many thanks to Oliver Rauch for your work. - -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 + -- Jörg Frings-Fürst Wed, 03 Oct 2018 21:10:29 +0200 xsane (0.999-3) unstable; urgency=medium -- cgit v1.2.3