[Erc-commit] [commit][emacs22] Merged from erc--rel--5.2

[mwolson]

commit f336373d97d8ad8439c3d5111672879151dd17ea
Merge: 94c171a... 3d13c20...
Author: Michael Olson <address@hidden>
Date:   Mon May 21 01:05:22 2007 +0000

    Merged from erc--rel--5.2
    
    Patches applied:
    
     * address@hidden/erc--rel--5.2--patch-19
       Make an ELPA package for ERC
    
     * address@hidden/erc--rel--5.2--patch-20
       Makefile: Improve Debian package building
    
     * address@hidden/erc--rel--5.2--patch-21
       erc-nicklist: Use locate-library to find images dir
    
     * address@hidden/erc--rel--5.2--patch-22
       Include erc-nicklist.el and images in extras tarball
    git-archimport-id: address@hidden/erc--main--0--patch-144

diff --cc ChangeLog
index efe62c4,ef243df..514a73b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,41 -1,27 +1,65 @@@
+ 2007-05-21  Michael Olson  <address@hidden>
+ 
+       * Makefile (SOURCE): Remove erc-pkg.el.
+       (debclean): New rule to clean old Debian packages of ERC.
+       (debprepare): Don't modify the released tarball, but copy it as
+       the .orig.tar.gz file.
+       (debrelease. debrevision): Remove.
+       (debinstall): New target that copies the generated Debian file to
+       a distro-specific location.
+       (deb): New rule that chains together the stages in building a
+       Debian package.
+       (EXTRAS): Add erc-nicklist.el, since it is not release-quality.
+       (extras): Copy images directory.
+ 
+       * erc-nicklist.el (erc-nicklist-icons-directory): Use
+       locate-library to find the "images" directory.  This should be
+       more failsafe.  Thanks to Tom Tromey for the idea.
+ 
+ 2007-05-19  Michael Olson  <address@hidden>
+ 
+       * Makefile (ELPA): New variable that contains the location of my
+       local ELPA repository.
+       (elpa): New rule that makes an ELPA package for ERC.
+ 
 +2007-04-19  Michael Olson  <address@hidden>
 +
 +      * erc.el (erc-parse-prefix): New function that retrieves the
 +      PREFIX server parameter from the current server and returns an
 +      alist of prefix type to prefix character.
 +      (erc-channel-receive-names): Use `erc-parse-prefix' to determine
 +      whether the first character of a nick is a prefix character or
 +      not.  This should fix a bug reported by bromine about needing to
 +      type "%" first to complete nicks of people who are "hops" on
 +      Slashnet.  This should also support for very exotic IRC server
 +      setups, if any exist.
 +      (erc-update-current-channel-member): Indentation.
 +
 +2007-04-15  Michael Olson  <address@hidden>
 +
 +      * erc-log.el (erc-generate-log-file-name-function): Docfix.
 +      Mention how to deal with the case for putting log files in
 +      different directories.  Change a customization type from `symbol'
 +      to `function'.
 +      (erc-log-channels-directory): Allow this to contain a function
 +      name, which is called with the same args as in
 +      `erc-generate-log-file-name-function'.  Thanks to andrewy for the
 +      report and use case.
 +      (erc-current-logfile): Detect if `erc-log-channels-directory' is a
 +      function and call it with arguments if so.
 +
 +2007-04-12  Michael Olson  <address@hidden>
 +
 +      * erc-backend.el (define-erc-response-handler): Mention that hook
 +      processing stops when the function returns non-nil.  This should
 +      help avoid a nasty "gotcha" when making custom functions.  Thanks
 +      to John Sullivan for the report.
 +
 +2007-04-08  Diane Murray  <address@hidden>
 +
 +      * erc-nicklist.el (erc-nicklist-voiced-position): Fixed
 +      customization mismatch.
 +
  2007-04-01  Michael Olson  <address@hidden>
  
        * erc.el (erc-version-string): Release ERC 5.2.