[Erc-commit] [commit][emacs22] Make extras tarball

[mwolson]

commit 8b8f8ac4de11887a25c69f02800950776d1f60bb
Author: Michael Olson <address@hidden>
Date:   Sun Apr 1 00:45:41 2007 +0000

    Make extras tarball
    
    2007-04-01  Michael Olson  <address@hidden>
    
        * erc.texi: Make Emacs Lisp source code in this document
        essentially public domain.
        (Obtaining ERC): Mention extras tarball.
        (Releases): Mention local GNU mirror.
        (Sample Configuration): Remove notice.
    
        * FOR-RELEASE (5.3): Add item for erc-nicklist.
        Mark NEWS as done.  Mark extras tarball as done.
    
        * Makefile (VERSION): Increment to 5.2.
        (TESTING): Remove.
        (EXTRAS): New variable containing the contents of our "Emacs 22
        extras" tarball.
        (SOURCE): Remove $(TESTING).
        (MISC): Add COPYING and ChangeLog.2006.
        (release): Use $(SNAPDIR) instead of erc-$(VERSION).
        (extras): New rule which implements the building of the extras
        tarball.
        (upload-extras): New rule to upload the extras tarball.  It's
        yucky to replicate upload, but oh well.
    
        * NEWS: Mention extras tarball.
    
        * README.extras: New file which serves as a README for the extras
        tarball.
    git-archimport-id: address@hidden/erc--main--0--patch-129

diff --git a/ChangeLog b/ChangeLog
index bc502af..46b1156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2007-04-01  Michael Olson  <address@hidden>
+
+       * erc.texi: Make Emacs Lisp source code in this document
+       essentially public domain.
+       (Obtaining ERC): Mention extras tarball.
+       (Releases): Mention local GNU mirror.
+       (Sample Configuration): Remove notice.
+
+       * FOR-RELEASE (5.3): Add item for erc-nicklist.
+       Mark NEWS as done.  Mark extras tarball as done.
+
+       * Makefile (VERSION): Increment to 5.2.
+       (TESTING): Remove.
+       (EXTRAS): New variable containing the contents of our "Emacs 22
+       extras" tarball.
+       (SOURCE): Remove $(TESTING).
+       (MISC): Add COPYING and ChangeLog.2006.
+       (release): Use $(SNAPDIR) instead of erc-$(VERSION).
+       (extras): New rule which implements the building of the extras
+       tarball.
+       (upload-extras): New rule to upload the extras tarball.  It's
+       yucky to replicate upload, but oh well.
+
+       * NEWS: Mention extras tarball.
+
+       * README.extras: New file which serves as a README for the extras
+       tarball.
+
 2007-03-31  Michael Olson  <address@hidden>
 
        * NEWS: Update for the 5.2 release.
diff --git a/FOR-RELEASE b/FOR-RELEASE
index 116b5bc..392d2e8 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -12,13 +12,15 @@ Tasks that need to be accomplished in order for a release 
to happen.
 This will hopefully increase the chance that it will be useful for
 other IRC clients, like Circe.
 
+*** Make erc-nicklist into a proper ERC module.
+
 * 5.2 release
 
 ** Documentation
 
 *** [DONE] Finish items marked with "@c PRE5_2" in the documentation.
 
-*** Update NEWS for changes since 5.1.4.
+*** [DONE] Update NEWS for changes since 5.1.4.
 
 ** Source
 
@@ -40,14 +42,18 @@ conflict with rcirc, for example.  Would setting 
`erc-track-mode-map'
 work?  Otherwise we could encourage people to use something like
 `C-c e SPC' or `C-c c'.
 
-**** Solution: We went with a global minor mode which does nothing
-but set the global-level C-c C-SPC and C-c C-@ keybindings.  It
-defaults to warning the user if one of their keybindings would be
-overridden, so this solution should be OK to install in Emacs.
+Solution: We went with a global minor mode which does nothing but set
+the global-level C-c C-SPC and C-c C-@ keybindings.  It defaults to
+warning the user if one of their keybindings would be overridden, so
+this solution should be OK to install in Emacs.
 
