File rebranding.patch of Package imagescan
Description: Rebranding changes
Minimal changes to make Utsushi look as if it is Image Scan.
Author: Kenichi Shimoura <linux-printer@epson.jp>
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
- Utsushi - Next Generation Image Acquisition
+ Image Scan - Next Generation Image Acquisition
Copyright (C) 2012-2016 SEIKO EPSON CORPORATION
Copyright (C) 2015 Olaf Meeuwissen
@@ -25,7 +25,7 @@
USING THE SOFTWARE
==================
- The software can be started from a command-line with the `utsushi`
+ The software can be started from a command-line with the `imagescan`
command. This will automatically select a suitable application to
control image acquisition and select the default device. The GUI
supports selecting a different device should you want to.
@@ -40,16 +40,16 @@ USING THE SOFTWARE
For brief help information, use
- $ utsushi help
+ $ imagescan help
and for help on the image acquisition applications
- $ utsushi help scan
- $ utsushi help scan --no-interface
+ $ imagescan help scan
+ $ imagescan help scan --no-interface
To see which devices are available, use
- $ utsushi list
+ $ imagescan list
and use any of the displayed devices as an argument to the 'scan'
command to select a particular device rather than whatever is the
@@ -130,70 +130,3 @@ BUILDING/INSTALLING FROM SOURCE
To make getting all that software on your system a bit easier, the
sources include a script to install all these packages for you.
See `./install-deps --help` for details.
-
-
-DEVELOPER NOTES
-===============
-
- DIRECTORY STRUCTURE
- -------------------
- The build infrastructure relies on a number of 'upstream/' files
- courtesy of other software as well as 'include/' files to reduce
- code duplication in this package's Makefile.am files.
-
- In addition to an Utsushi "core", the source code contains a fair
- number of optional components. The "core" consists of all files
- in the 'utsushi/', 'lib/' and 'src/' directories. The optional
- components are grouped in subdirectories as follows:
-
- - connexions various ways to communicate with hardware
- - drivers
- * dbus for drivers running in a separate process [TODO]
- * esci support for ESC/I protocol speaking scanners
- * mock virtual scanners, useful for demonstration as well
- as testing purposes [TODO]
- * sane Utsushi API implemented using the SANE API [TODO]
- enables use of SANE backends in Utsushi applications
- - filters modify image data to taste
- - gtkmm GUI toolkit for Utsushi applications using gtkmm
- - sane a SANE backend implemented using the Utsushi API
- enables use of Utsushi drivers in SANE frontends
-
- Test suites are kept apart from the code they test in respective
- 'tests/' directories.
-
- API documentation can be found in the 'doc/' directory and can be
- updated with the 'html' and 'pdf' `make` targets. Doing this at
- the top level source directory will recursively update all of the
- available API documentation.
-
- RUNNING DEVELOPMENT CODE
- ------------------------
- Most of the code can be run without the need to install. Setting
- the 'srcdir' environment variable to the directory that holds the
- corresponding sources, normally the current directory, activates
- special handling of data and configuration file look-up so these
- will be taken from the source code tree.
-
- The gtkmm scan application, for example, can be run like so
-
- $ cd src
- $ srcdir=. ./scan-gtkmm
-
- You can also execute commands via the `main` program, like so
-
- $ cd src
- $ srcdir=. ./main list
-
- in case you want to see a list of available devices. Execution
- via `main` is the intended mode of operation once the software is
- installed but may get in the way of debugging.
-
- Exercising the SANE utsushi backend is a little more involved as
- you have to make the SANE frontends go places where they normally
- don't. For 'scanimage', the following ought to work
-
- $ cd sane
- $ echo utsushi > dll.conf
- $ srcdir=. SANE_CONFIG_DIR=. ../libtool --mode=execute \
- -dlopen libsane-utsushi.la scanimage -L
--- a/gtkmm/about.xml.in
+++ b/gtkmm/about.xml.in
@@ -21,9 +21,9 @@
-->
<interface>
<object class="GtkAboutDialog" id="about-dialog">
- <property name="title">@PACKAGE_NAME@</property>
- <property name="program_name">@PACKAGE_NAME@</property>
- <property name="version">@PACKAGE_VERSION@</property>
+ <property name="title">Image Scan</property>
+ <property name="program_name">Image Scan</property>
+ <property name="version">3.59.2</property>
<property name="copyright">Copyright (C) 2012-2016 SEIKO EPSON CORPORATION</property>
<property name="website">@PACKAGE_URL@</property>
<!--<property name="authors">EPSON AVASYS CORPORATION</property>-->
--- a/lib/monitor.cpp
+++ b/lib/monitor.cpp
@@ -248,7 +248,7 @@ monitor::impl::impl ()
{
add_conf_file (devices_, COMBOCONFFILE);
- add_conf_file (devices_, PKGCONFFILE);
+ add_conf_file (devices_, "imagescan.conf");
// Pick up on any scanner devices that are tagged courtesy of the
// SANE project. These functions assume that tags are set on the
--- a/lib/run-time.cpp
+++ b/lib/run-time.cpp
@@ -83,7 +83,7 @@ run_time::run_time ()
std::string
run_time::program () const
{
- return PACKAGE_TARNAME;
+ return "imagescan";
}
std::string
@@ -178,8 +178,8 @@ run_time::version (const std::string& legalese,
return (fmt
% program ()
% command ()
- % PACKAGE_NAME
- % PACKAGE_VERSION
+ % "Image Scan"
+ % "3.59.2"
% (legalese.empty ()
? default_legalese
: legalese)
@@ -256,7 +256,7 @@ run_time::conf_file (scope s, const std::string& name) const
{
/**/ if (pkg == s || sys == s)
{
- rv = fs::path (PKGSYSCONFDIR) / name;
+ rv = fs::path ("/etc/imagescan") / name;
}
else
{
@@ -458,7 +458,7 @@ run_time::impl::impl (int argc, const char *const argv[])
if (0 == cmd_name.find (prefix))
cmd_name.erase (0, prefix.length ());
- if (!(PACKAGE_TARNAME == cmd_name || "main" == cmd_name))
+ if (!("imagescan" == cmd_name || "main" == cmd_name))
command_ = cmd_name;
if (command_.empty ())
