* gnus.el (gnus-version-number): Update to 6.10.9.

* Makefile.in (all, total): Remove "auto-autoloads.el" and "custom-load.el"
as well.
* dgnushack.el (dgnushack-install-package): Remove extra files in destination
lisp directory.
(dgnushack-make-package): Don't generate "_pkg.el" file; don't remove
"auto-autoloads.el*" files.
(dgnushack-compile): Don't remove "_pkg.el" from the list.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 8d6b803..8d1e384 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -14,10 +14,12 @@ VPATH = @srcdir@
 PACKAGEDIR =
 
 total:
-       rm -f *.elc ; $(EMACS) $(FLAGS) -f dgnushack-compile
+       rm -f *.elc auto-autoloads.el custom-load.el ; \
+       $(EMACS) $(FLAGS) -f dgnushack-compile
 
 all:
-       rm -f *.elc ; $(EMACS) $(FLAGS) -f dgnushack-compile
+       rm -f *.elc auto-autoloads.el custom-load.el ; \
+       $(EMACS) $(FLAGS) -f dgnushack-compile
 
 warn:
        rm -f *.elc ; $(EMACS) $(FLAGS) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index ca9005d..11a7fa9 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -2,6 +2,7 @@
 ;; Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;     Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Version: 4.19
 ;; Keywords: news, path
 
@@ -61,7 +62,7 @@ You also then need to add the following to the lisp/dgnushack.el file:
      (push \"~/lisp/custom\" load-path)
 
 Modify to suit your needs."))
-  (let ((files (delete "_pkg.el" (directory-files "." nil "^[^=].*\\.el$")))
+  (let ((files (directory-files "." nil "^[^=].*\\.el$"))
        (xemacs (string-match "XEmacs" emacs-version))
        ;;(byte-compile-generate-call-tree t)
        file elc)
@@ -99,32 +100,10 @@ Modify to suit your needs."))
   "^\\(gnus\\|message\\|gnus-ja\\|message-ja\\)\\(-[0-9]+\\)?$")
 
 (defun dgnushack-make-package ()
-  (mapcar
-   (lambda (file)
-     (condition-case nil
-        (delete-file file)
-       (error nil)))
-   '("auto-autoloads.el" "auto-autoloads.elc"))
-
   (require 'gnus)
-  (let ((version
-        (split-string
-         (if (boundp 'gnus-revision-number)
-             (concat gnus-version-number "." gnus-revision-number)
-           gnus-version-number)
-         "\\."))
-       (product-name (downcase gnus-product-name))
-       lisp-dir make-backup-files)
-    (setq version (apply 'concat (car version) "." (cdr version))
-         lisp-dir (concat "lisp/" product-name "/"))
-
-    (with-temp-buffer
-      (insert ";;;###autoload
-\(package-provide '" product-name "
-                :version " version "
-                :type 'regular)
-")
-      (write-file "_pkg.el"))
+  (let* ((product-name (downcase gnus-product-name))
+        (lisp-dir (concat "lisp/" product-name "/"))
+        make-backup-files)
 
     (message "Updating autoloads for directory %s..." default-directory)
     (let ((generated-autoload-file "auto-autoloads.el")
@@ -166,7 +145,7 @@ Modify to suit your needs."))
                             (car package-path)))))
         (info-dir (expand-file-name "info/" package-dir))
         (pkginfo-dir (expand-file-name "pkginfo/" package-dir))
-        product-name lisp-dir manifest)
+        product-name lisp-dir manifest files)
     (require 'gnus)
     (setq product-name (downcase gnus-product-name)
          lisp-dir (expand-file-name (concat "lisp/" product-name "/")
@@ -180,11 +159,21 @@ Modify to suit your needs."))
     (unless (file-directory-p pkginfo-dir)
       (make-directory pkginfo-dir))
 
+    (setq files (sort (directory-files "." nil "\\.elc?$") 'string-lessp))
+    (mapcar
+     (lambda (file)
+       (unless (member file files)
+        (setq file (expand-file-name file lisp-dir))
+        (message "Removing %s..." file)
+        (condition-case nil
+            (delete-file file)
+          (error nil))))
+     (directory-files lisp-dir nil nil nil t))
     (mapcar
      (lambda (file)
        (message "Copying %s to %s..." file lisp-dir)
        (copy-file file (expand-file-name file lisp-dir) t t))
-     (sort (directory-files "." nil "\\.elc?$") 'string-lessp))
+     files)
 
     (mapcar
      (lambda (file)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 5e6e199..71b3145 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -253,7 +253,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-product-name "Semi-gnus"
   "Product name of this version of gnus.")
 
-(defconst gnus-version-number "6.10.8"
+(defconst gnus-version-number "6.10.9"
   "Version number for this version of gnus.")
 
 (defconst gnus-version