diff --git a/README b/README index d5a082187..ce05debac 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ You always find the most recent version of SANE on: http://www.mostang.com/sane There are several graphical frontends available for SANE. -XSane is available on http://www.wolfsburg.de/~rauch/sane-xsane.html +XSane is available on http://www.xsane.org The graphical frontends that have been included into the sane package up to version sane-1.0.3 (xscanimage and xcam) have been put into an own package sane-frontends-1.0.x, this package is available on http://www.mostang.com/sane diff --git a/backend/dll.c b/backend/dll.c index 9d236e4d7..f2e0e1f3a 100644 --- a/backend/dll.c +++ b/backend/dll.c @@ -42,7 +42,9 @@ allows managing an arbitrary number of SANE backends by using dynamic linking to load backends on demand. */ -#define BUILD 5 +/* Please increase version number with every change + (don't forget to update dll.desc) */ +#define DLL_VERSION "1.0.1" #ifdef _AIX # include "lalloca.h" /* MUST come first for AIX! */ @@ -506,9 +508,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) auth_callback = authorize; - DBG(1, "sane_init: SANE dll backend version %d.%d.%d from %s\n", V_MAJOR, - V_MINOR, BUILD, PACKAGE_VERSION); - + DBG(1, "sane_init: SANE dll backend version %s from %s\n", DLL_VERSION, + PACKAGE_VERSION); /* chain preloaded backends together: */ for (i = 0; i < NELEMS(preloaded_backends); ++i) @@ -520,7 +521,8 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) } if (version_code) - *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD); + *version_code = SANE_VERSION_CODE (SANE_DLL_V_MAJOR, SANE_DLL_V_MINOR, + SANE_DLL_V_BUILD); fp = sanei_config_open (DLL_CONFIG_FILE); if (!fp) diff --git a/backend/dll.desc b/backend/dll.desc index 0fa410c7d..aab4242a6 100644 --- a/backend/dll.desc +++ b/backend/dll.desc @@ -1,5 +1,5 @@ :backend "dll" ; name of backend -:version "1.0.5" +:version "1.0.1" :status :beta :manpage "sane-dll" diff --git a/backend/net.c b/backend/net.c index 8eb57a7cf..972f0d747 100644 --- a/backend/net.c +++ b/backend/net.c @@ -40,7 +40,9 @@ This file implements a SANE network-based meta backend. */ -#define BUILD 5 +/* Please increase version number with every change + (don't forget to update net.desc) */ +#define NET_VERSION "1.0.1" #ifdef _AIX # include "lalloca.h" /* MUST come first for AIX! */ @@ -329,11 +331,15 @@ SANE_Status sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize) auth_callback = authorize; + /* Return the version number of the sane-backends package to allow + the frontend to print them. This is done only for net and dll, + because these backends are usually called by the frontend. */ if (version_code) - *version_code = SANE_VERSION_CODE (V_MAJOR, V_MINOR, BUILD); + *version_code = SANE_VERSION_CODE (SANE_DLL_V_MAJOR, SANE_DLL_V_MINOR, + SANE_DLL_V_BUILD); - DBG(1, "sane_init: SANE net backend version %d.%d.%d from %s\n", V_MAJOR, - V_MINOR, BUILD, PACKAGE_VERSION); + DBG(1, "sane_init: SANE net backend version %s from %s\n", NET_VERSION, + PACKAGE_VERSION); serv = getservbyname ("sane", "tcp"); if (serv) diff --git a/backend/net.desc b/backend/net.desc index 62ae830c4..244633bde 100644 --- a/backend/net.desc +++ b/backend/net.desc @@ -1,5 +1,5 @@ :backend "net" ; name of backend -:version "1.0.5" +:version "1.0.1" :status :beta :manpage "sane-net" diff --git a/doc/releases.txt b/doc/releases.txt new file mode 100644 index 000000000..c08c04aba --- /dev/null +++ b/doc/releases.txt @@ -0,0 +1,34 @@ +2001-04-16 + +This text summarizes some points to pay attention to when a new realease +of sane-backends should be made. + +Before the release: + +* configure.in: increase version number +* configure.in: set --disable-warnings as default +* configure: recreate +* net.c net.desc dll.c dll.desc: update version numbers +* NEWS: update and enter date of release +* sane-backends.lsm: update +* ChangeLog: set release marker +* final compilation test +* make distclean + +Making the release: + +* remove all CVS files from directories (CVS, .cvsignore etc.) +* make tar.gz and sane-backends-x.y.z.lsm +* upload both to mostang.com +* make sane-backends.html and upload to mostang.com +* update SANE standard and man pages on mostang.com +* check and update platforms page on mostang.com +* write announcements on mostang.com and sane-devel, maybe others + (e.g. freshmeat) +* upload to mirrors that don't get the files automatically (sunsite + and tsx11) + +After the release: + +* configure.in: set --enable-warnings as default +* configure: regenerate diff --git a/include/sane/config.h.in b/include/sane/config.h.in index 78e4f3b34..93cce6cd0 100644 --- a/include/sane/config.h.in +++ b/include/sane/config.h.in @@ -359,6 +359,11 @@ /* Define if you have PTAL. */ #undef HAVE_PTAL +/* Version of the dll backend (=version of the sane-backends package) */ +#undef SANE_DLL_V_MAJOR +#undef SANE_DLL_V_MINOR +#undef SANE_DLL_V_BUILD + #ifndef HAVE_STRNCASECMP /* OS/2 needs this */ # define strncasecmp(a, b, c) strnicmp(a, b, c)