summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rw-r--r--debian/patches/00list1
-rw-r--r--debian/patches/01_printing_defaults.dpatch21
4 files changed, 33 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8777628..38a5036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xsane (0.995-5) unstable; urgency=low
+
+ * debian/control:
+ + xsane Recommends: cups-client for the lp binary.
+
+ * debian/patches/01_printing_defaults.dpatch:
+ + Added; switch printing defaults from lpr to lp (closes: #468274).
+
+ -- Julien BLACHE <jblache@debian.org> Mon, 08 Sep 2008 11:04:02 +0200
+
xsane (0.995-4) unstable; urgency=low
* debian/control:
diff --git a/debian/control b/debian/control
index 48f180f..491230f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: xsane
Section: graphics
Architecture: any
Depends: xsane-common (= ${source:Version}), ${shlibs:Depends}
-Recommends: iceweasel | www-browser
+Recommends: iceweasel | www-browser, cups-client
Suggests: gimp, hylafax-client | mgetty-fax, gv, gocr
Description: featureful graphical frontend for SANE (Scanner Access Now Easy)
xsane can be run as a stand-alone program or through the GIMP image
diff --git a/debian/patches/00list b/debian/patches/00list
index 5dea2d0..27fa422 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
+01_printing_defaults
02_docviewer
03_gimp_acquire_menu
04_inhibit_clickthrough
diff --git a/debian/patches/01_printing_defaults.dpatch b/debian/patches/01_printing_defaults.dpatch
new file mode 100644
index 0000000..7f037bc
--- /dev/null
+++ b/debian/patches/01_printing_defaults.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_printing_defaults.dpatch by <jblache@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change default printing options, switch from lpr to lp.
+
+@DPATCH@
+diff -urNad xsane-0.995~/src/xsane.h xsane-0.995/src/xsane.h
+--- xsane-0.995~/src/xsane.h 2008-09-08 11:02:36.000000000 +0200
++++ xsane-0.995/src/xsane.h 2008-09-08 11:03:17.191704659 +0200
+@@ -510,8 +510,8 @@
+
+ #define OUT_FILENAME "out.pnm"
+ #define PRINTERNAME "new printer"
+-#define PRINTERCOMMAND "lpr"
+-#define PRINTERCOPYNUMBEROPTION "-#"
++#define PRINTERCOMMAND "lp"
++#define PRINTERCOPYNUMBEROPTION "-n"
+ #define FAXPROJECT "faxproject"
+ #define FAXCOMMAND "sendfax"
+ #define FAXRECEIVEROPT "-d"