merge trunk

1 files changed, 17 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41492031d82..720b9595569 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,23 @@
         * language/hebrew.el: Exclude U+05C3 (Hebrew SOF PASUQ) from the
         composable pattern.
 
+2010-08-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-version-split)
+        (package--version-first-nonzero, package-version-compare):
+        Functions removed.
+        (package-directory-list, package-load-all-descriptors)
+        (package--built-in, package-activate, define-package)
+        (package-installed-p, package-compute-transaction)
+        (package-read-all-archive-contents)
+        (package--add-to-archive-contents, package-buffer-info)
+        (package-tar-file-info, package-list-packages-internal): Use
+        version-to-list and version-list-*.
+
+        * emacs-lisp/package-x.el (package-upload-buffer-internal): Use
+        version-to-list.
+        (package-upload-buffer-internal): Use version-list-<=.
+
 2010-08-09  Kenichi Handa  <handa@m17n.org>
 
         * language/hebrew.el: Exclude U+05BD (Hebrew MAQAF) from the