From f57239b8e7ea51d355fa1f7a3bc0bbc9dcec7190 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Fri, 27 Apr 2007 21:46:28 +0200 Subject: Imported Debian patch 0.99+0.991-3 --- debian/changelog | 10 ++ debian/patches/00list | 3 + debian/patches/10_broken_links.dpatch | 20 +++ debian/patches/11_contect_typo.dpatch | 283 ++++++++++++++++++++++++++++++++++ 4 files changed, 316 insertions(+) create mode 100644 debian/patches/10_broken_links.dpatch create mode 100644 debian/patches/11_contect_typo.dpatch diff --git a/debian/changelog b/debian/changelog index e95de6c..9f4c508 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xsane (0.99+0.991-3) unstable; urgency=low + + * debian/patches/10_broken_links.dpatch: + + Added; fix broken links in HTML documentation (closes: #415299). + * debian/patches/11_contect_typo.dpatch: + + Added; fix "contect" typo in xsane-text.h; original patch by + Martin Pitt (closes: #420749). + + -- Julien BLACHE Fri, 27 Apr 2007 21:46:28 +0200 + xsane (0.99+0.991-2) unstable; urgency=low * debian/control: diff --git a/debian/patches/00list b/debian/patches/00list index 349899e..d0f048a 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,5 @@ 02_docviewer 03_gimp_acquire_menu +10_broken_links +11_contect_typo + diff --git a/debian/patches/10_broken_links.dpatch b/debian/patches/10_broken_links.dpatch new file mode 100644 index 0000000..4d700b0 --- /dev/null +++ b/debian/patches/10_broken_links.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_broken_links.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix broken links in HTML documentation. + +@DPATCH@ +diff -urNad xsane-0.99+0.991~/doc/sane-xsane-doc.html xsane-0.99+0.991/doc/sane-xsane-doc.html +--- xsane-0.99+0.991~/doc/sane-xsane-doc.html 2005-12-31 16:33:16.000000000 +0100 ++++ xsane-0.99+0.991/doc/sane-xsane-doc.html 2007-03-18 10:56:14.832828848 +0100 +@@ -161,8 +161,7 @@ +
  • Display setup
    • +
  • Enhancement setup
    • +
  • Fax setup
    • +-
  • Image setup
    • +-
  • Mail setup
    • ++
  • Mail setup
    • +
  • Saving setup
    • + + diff --git a/debian/patches/11_contect_typo.dpatch b/debian/patches/11_contect_typo.dpatch new file mode 100644 index 0000000..8bb7fbf --- /dev/null +++ b/debian/patches/11_contect_typo.dpatch @@ -0,0 +1,283 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_contect_typo.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix "contect" typo in xsane-text.h; original patch by Martin Pitt + +@DPATCH@ +diff -urNad xsane-0.99+0.991~/po/cs.po xsane-0.99+0.991/po/cs.po +--- xsane-0.99+0.991~/po/cs.po 2006-01-10 19:21:11.000000000 +0100 ++++ xsane-0.99+0.991/po/cs.po 2007-04-27 21:44:31.905588023 +0200 +@@ -2098,7 +2098,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Předvolená oblast:\n" +diff -urNad xsane-0.99+0.991~/po/da.po xsane-0.99+0.991/po/da.po +--- xsane-0.99+0.991~/po/da.po 2006-01-10 19:21:11.000000000 +0100 ++++ xsane-0.99+0.991/po/da.po 2007-04-27 21:44:31.913588772 +0200 +@@ -2105,7 +2105,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Forvalgt område:\n" +diff -urNad xsane-0.99+0.991~/po/de.po xsane-0.99+0.991/po/de.po +--- xsane-0.99+0.991~/po/de.po 2006-01-10 19:21:12.000000000 +0100 ++++ xsane-0.99+0.991/po/de.po 2007-04-27 21:44:31.922589615 +0200 +@@ -2122,7 +2122,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Bereichsvoreinstellung:\n" +diff -urNad xsane-0.99+0.991~/po/es.po xsane-0.99+0.991/po/es.po +--- xsane-0.99+0.991~/po/es.po 2006-01-10 19:21:12.000000000 +0100 ++++ xsane-0.99+0.991/po/es.po 2007-04-27 21:44:31.929590271 +0200 +@@ -2165,7 +2165,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Área de preset:\n" +diff -urNad xsane-0.99+0.991~/po/fr.po xsane-0.99+0.991/po/fr.po +--- xsane-0.99+0.991~/po/fr.po 2006-01-10 19:21:12.000000000 +0100 ++++ xsane-0.99+0.991/po/fr.po 2007-04-27 21:44:31.938591114 +0200 +@@ -2153,7 +2153,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Aire de présélection: \n" +diff -urNad xsane-0.99+0.991~/po/hu.po xsane-0.99+0.991/po/hu.po +--- xsane-0.99+0.991~/po/hu.po 2006-01-10 19:21:12.000000000 +0100 ++++ xsane-0.99+0.991/po/hu.po 2007-04-27 21:44:31.945591769 +0200 +@@ -2092,7 +2092,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Előre beállított terület:\n" +diff -urNad xsane-0.99+0.991~/po/it.po xsane-0.99+0.991/po/it.po +--- xsane-0.99+0.991~/po/it.po 2006-01-10 19:21:12.000000000 +0100 ++++ xsane-0.99+0.991/po/it.po 2007-04-27 21:44:31.954592612 +0200 +@@ -2139,7 +2139,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Area preselezionata:\n" +diff -urNad xsane-0.99+0.991~/po/ja.po xsane-0.99+0.991/po/ja.po +--- xsane-0.99+0.991~/po/ja.po 2006-01-10 19:21:13.000000000 +0100 ++++ xsane-0.99+0.991/po/ja.po 2007-04-27 21:44:31.962593361 +0200 +@@ -2108,7 +2108,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "プリセット領域：\n" +diff -urNad xsane-0.99+0.991~/po/nl.po xsane-0.99+0.991/po/nl.po +--- xsane-0.99+0.991~/po/nl.po 2006-01-10 19:21:13.000000000 +0100 ++++ xsane-0.99+0.991/po/nl.po 2007-04-27 21:44:31.969594017 +0200 +@@ -2108,7 +2108,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Scangebied:\n" +diff -urNad xsane-0.99+0.991~/po/pl.po xsane-0.99+0.991/po/pl.po +--- xsane-0.99+0.991~/po/pl.po 2006-01-10 19:21:13.000000000 +0100 ++++ xsane-0.99+0.991/po/pl.po 2007-04-27 21:44:31.977594766 +0200 +@@ -2125,7 +2125,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Obszar ustawiony:\n" +diff -urNad xsane-0.99+0.991~/po/pt.po xsane-0.99+0.991/po/pt.po +--- xsane-0.99+0.991~/po/pt.po 2006-01-10 19:21:13.000000000 +0100 ++++ xsane-0.99+0.991/po/pt.po 2007-04-27 21:44:31.985595515 +0200 +@@ -2148,7 +2148,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Área pré-configurada:\n" +diff -urNad xsane-0.99+0.991~/po/pt_BR.po xsane-0.99+0.991/po/pt_BR.po +--- xsane-0.99+0.991~/po/pt_BR.po 2006-01-10 19:21:13.000000000 +0100 ++++ xsane-0.99+0.991/po/pt_BR.po 2007-04-27 21:44:31.994596358 +0200 +@@ -2148,7 +2148,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Área pré-configurada:\n" +diff -urNad xsane-0.99+0.991~/po/ro.po xsane-0.99+0.991/po/ro.po +--- xsane-0.99+0.991~/po/ro.po 2006-01-10 19:21:14.000000000 +0100 ++++ xsane-0.99+0.991/po/ro.po 2007-04-27 21:44:32.002597107 +0200 +@@ -2154,7 +2154,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Zona predefinită:\n" +diff -urNad xsane-0.99+0.991~/po/ru.po xsane-0.99+0.991/po/ru.po +--- xsane-0.99+0.991~/po/ru.po 2006-01-10 19:21:14.000000000 +0100 ++++ xsane-0.99+0.991/po/ru.po 2007-04-27 21:44:32.010597856 +0200 +@@ -2123,7 +2123,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Область предварительных настроек:\n" +diff -urNad xsane-0.99+0.991~/po/sk.po xsane-0.99+0.991/po/sk.po +--- xsane-0.99+0.991~/po/sk.po 2006-01-10 19:21:14.000000000 +0100 ++++ xsane-0.99+0.991/po/sk.po 2007-04-27 21:44:32.018598606 +0200 +@@ -2149,7 +2149,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Predvolená oblasť:\n" +diff -urNad xsane-0.99+0.991~/po/sl.po xsane-0.99+0.991/po/sl.po +--- xsane-0.99+0.991~/po/sl.po 2006-01-10 19:21:14.000000000 +0100 ++++ xsane-0.99+0.991/po/sl.po 2007-04-27 21:44:32.026599355 +0200 +@@ -2097,7 +2097,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Prednastavljeno območje:\n" +diff -urNad xsane-0.99+0.991~/po/sr.po xsane-0.99+0.991/po/sr.po +--- xsane-0.99+0.991~/po/sr.po 2006-01-10 19:21:14.000000000 +0100 ++++ xsane-0.99+0.991/po/sr.po 2007-04-27 21:44:32.034600104 +0200 +@@ -2131,7 +2131,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + +diff -urNad xsane-0.99+0.991~/po/sv.po xsane-0.99+0.991/po/sv.po +--- xsane-0.99+0.991~/po/sv.po 2006-01-10 19:21:15.000000000 +0100 ++++ xsane-0.99+0.991/po/sv.po 2007-04-27 21:44:32.042600853 +0200 +@@ -2142,7 +2142,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + +diff -urNad xsane-0.99+0.991~/po/tr.po xsane-0.99+0.991/po/tr.po +--- xsane-0.99+0.991~/po/tr.po 2006-01-10 19:21:15.000000000 +0100 ++++ xsane-0.99+0.991/po/tr.po 2007-04-27 21:44:32.050601603 +0200 +@@ -2112,7 +2112,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Öntanımlı alan: \n" +diff -urNad xsane-0.99+0.991~/po/vi.po xsane-0.99+0.991/po/vi.po +--- xsane-0.99+0.991~/po/vi.po 2006-01-10 19:21:15.000000000 +0100 ++++ xsane-0.99+0.991/po/vi.po 2007-04-27 21:44:32.058602352 +0200 +@@ -2150,7 +2150,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + "Vùng định trước:\n" +diff -urNad xsane-0.99+0.991~/po/xsane.pot xsane-0.99+0.991/po/xsane.pot +--- xsane-0.99+0.991~/po/xsane.pot 2006-01-07 00:26:28.000000000 +0100 ++++ xsane-0.99+0.991/po/xsane.pot 2007-04-27 21:42:48.949947015 +0200 +@@ -2026,7 +2026,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + +diff -urNad xsane-0.99+0.991~/po/zh.po xsane-0.99+0.991/po/zh.po +--- xsane-0.99+0.991~/po/zh.po 2006-01-10 19:21:15.000000000 +0100 ++++ xsane-0.99+0.991/po/zh.po 2007-04-27 21:44:32.066603101 +0200 +@@ -2082,7 +2082,7 @@ + #. DESC_PRESET_AREA + msgid "" + "Preset area:\n" +-"To add new area or edit an existing area use contect menu (right mouse " ++"To add new area or edit an existing area use context menu (right mouse " + "button)." + msgstr "" + +diff -urNad xsane-0.99+0.991~/src/xsane-text.h xsane-0.99+0.991/src/xsane-text.h +--- xsane-0.99+0.991~/src/xsane-text.h 2007-04-27 21:42:09.576259970 +0200 ++++ xsane-0.99+0.991/src/xsane-text.h 2007-04-27 21:42:48.950947108 +0200 +@@ -625,7 +625,7 @@ + #define DESC_DELETE_IMAGES _("Delete preview image cache") + + #define DESC_PRESET_AREA _("Preset area:\n" \ +- "To add new area or edit an existing area use contect menu (right mouse button).") ++ "To add new area or edit an existing area use context menu (right mouse button).") + #define DESC_ROTATION _("Rotate preview and scan") + #define DESC_RATIO _("Aspect ratio of selection") + #define DESC_PAPER_ORIENTATION _("Define image position for printing") -- cgit v1.2.3