[Erc-commit] [commit][emacs22] Merge from 5.1 release branch.

[mwolson]

commit 1c228e5c1a1a748c47d0cf5d9cb565fea809f047
Author: Michael Olson <address@hidden>
Date:   Tue Feb 14 06:42:11 2006 +0000

    Merge from 5.1 release branch.
    
    Patches applied:
    
     * address@hidden/erc--cvs--5.1--patch-13
       Bring NEWS up-to-date.
    
     * address@hidden/erc--cvs--5.1--patch-16
       Prepare a new Debian package.
    
     * address@hidden/erc--cvs--5.1--patch-17
       Never check in the erc-auto.el file.
    
     * address@hidden/erc--cvs--5.1--patch-19
       Tweak Makefile.
    
     * address@hidden/erc--cvs--5.1--patch-21
       Add note about side effect with saved logs.
    git-archimport-id: address@hidden/erc--cvs--0--patch-118

diff --git a/ChangeLog b/ChangeLog
index 427e81e..9ea9e6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-14  Michael Olson  <address@hidden>
+
+       * debian/changelog: Prepare a new Debian package.
+
+       * Makefile (debprepare): New rule that creates an ERC snapshot
+       directory for use in both new Debian releases and revisions for
+       Debian packages.
+       (debrelease, debrevision-mwolson): Use debprepare.
+
+       * NEWS: Bring up-to-date.
+
 2006-02-13  Michael Olson  <address@hidden>
 
        * erc-dcc.el: Use (eval-when-compile (require 'cl)).
diff --git a/Makefile b/Makefile
index fef2a64..d8e89c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION=5.1.1
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.1-1
+LASTUPLOAD = 5.1.1-2
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
@@ -80,7 +80,16 @@ distclean:
        -rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
        -rm -Rf ../$(SNAPDIR)
 
-debbuild: 
+debprepare: $(ALLSOURCE) $(SPECIAL) distclean
+       mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
+       cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
+       cp -r images ../$(SNAPDIR)
+       test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
+         ../$(SNAPDIR)/images/.arch-ids || :
+       test -d ../$(SNAPDIR)/images/CVS && rm -R \
+         ../$(SNAPDIR)/images/.arch-ids || :
+
+debbuild:
        (cd ../$(SNAPDIR) && \
          dpkg-buildpackage -v$(LASTUPLOAD) $(BUILDOPTS) \
            -us -uc -rfakeroot && \
@@ -89,14 +98,7 @@ debbuild:
          echo "Done running lintian." && \
          debsign)
 
-debrelease: $(ALLSOURCE) $(SPECIAL) distclean
-       mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-       cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
-       cp -r images ../$(SNAPDIR)
-       test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
-         ../$(SNAPDIR)/images/.arch-ids || :
-       test -d ../$(SNAPDIR)/images/CVS && rm -R \
-         ../$(SNAPDIR)/images/.arch-ids || :
+debrelease: debprepare
        (cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
        cp -R debian ../$(SNAPDIR)
        test -d ../$(SNAPDIR)/debian/CVS && rm -R \
@@ -113,7 +115,17 @@ debrevision-mwolson:
        -rm -f ../../dist/erc_*
        -rm -f ../erc_$(VERSION)-*
        -rm -fr ../erc-$(VERSION)
-       $(MAKE) debrelease
+       $(MAKE) debprepare
+       cp -R debian ../$(SNAPDIR)
+       test -d ../$(SNAPDIR)/debian/CVS && rm -R \
+         ../$(SNAPDIR)/debian/CVS \
+         ../$(SNAPDIR)/debian/maint/CVS \
+         ../$(SNAPDIR)/debian/scripts/CVS || :
+       test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
+         ../$(SNAPDIR)/debian/.arch-ids \
+         ../$(SNAPDIR)/debian/maint/.arch-ids \
+         ../$(SNAPDIR)/debian/scripts/.arch-ids || :
+       $(MAKE) debbuild
        cp ../erc_$(VERSION)* ../../dist
 
 debrelease-mwolson:
diff --git a/NEWS b/NEWS
index bf60399..d3a318e 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,38 @@ ERC NEWS                                                       
-*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
+** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
+
+** Changes and additions to modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Don't spell-check nicks or words that are prefixed with '/'.
+
+**** Remove flyspell properties from words we shouldn't spell-check.
+
+**** Fix an issue that caused the ispell process to reload every time
+we switch to an ERC buffer.
+
+*** Timestamps (erc-stamp.el)
+
+**** Fix an inconsistency in calculating width of right timestamps.
+
+**** Rename option `erc-timestamp-right-align-by-pixel' to
+`erc-timestamp-use-align-to'.  This controls whether to use the more
+fail-proof method of aligning right timestamps, as mentioned below.
+
+**** Fix a right timestamp spacing problem that used to occur when
+erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
+use the method that aligns right timestamps perfectly in Emacs22 with
+X.  If the current version of Emacs doesn't support this method, use
+the simpler method, which is prone to alignment issues for math
+symbols and other variable-width text.
+
+A side effect of using this new method is that there will only be one
+space before a right timestamp in any saved logs.  If this is
+unacceptable, set `erc-timestamp-use-align-to' to nil.
+
 * Changes in ERC 5.1.1
 
 ** Fix a requirement on cl.el.
diff --git a/debian/changelog b/debian/changelog
index f0454f2..1c828cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,24 @@
 erc (5.1.1-3) unstable; urgency=low
 
+  * erc.el: Go back to using ssl.el, since connecting with
+    `open-tls-stream' only seems to work with the version of tls.el in
+    Emacs22.
+  * erc-autojoin.el, erc-dcc.el: Fix compiler warnings.
+  * erc-stamp.el:
+    - Fix a consistency issue with right timestamps.
+    - Rename option `erc-timestamp-right-align-by-pixel' to
+      `erc-timestamp-use-align-to'.
+    - Use a more fail-proof method of aligning right timestamps, if the
+      current version of Emacs supports it.  Previously, a bug was
+      triggered when erc-stamp.el was byte-compiled.  This has been
+      fixed, making this method safe to use.
   * debian/rules (configure, configure-stamp, build, build-stamp):
     Generate HTML and Info documentation.
     (binary-erc): Install HTML and Info documentation.
   * debian/maint/postinst: Install the Info documentation.
   * debian/maint/prerm: Handle removing of Info documentation.
 
- --
+ -- Michael W. Olson (GNU address) <address@hidden>  Tue, 14 Feb 2006 00:55:54 
-0500
 
 erc (5.1.1-2) unstable; urgency=low