* doc/.gitignore, doc/Makefile.am, doc/Makefile.in:

- added new targets for scanner search engine db
* doc/releases.txt: improved doc
* doc/saned.man: clean typos
* tools/sane-desc.c: removed NAME= from udev rules (deprecated)

ChangeLog

@@ -1,5 +1,10 @@
 2010-02-10 m. allan noah <kitno455 at gmail dot com>
 	* backend/gt68xx_devices.c: add GT68XX_FLAG_NO_STOP to SF600
+	* doc/.gitignore, doc/Makefile.am, doc/Makefile.in:
+	- added new targets for scanner search engine db
+	* doc/releases.txt: improved doc
+	* doc/saned.man: clean typos
+	* tools/sane-desc.c: removed NAME= from udev rules (deprecated)
 
 2010-02-09 m. allan noah <kitno455 at gmail dot com>
 	* backend/fujitsu.c, doc/descriptions/fujitsu.desc,

doc/.gitignore

@@ -16,3 +16,5 @@ sane.lot
 sane.ps
 sane.toc
 sane.ilg
+descriptions-external.db
+descriptions.db

doc/Makefile.am

@@ -281,6 +281,14 @@ sane-mfgs-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
 	  -t "SANE: Devices Supported by External Backends" -d 0 \
 	  > sane-mfgs-external.html
 
+descriptions.db: $(DESC_FILES) ../tools/sane-desc
+	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
+	  > descriptions.db
+
+descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
+	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \
+	  > descriptions-external.db
+
 html-pages: $(HTML_PAGES)
 html: html-pages html-man sane-html
 

doc/Makefile.in

@@ -871,6 +871,14 @@ sane-mfgs-external.html: $(DESC_EXT_FILES) ../tools/sane-desc
 	  -t "SANE: Devices Supported by External Backends" -d 0 \
 	  > sane-mfgs-external.html
 
+descriptions.db: $(DESC_FILES) ../tools/sane-desc
+	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions \
+	  > descriptions.db
+
+descriptions-external.db: $(DESC_FILES) ../tools/sane-desc
+	@../tools/sane-desc -m ascii -s ${srcdir}/descriptions-external \
+	  > descriptions-external.db
+
 html-pages: $(HTML_PAGES)
 html: html-pages html-man sane-html
 

doc/releases.txt

@@ -46,16 +46,24 @@ Making the release:
 
 Announcing the release:
 
-* checkout the html module and:
+* checkout the sane/website.git module and:
 * copy sane-backends.html to sane-backends-"old-version".html
 * update sane-supported-devices.html with link to above "old" file
 * rebuild sane-backends.html and sane-mfgs.html (see doc/Makefile)
-* use man2htmlfrom http://hydra.nac.uci.edu/indiv/ehood/man2html.html
+* use man2html from http://hydra.nac.uci.edu/indiv/ehood/man2html.html
   to rebuild html man pages (see doc/Makefile) (no other version works)
 * add md5 sum to sane-md5sum.txt
 * check and update platforms page (sane-support.html)
-* write announcements on sane-project.org and sane-devel, maybe others
-  (e.g. freshmeat), include the md5 hash
+* add announcement (with md5sum) to index.html
+* git commit -a && git push
+* ssh alioth.debian.org
+* cd /org/alioth.debian.org/chroot/home/groups/sane
+* ./bin/update-htdocs.sh
+* rebuild descriptions.db and descriptions-external.db (see doc/Makefile)
+* scp descriptions.db and descriptions-external.db to alioth
+  put them in /org/alioth.debian.org/chroot/home/groups/sane/search/release
+* write announcements sane-devel, maybe others (e.g. freshmeat),
+  include the md5 hash
 
 After the release:
 
@@ -67,6 +75,6 @@ After the release:
 * configure: regenerate with autoconf
 * remove the ':new' tag from any new backends .desc files
 * commit
-* on cvs.alioth.debian.org, cvs update, ./configure, make the cvs checkout in
-  /org/alioth.debian.org/chroot/home/groups/sane/sane-backends-lists-cvs/
+* on alioth.debian.org, git pull, ./configure, make the git checkout in
+  /org/alioth.debian.org/chroot/home/groups/sane/sane-backends-lists-git/
 

doc/saned.man

@@ -68,7 +68,7 @@ is not intended to be exposed to the internet or other non-trusted
 networks. Make sure that access is limited by tcpwrappers and/or a firewall
 setup. Don't depend only on 
 .BR saned 's
-own authentification. Don't run
+own authentication. Don't run
 .B saned
 as root if it's not necessary. And do
 .B not

tools/sane-desc.c

@@ -3446,7 +3446,7 @@ print_udev (void)
 
   printf("# For Linux >= 2.6.22 without CONFIG_USB_DEVICE_CLASS=y\n"
 	 "# If the following rule does not exist on your system yet, uncomment it\n"
-	 "# ENV{DEVTYPE}==\"usb_device\", NAME=\"bus/usb/$env{BUSNUM}/$env{DEVNUM}\", "
+	 "# ENV{DEVTYPE}==\"usb_device\", "
 	 "MODE=\"0664\", OWNER=\"root\", GROUP=\"root\"\n"
 	 "\n");
 
@@ -3494,7 +3494,7 @@ print_udev (void)
   printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
   printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
   printf ("# Generic: SCSI device type 6 indicates a scanner\n");
-  printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
   printf ("# Some scanners advertise themselves as SCSI device type 3\n");
 
   while (scsiid)
@@ -3527,7 +3527,7 @@ print_udev (void)
 	    }
         }
       printf ("\n");
-      printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
+      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
 	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
       scsiid = scsiid->next;
     }