diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:56:10 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-02-07 06:56:10 +0100 |
| commit | 43f33c72804e63306580755049c09d5a81ad83e3 (patch) | |
| tree | 805caeb00a832ed96a331907987d4e6a2056a391 /backend/epson2.c | |
| parent | 0f86c5490ea7c2218a4394bf4c21bf3f9267a47c (diff) | |
| parent | 6427d36e269d8c14e6bc55373102a4ebc971ca38 (diff) | |
Merge branch 'release/debian/1.1.1-1'debian/1.1.1-1
Diffstat (limited to 'backend/epson2.c')
| -rw-r--r-- | backend/epson2.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/backend/epson2.c b/backend/epson2.c index a15a620..5bb75d4 100644 --- a/backend/epson2.c +++ b/backend/epson2.c @@ -15,10 +15,6 @@ * published by the Free Software Foundation, version 2. */ -#define EPSON2_VERSION 1 -#define EPSON2_REVISION 0 -#define EPSON2_BUILD 124 - /* debugging levels: * * 127 e2_recv buffer @@ -900,16 +896,14 @@ SANE_Status sane_init(SANE_Int *version_code, SANE_Auth_Callback __sane_unused__ authorize) { DBG_INIT(); - DBG(2, "%s: " PACKAGE " " VERSION "\n", __func__); - - DBG(1, "epson2 backend, version %i.%i.%i\n", - EPSON2_VERSION, EPSON2_REVISION, EPSON2_BUILD); + DBG(1, "%s: version " VERSION "\n", __func__); - if (version_code != NULL) - *version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, V_MINOR, - EPSON2_BUILD); + /* Keep '124' as our build version. The arg is obsolete by now */ + if (version_code) + *version_code = SANE_VERSION_CODE(SANE_CURRENT_MAJOR, SANE_CURRENT_MINOR, 124); sanei_usb_init(); + sanei_usb_set_timeout(60 * 1000); return SANE_STATUS_GOOD; } |