-*** Make a tarball with the modules that weren't included with
+*** [DONE] Make a tarball with the modules that weren't included with
 Emacs 22 that can be downloaded from GNU's ftp server.
 
+This is now available as "erc-5.2-extras.(tar.gz|zip)" at
+ftp.gnu.org/gnu/erc/.  It may be built with "make extras" and uploaded
+with "make upload-extras".
+
 * 5.1 release (old)
 
 ** [DONE] Documentation
diff --git a/Makefile b/Makefile
index 449ff29..dbd9ab6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
-VERSION=5.1.4
+VERSION=5.2
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.3-2
+LASTUPLOAD = 5.1.4-4
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
-UNCOMPILED = erc-chess.el erc-bbdb.el erc-ibuffer.el erc-speak.el \
+UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el erc-speak.el \
                erc-speedbar.el erc-compat.el
-TESTING = erc-members.el erc-macs.el
+
+# Files to include in the extras pack for Emacs 22
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-speak.el \
+                README.extras COPYING
+
 ALLSOURCE = $(wildcard *.el)
-SOURCE = $(filter-out $(SPECIAL) $(UNCOMPILED) $(TESTING),$(ALLSOURCE))
+SOURCE = $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
 TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
 MANUAL  = erc
-MISC   = AUTHORS CREDITS HISTORY NEWS README Makefile ChangeLog \
-               ChangeLog.2005 ChangeLog.2004 ChangeLog.2003 ChangeLog.2002 \
-               ChangeLog.2001 servers.pl erc-auto.in erc.texi
+MISC   = AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
+               ChangeLog.2006 ChangeLog.2005 ChangeLog.2004 \
+               ChangeLog.2003 ChangeLog.2002 ChangeLog.2001 \
+               servers.pl erc-auto.in erc.texi
 
 EMACS       = emacs
 SITEFLAG    = --no-site-file
@@ -133,14 +138,21 @@ debrevision:
 
 release: autoloads distclean
        mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
-       cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
-       cp -r images ../erc-$(VERSION)
+       cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../$(SNAPDIR)
+       cp -r images ../$(SNAPDIR)
        test -d ../$(SNAPDIR)/images/CVS && \
          rm -R ../$(SNAPDIR)/images/CVS || :
        test -d ../$(SNAPDIR)/images/.arch-ids && \
          rm -R ../$(SNAPDIR)/images/.arch-ids || :
