diff options
| author | Aurelien Jarno <aurel32@debian.org> | 2005-02-03 16:24:20 +0100 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@mapreri.org> | 2014-10-03 14:05:06 +0000 |
| commit | 825ef604db05e42ea267a86187bf62d54670c98c (patch) | |
| tree | c41b8addd68e573fcf6ef599ec777e251a130b8e /debian/patches | |
| parent | ac8459519a9ef2a1ee635509b52a653da1bfe9d5 (diff) | |
| parent | 817e6294b42b3e4435f1b99728afc1dca84a6445 (diff) | |
Imported Debian patch 0.97-3debian/0.97-3
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/00list | 4 | ||||
| -rw-r--r-- | debian/patches/01_logo_docs.dpatch | 61 | ||||
| -rw-r--r-- | debian/patches/02_docviewer.dpatch | 46 | ||||
| -rw-r--r-- | debian/patches/03_gimp_acquire_menu.dpatch | 39 | ||||
| -rw-r--r-- | debian/patches/10_batch_scan_bugfix.dpatch | 25 |
5 files changed, 175 insertions, 0 deletions
diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..3badab4 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,4 @@ +01_logo_docs +02_docviewer +03_gimp_acquire_menu +10_batch_scan_bugfix diff --git a/debian/patches/01_logo_docs.dpatch b/debian/patches/01_logo_docs.dpatch new file mode 100644 index 0000000..fbe0641 --- /dev/null +++ b/debian/patches/01_logo_docs.dpatch @@ -0,0 +1,61 @@ +#!/bin/sh -e +## logo_docs.dpatch.dpatch by Aurelien Jarno <aurel32@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /scratch/xsane/xsane-0.91/doc/sane-backends-doc.html xsane-0.91/doc/sane-backends-doc.html +--- /scratch/xsane/xsane-0.91/doc/sane-backends-doc.html 2003-06-03 23:31:25.000000000 +0200 ++++ xsane-0.91/doc/sane-backends-doc.html 2003-06-03 23:37:13.000000000 +0200 +@@ -10,7 +10,7 @@ + <body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000"> + + <dd> +-<img SRC="sane-logo2.jpg" height=150 width=128 align=LEFT></dd> ++<img SRC="xsane-logo2.jpg" height=150 width=128 align=LEFT></dd> + + <blockquote> + <h1> +diff -urNad /scratch/xsane/xsane-0.91/doc/sane-problems-doc.html xsane-0.91/doc/sane-problems-doc.html +--- /scratch/xsane/xsane-0.91/doc/sane-problems-doc.html 2003-06-03 23:31:25.000000000 +0200 ++++ xsane-0.91/doc/sane-problems-doc.html 2003-06-03 23:37:30.000000000 +0200 +@@ -10,7 +10,7 @@ + <body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000"> + + <dd> +-<img SRC="sane-logo2.jpg" height=150 width=128 align=LEFT></dd> ++<img SRC="xsane-logo2.jpg" height=150 width=128 align=LEFT></dd> + + <blockquote> + <br> +diff -urNad /scratch/xsane/xsane-0.91/doc/sane-scantips-doc.html xsane-0.91/doc/sane-scantips-doc.html +--- /scratch/xsane/xsane-0.91/doc/sane-scantips-doc.html 2003-06-03 23:31:25.000000000 +0200 ++++ xsane-0.91/doc/sane-scantips-doc.html 2003-06-03 23:37:25.000000000 +0200 +@@ -10,7 +10,7 @@ + <body text="#000000" bgcolor="#FFFFFF" link="#0000EF" vlink="#51188E" alink="#FF0000"> + + <dd> +-<img SRC="sane-logo2.jpg" height=150 width=128 align=LEFT></dd> ++<img SRC="xsane-logo2.jpg" height=150 width=128 align=LEFT></dd> + + <blockquote> + <h1> diff --git a/debian/patches/02_docviewer.dpatch b/debian/patches/02_docviewer.dpatch new file mode 100644 index 0000000..68082e0 --- /dev/null +++ b/debian/patches/02_docviewer.dpatch @@ -0,0 +1,46 @@ +#!/bin/sh -e +## 02_docviewer.dpatch.dpatch by Aurelien Jarno <aurel32@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change default browser to /usr/bin/sensible-browser. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/julien/debian/pkg-build/SANE/xsane/0.94/xsane-0.94/src/xsane.h xsane-0.94/src/xsane.h +--- /home/julien/debian/pkg-build/SANE/xsane/0.94/xsane-0.94/src/xsane.h 2004-06-10 17:35:52.000000000 +0200 ++++ xsane-0.94/src/xsane.h 2004-06-10 17:35:52.000000000 +0200 +@@ -205,7 +205,7 @@ + # elif defined(HAVE_OS2_H) + # define DEFAULT_BROWSER "netscape" + # else +-# define DEFAULT_BROWSER "netscape" ++# define DEFAULT_BROWSER "/usr/bin/sensible-browser" + # endif + #endif + +@@ -453,7 +453,7 @@ + #define OCROUTPUTFILEOPT "-o" + #define OCROUTFDOPT "-x" + #define OCRPROGRESSKEY "" +-#define BROWSER_NETSCAPE "netscape" ++#define BROWSER_NETSCAPE "/usr/bin/sensible-browser" + + #define XSANE_MEDIUM_CALIB_BRIGHTNESS_MIN -1000.0 + #define XSANE_MEDIUM_CALIB_BRIGHTNESS_MAX 1000.0 diff --git a/debian/patches/03_gimp_acquire_menu.dpatch b/debian/patches/03_gimp_acquire_menu.dpatch new file mode 100644 index 0000000..d9832fe --- /dev/null +++ b/debian/patches/03_gimp_acquire_menu.dpatch @@ -0,0 +1,39 @@ +#!/bin/sh -e +## 03_gimp_acquire_menu.dpatch.dpatch by Aurelien Jarno <aurel32@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /scratch/xsane/xsane-0.91/src/xsane-text.h xsane-0.91/src/xsane-text.h +--- /scratch/xsane/xsane-0.91/src/xsane-text.h 2003-01-05 18:05:55.000000000 +0100 ++++ xsane-0.91/src/xsane-text.h 2003-06-03 23:43:49.000000000 +0200 +@@ -726,8 +726,8 @@ + #define XSANE_GIMP_INSTALL_HELP _("This function provides access to scanners and other image acquisition devices through the SANE (Scanner Access Now Easy) interface.") + + /* Menu path must not be translated, this is done by the gimp. Only translate the text behind the last "/" */ +-#define XSANE_GIMP_MENU_DIALOG _("<Toolbox>/File/Acquire/XSane: Device dialog...") +-#define XSANE_GIMP_MENU _("<Toolbox>/File/Acquire/XSane: ") ++#define XSANE_GIMP_MENU_DIALOG _("<Toolbox>/File/Acquire/XSane/Device dialog...") ++#define XSANE_GIMP_MENU _("<Toolbox>/File/Acquire/XSane/") + #define XSANE_GIMP_MENU_DIALOG_OLD _("<Toolbox>/Xtns/XSane/Device dialog...") + #define XSANE_GIMP_MENU_OLD _("<Toolbox>/Xtns/XSane/") + diff --git a/debian/patches/10_batch_scan_bugfix.dpatch b/debian/patches/10_batch_scan_bugfix.dpatch new file mode 100644 index 0000000..a875c47 --- /dev/null +++ b/debian/patches/10_batch_scan_bugfix.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_batch_scan_bugfix.dpatch by <jblache@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix batch scanning bug. + +@DPATCH@ +diff -urNad xsane-0.97/src/xsane-batch-scan.c /tmp/dpep.7eXNXU/xsane-0.97/src/xsane-batch-scan.c +--- xsane-0.97/src/xsane-batch-scan.c 2005-01-22 15:59:54.000000000 +0100 ++++ /tmp/dpep.7eXNXU/xsane-0.97/src/xsane-batch-scan.c 2005-01-27 22:16:31.000000000 +0100 +@@ -505,12 +505,12 @@ + + while (xsane.scanning) + { +-#if 0 ++#if 1 + if (gtk_events_pending()) + { + gtk_main_iteration(); + } +-#elseif ++#else + gtk_main_iteration(); + #endif + } |