-       (cd .. && tar czf erc-$(VERSION).tar.gz erc-$(VERSION)/*; \
-         zip -r erc-$(VERSION).zip erc-$(VERSION))
+       (cd .. && tar czf erc-$(VERSION).tar.gz $(SNAPDIR)/*; \
+         zip -r erc-$(VERSION).zip $(SNAPDIR))
+
+extras:
+       -rm -Rf ../$(SNAPDIR)-extras
+       mkdir ../$(SNAPDIR)-extras && chmod 0755 ../$(SNAPDIR)-extras
+       cp $(EXTRAS) ../$(SNAPDIR)-extras
+       (cd .. && tar czf erc-$(VERSION)-extras.tar.gz $(SNAPDIR)-extras/*; \
+         zip -r erc-$(VERSION)-extras.zip $(SNAPDIR)-extras)
 
 upload:
        (cd .. && gpg --detach erc-$(VERSION).tar.gz && \
@@ -156,3 +168,18 @@ upload:
          echo close >> upload.lftp ; \
          lftp -f upload.lftp ; \
          rm -f upload.lftp)
+
+upload-extras:
+       (cd .. && gpg --detach erc-$(VERSION)-extras.tar.gz && \
+         gpg --detach erc-$(VERSION)-extras.zip && \
+         echo "Directory: erc" | gpg --clearsign > \
+           erc-$(VERSION)-extras.tar.gz.directive.asc && \
+         cp erc-$(VERSION)-extras.tar.gz.directive.asc \
+           erc-$(VERSION)-extras.zip.directive.asc && \
+         echo open ftp://ftp-upload.gnu.org > upload.lftp ; \
+         echo cd /incoming/ftp >> upload.lftp ; \
+         echo mput erc-$(VERSION)-extras.zip* >> upload.lftp ; \
+         echo mput erc-$(VERSION)-extras.tar.gz* >> upload.lftp ; \
+         echo close >> upload.lftp ; \
+         lftp -f upload.lftp ; \
+         rm -f upload.lftp)
diff --git a/NEWS b/NEWS
index 318e81f..6cb6dc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
 
-* Changes in ERC 5.2 (unreleased)
+* Changes in ERC 5.2
 
 ** M-x erc RET now starts ERC.
 `erc-select' has been changed to `erc'.  `erc-select' still remains as
@@ -60,6 +60,13 @@ This makes it easier to find modules by name.
 
 ** erc-server-send-ping-interval: Change to use a default of 30 seconds.
 
+** Some files which are included with the release of ERC 5.2 will not
+appear in the version of ERC that is bundled with Emacs 22.  These
+extras files may be found at:
+
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+
 ** Header line changes
 
 *** Remove "[IRC]" from the header line.
diff --git a/README.extras b/README.extras
new file mode 100644
index 0000000..a610e46
--- /dev/null
+++ b/README.extras
@@ -0,0 +1,31 @@
+
+This is the README file for the ERC extras.
+
+ERC is a powerful, modular, and extensible IRC client for Emacs.
+
+About
+-----
+
+The files included here are those which could not be distributed with
+the version of ERC that comes with Emacs 22.  The reasons might include:
+
+ - No copyright disclaimer was completed for an author of the file.
+ - Depends on files which are not distibuted with Emacs.
+
+Installation
+------------
+
+There are several ways to tell Emacs where to find these files.  The
+easiest may perhaps be to copy them to "~/elisp/erc-extras", and then
+to add the line
+
+  (add-to-list 'load-path "~/elisp/erc-extras" t)
+
+to your ~/.emacs (or ~/.emacs/init.el) file.  Compiling them would be
+overkill.
+
+License information
+-------------------
+
+These extras for ERC are available under the terms of the GNU General
+Public License.  See the file `COPYING' for details.
diff --git a/erc.texi b/erc.texi
index ae5d85d..ae4ac8e 100644
--- a/erc.texi
+++ b/erc.texi
@@ -21,6 +21,9 @@ Permission is granted to copy, distribute and/or modify this 
document
 under the terms of the GNU Free Documentation License, Version 1.2 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, Front-Cover texts, or Back-Cover Texts.
+
+All Emacs Lisp code contained in this document may be used, distributed,
+and modified without restriction.
 @end quotation
 @end copying
 
@@ -120,8 +123,17 @@ It comes with the following capabilities enabled by 
default.
 * Development::                 Latest unreleased development changes.
 @end menu
 
-These sections may be skipped if you are using the version of ERC that
-comes with Emacs.
+Note that some ERC files are not included with Emacs due to copyright or
+dependency issues.  If desired, they may be found at the following
+locations, or from your local GNU mirror.
+
address@hidden @bullet
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip}
address@hidden itemize
+
+The rest of this chapter may be skipped if you are using the version of
+ERC that comes with Emacs.
 
 @node Releases, Development, Obtaining ERC, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -140,7 +152,7 @@ available in the official Debian repository.
 
 @cindex releases, from source
 Alternatively, you can download the latest release from
address@hidden://ftp.gnu.org/gnu/erc}.
address@hidden://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
 
 @node Development,  , Releases, Obtaining ERC
 @comment  node-name,  next,  previous,  up
@@ -811,9 +823,6 @@ your Emacs configuration file.  Everything after the 
@code{(require
 @lisp
 ;;; Sample ERC configuration
 
-;; The code in this section (Sample Configuration) may be used,
-;; distributed, and modified without restriction.
-
 ;; Add the ERC directory to load path -- you don't need this if you are
 ;; using the version of ERC that comes with Emacs
 (add-to-list 'load-path "~/elisp/erc")