[Erc-commit] [commit][emacs22] Merged from

[mwolson]

commit d172b23b49e57d3259c6bfbd664b687c4a58a91a
Author: Michael Olson <address@hidden>
Date:   Wed Jul 12 21:05:57 2006 +0000

    Merged from
    
    Patches applied:
    
     * address@hidden/erc--rel--5.1--patch-27
       Move Debian files into their own branch.
    
     * address@hidden/erc--rel--5.1--patch-28
       Makefile: Simplify debian targets.
    git-archimport-id: address@hidden/erc--main--0--patch-21

diff --git a/ChangeLog b/ChangeLog
index 703452f..749906c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-12  Michael Olson  <address@hidden>
+
+       * Makefile (debrelease-mwolson): Remove and consolidate with the
+       `debrelease' target.
+       (debrevision): Rename from `debrevision-mwolson'.
+
 2006-07-09  Michael Olson  <address@hidden>
 
        * erc.el (erc-version-string): Release ERC 5.1.3.
diff --git a/Makefile b/Makefile
index 8214633..62da9c8 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,8 @@ debbuild:
          debsign)
 
 debrelease: debprepare
+       -rm -f ../../dist/erc_*
+       -rm -f ../erc_$(VERSION)*
        (cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
        cp -R debian ../$(SNAPDIR)
        test -d ../$(SNAPDIR)/debian/CVS && rm -R \
@@ -110,8 +112,9 @@ debrelease: debprepare
          ../$(SNAPDIR)/debian/maint/.arch-ids \
          ../$(SNAPDIR)/debian/scripts/.arch-ids || :
        $(MAKE) debbuild
+       cp ../erc_$(VERSION)* ../../dist
 
-debrevision-mwolson:
+debrevision:
        -rm -f ../../dist/erc_*
        -rm -f ../erc_$(VERSION)-*
        -rm -fr ../erc-$(VERSION)
@@ -128,12 +131,6 @@ debrevision-mwolson:
        $(MAKE) debbuild
        cp ../erc_$(VERSION)* ../../dist
 
-debrelease-mwolson:
-       -rm -f ../../dist/erc_*
-       -rm -f ../erc_$(VERSION)*
-       $(MAKE) debrelease
-       cp ../erc_$(VERSION)* ../../dist
-
 release: autoloads distclean
        mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
        cp $(SPECIAL) $(UNCOMPILED) $(SOURCE) $(MISC) ../erc-$(VERSION)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index a25d940..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,21 +0,0 @@
-General notes:
---------------
-
-As of ERC 5.0.3, this package should install properly with versions of
-Emacs or XEmacs that do not have the `format-spec.el' library.
-
- -- Michael W. Olson (GNU address) <address@hidden>, Wed Jun  1 20:20:42 2005
-
-ERC includes support for many third-party packages which are not part
-of Emacs, nor are packaged for Debian (yet). However, stripping them
-out from the Debian package would be a great loss for those who happen
-to have those Emacs packages.
-
-So all add-on modules which depend on libraries not (yet) packaged for
-debian are kept in /usr/share/emacs/site-lisp/erc in source form.
-
-You can still (require 'erc-<package>), and it will still work; it
-only uses the source to load the module, and not the byte-compiled
-.elc files.
-
- -- Michael W. Olson (GNU address) <address@hidden>, Sun Mar 20 00:57:16 2005
diff --git a/debian/README.erc-speak b/debian/README.erc-speak
deleted file mode 100644
index 022b8b3..0000000
--- a/debian/README.erc-speak
+++ /dev/null
@@ -1,8 +0,0 @@
-Notes for the erc-speak package
-===============================
-
-If you don't have the necessary hardware synthesiser to make Emacspeak
-work, you can install the `espeakf' (from sourceforge), or get IBM's
-ViaVoice (which sounds better, but is binary-only). Instructions for
-the latter are at
-    http://www.emacswiki.org/cgi-bin/wiki.pl?EmacSpeak
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index ad71b84..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,377 +0,0 @@
-erc (5.1.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Sun, 19 Feb 2006 23:34:25 
-0500
-
-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
-
-  * debian/control: Add Build-Depends-Indep on texinfo and texi2html,
-    thanks to Andreas Jochens (closes: #351772).
-
- -- Romain Francoise <address@hidden>  Wed,  8 Feb 2006 08:31:46 +0100
-
-erc (5.1.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * 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.
-  * Bug fix: "erc: Recommends: emacs-chess", thanks to era eriksson
-    (Closes: #350994).
-  * Bug fix: "erc-fill-column should always be equal to the current window
-    width", thanks to Cyril Bouthors (Closes: #221223).  The desired
-    behavior can be obtained by setting both `erc-fill-column' and
-    `fill-column' to nil.
-  * debian/rules (build, binary-erc): Build and install HTML
-    documentation.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Sun,  5 Feb 2006 01:26:56 
-0500
-
-erc (5.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control (Description): Update.
-  * debian/rules (binary-erc): Concatenate ChangeLog for 2005.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Fri, 27 Jan 2006 23:42:23 
-0500
-
-erc (5.0.4-3) unstable; urgency=low
-
-  * Attempt to ensure that the full set of changes is generated.
-    Thanks to Romain Francoise for the advice.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Tue,  9 Aug 2005 18:23:09 
-0500
-
-erc (5.0.4-2) unstable; urgency=low
-
-  * Makefile: Use debuild.
-  * debian/control:
-    - Update Standards-Version to 3.6.2.
-    - Add emacsen to Depends.
-    - Add Romain Francoise to Uploaders.
-  * debian/scripts/startup.erc: Minor whitespace fixup.
-  * erc.el: Fix make-variable-buffer-local compiler warning.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Mon,  8 Aug 2005 14:35:02 
-0500
-
-erc (5.0.4-1) unstable; urgency=low
-
-  * New upstream release: Fix regression from 5.0.2 with the undo feature.
-  * debian/control: Make myself the maintainer.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Tue, 12 Jul 2005 18:12:11 
-0500
-
-erc (5.0.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bug fix: "erc: fails to load when using erc-autoaway [PATCH]", thanks
-    to Daniel Brockman (Closes: #306179).
-  * Bug fix: "erc 5.0 is out", thanks to Cai Qian (Closes: #301952).
-  * Bug fix: "erc: cannot connect to Undernet", thanks to Frederic Roussel
-    (Closes: #282003).
-  * Bug fix: "erc: erc-nickserv fails everything when server name contains
-    digits", thanks to Pietro Giorgianni (Closes: #266347).
-  * Bug fix: "erc: README file missing", thanks to Milan Zamazal 
-    (Closes: #312195).
-  * The functionality of format-spec.el is provided in erc-compat.el, so
-    we no longer need to bundle it.
-
- -- Michael W. Olson (GNU address) <address@hidden>  Fri, 24 Jun 2005 15:17:18 
-0500
-
-erc (5.0.2-1) unstable; urgency=low
-
-  * Michael W. Olson <address@hidden>:
-    * New upstream release.
-    * Bug fix: "erc will not install at same time as emacs21", thanks to
-      Ryan Senior (Closes: #267511).
-    * debian/README.Debian: Moved news entries to newly-created NEWS.gz
-      file.
-    * debian/copyright: Adjust for copyright assignment that occurred after
-      5.0.2 release.
-    * format-spec.el: Added to make erc compile properly on emacs21.  Some
-      upstream fix will be made in the future.
-
- -- Mario Lang <address@hidden>  Mon, 18 Apr 2005 19:13:02 +0200
-
-erc (4.0.cvs.20041118-1) unstable; urgency=low
-
-  * New CVS snapshot:
-    - Fixed "`emacs-mule' coding system doesn't exist on xemacs"
-      (Closes: Bug#223415).
-    - Fixed "missing provide in erc-sound.el" (Closes: #228511).
-    - Fix the `debrelease' target to correctly set dir modes (Closes: #262495).
-
- -- Mario Lang <address@hidden>  Thu, 18 Nov 2004 17:44:25 +0100
-
-erc (4.0.cvs.20031027-1) unstable; urgency=low
-
-  * New CVS snapshot:
-    - Only disable erc-specific advices for `switch-to-buffer'.
-      (Closes: Bug#217022)
-
- -- Mario Lang <address@hidden>  Mon, 27 Oct 2003 10:11:03 +0100
-
-erc (4.0.cvs.20031008-1) unstable; urgency=low
-
-  * New CVS snapshot.
-
- -- Mario Lang <address@hidden>  Wed,  8 Oct 2003 20:55:09 +0200
-
-erc (4.0.cvs.20030913-2) unstable; urgency=low
-
-  * Fixed the building process in respect to generated diff.gz
-
- -- Mario Lang <address@hidden>  Sat, 13 Sep 2003 23:30:14 +0200
-
-erc (4.0.cvs.20030913-1) unstable; urgency=low
-
-  * New CVS snapshot.
-  * We are now constantly pinging the server.  Combined with the fact
-    that the autojoin module is now loaded by default, this should
-    (Closes: Bug#177371)
-  * Use load instead of require (Closes: Bug#210685)
-  * Last upload also fixed the customize bug, just forgot to close it
-    (Closes: Bug#185794)
-
- -- Mario Lang <address@hidden>  Sat, 13 Sep 2003 23:06:18 +0200
-
-erc (4.0.cvs.20030910-1) unstable; urgency=low
-
-  * New CVS snapshot.
-
- -- Mario Lang <address@hidden>  Wed, 10 Sep 2003 19:53:46 +0200
-
-erc (3.0.cvs.20030119-1) unstable; urgency=low
-
-  * New CVS snapshot release.
-  * Do warn and prevent install for emacs20 (Closes: Bug#173464)
-  * No longer call (erc-completion-mode 1) in startup file
-    (Closes: Bug#173934)
-  * Cleanup workarea (Closes: Bug#177441)
-
- -- Mario Lang <address@hidden>  Sun, 19 Jan 2002 13:10:10 +0100  
-
-erc (3.0.cvs.20021208-1) unstable; urgency=low
-
-  * New CVS snapshot release.
-  * Added (erc-completion-mode 1) to startup file.
-  * Dropped emacs20 compatibility.
-
- -- Mario Lang <address@hidden>  Sun,  8 Dec 2002 16:10:11 +0100
- 
-erc (2.93.cvs.20021116-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-11-16.
-  * Allow for coninous logging.
-    Put (erc-save-buffer-in-logs) on `erc-insert-post-hook' to get this
-    behaviour.
-    (Closes: Bug#133267)
-  * Lot of changes (Closes: Bug#155063), see README.Debian for details.
-  * Redo the package generationg strategy to avoid producing a
-    debian native package (make debrelease).
-
- -- Mario Lang <address@hidden>  Sat, 16 Nov 2002 20:10:00 +0100
-
-erc (2.93.cvs.20020819-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-08-19.
-  * Fix load-path (silly!)
-
- -- Mario Lang <address@hidden>  Tue, 19 Aug 2002 10:33:00 +0100
-
-erc (2.93.cvs.20020814-1) unstable; urgency=low
-
-  * New maintainer (Closes: Bug#154636)
-  * New CVS snapshot release on 2002-08-14.
-  * Do not byte-compile errc-bbdb|chess|ibuffer|speedbar.el
-
- -- Mario Lang <address@hidden>  Tue, 13 Aug 2002 15:33:21 +0100
-
-erc (2.93.cvs.20020708-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-07-08.
-  * Do not byte-compile erc-track.el for xemacs (Closes: #149351)
-  * Do not byte-compile erc-speak.el at all (Closes: #152043)
-  * Rewrote debian/scripts/install in make
-
- -- Gergely Nagy <address@hidden>  Mon,  8 Jul 2002 14:03:22 +0200
-
-erc (2.91.cvs.20020404-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-04-04.
-    + Fixes for some XEmacs showstoppers
-    + Fixed a bug in /query handling
-    + Support for joining key protected channels
-  * Documented the warnings at install-time (Closes: #139534)
-
- -- Gergely Nagy <address@hidden>  Thu,  4 Apr 2002 23:21:05 +0200
-
-erc (2.91.cvs.20020306-1) unstable; urgency=low
-
-  * New CVS snaphost release on 2002-03-06.
-
- -- Gergely Nagy <address@hidden>  Wed,  6 Mar 2002 22:50:49 +0100
-
-erc (2.91.cvs.20020216-1) unstable; urgency=low
-
-  * New CVS snapshot release on 2002-02-16:
-    + Multiline input works now (C-q C-j to insert a newline)
-    + Completely new insert-hook system (see erc-insert-pre-hook and
-    erc-send-pre-hook and the-like.
-    + Many small bugfixes.
-
-  * Due to the new insert-hook system, erc-insert-hook doesn't work
-    anymore. Don't forget to update your ~/.emacs.
-
- -- Gergely Nagy <address@hidden>  Sat, 16 Feb 2002 23:45:23 +0100
-
-erc (2.1.cvs.20011215-1) unstable; urgency=high
-
-  * New CVS snapshot release on 2001-12-15:
-    + Support for saving (and optionally killing) a buffer on part
-    + New file: erc-replace.el, for washing and massaging messages
-
-  * Added format-spec.el (from the tramp package), as a workaround for
-    #123236. This closes: #123236.
-
-  * Urgency high, because without the above fix, erc is uninstallable on
-    emacs20 without either gnus or tramp.
-
- -- Gergely Nagy <address@hidden>  Sat, 15 Dec 2001 14:10:42 +0100
-
-erc (2.1.cvs.20011208-1) unstable; urgency=medium
-
-  * New CVS snapshot release on 2001-12-08:
-    + erc-track-modified-channels-minor-mode disabled on emacs20, to work
-    around Bug#122748 (Closes: #122748)
-    + A set of filling related bugfixes
-
-  * Urgency medium, becuase of #122748
-
- -- Gergely Nagy <address@hidden>  Sat,  8 Dec 2001 00:48:30 +0100
-
-erc (2.1.cvs.20011206-1) unstable; urgency=medium
-
-  * New CVS snapshot release on 2001-12-06:
-    + New filling strategy
-    + Channel-tracking rewritten as a minor-mode
-    + Fixed a longstanding bug, which surfaced under XEmacs
-
-  * Urgency medium, because of the XEmacs related fix
-
- -- Gergely Nagy <address@hidden>  Thu,  6 Dec 2001 17:20:40 +0100
-
-erc (2.1.cvs.20011129-1) unstable; urgency=medium
-
-  * New CVS snapshot release on 2001-11-29:
-
-  * New buffer naming scheme, buffers now have names like #emacs and
-    #emacs<2> instead of address@hidden You can freely rename
-    them now, without breaking anything.
-  * New customizable mode-line and header-line support.
-    Look at erc-mode-line-format, erc-header-line-format and
-    erc-prepare-mode-line-format
-    + Now you get the announced server name in the modeline.
-  * Completely new server message parsing, mimicking zenirc's
-    ...server-*-hooks
-    + See defgroup erc-server-hooks 
-  * Split up in several files.
-    + erc-complete, for TAB completion
-    + erc-ring, for command history
-    + erc-fill, for filling IRC messages
-    + erc-bbdb, integrating BBDB into ERC
-    + erc-speedbar, for using the speedbar with ERC
-  * Dropped the erc-speak package, everything is in erc proper now
-  * And many, many more...
-
-  * Please note that due to the new server message parsing, erc-join-hook,
-    erc-part-hook, and possible some other hooks got removed, check your
-    ~/.emacs.
-
-  * Urgency medium, because it would be really unfortunate to have the
-    older erc in woody..
-  
- -- Gergely Nagy <address@hidden>  Thu, 29 Nov 2001 13:43:22 +0100
-
-erc (2.1.cvs.20011025-4) unstable; urgency=low
-
-  * erc.el: (require 'cl), to reflect reality
-
- -- Gergely Nagy <address@hidden>  Tue,  6 Nov 2001 18:34:19 +0100
-
-erc (2.1.cvs.20011025-3) unstable; urgency=low
-
-  * debian/scripts/install.in: move #PKGFLAG# before the -f
-    batch-byte-compile option, so erc-speak can be configured
-    successfully.
-
- -- Gergely Nagy <address@hidden>  Wed, 31 Oct 2001 19:14:59 +0100
-
-erc (2.1.cvs.20011025-2) unstable; urgency=low
-
-  * Okay. Where's that rock?
-  * Rebuilt with a working fakeroot setup this time.
-
- -- Gergely Nagy <address@hidden>  Sat, 27 Oct 2001 01:04:57 +0200
-
-erc (2.1.cvs.20011025-1) unstable; urgency=low
-
-  * CVS snapshot release on 2001-10-25
-  * debian/control: New package: erc-speak
-  * debian/maint/{postinst,prerm,conffiles}: replaced with .in files
-  * debian/scripts/{install,remove}: likewise
-  * debian/scripts/startup: superceded by package-specific startup files
-  * debian/README.erc-speak: new file
-  * debian/rules: reworked to build erc-speak too
-
- -- Gergely Nagy <address@hidden>  Thu, 25 Oct 2001 13:00:07 +0200
-
-erc (2.1.cvs.1.73-1) unstable; urgency=low
-
-  * CVS snapshot release, erc.el revision 1.73
-       + supports auto-query
-       + smiley support
-       + lots of other features and fixes
-  * debian/scripts/startup: added two functions to autoload
-  * various cleanups in maintainer scripts and debian/rules
-
- -- Gergely Nagy <address@hidden>  Sun, 21 Oct 2001 17:42:26 +0200
-
-erc (2.1.cvs.1.56-1) unstable; urgency=low
-
-  * CVS snapshot release, erc.el revision 1.56
-    + fixes to nick completion, among other things
-  * Default to `ircd' port instead of `irc' (Closes: #114349)
-
- -- Gergely Nagy <address@hidden>  Thu,  4 Oct 2001 19:16:19 +0200
-
-erc (2.1-1) unstable; urgency=low
-
-  * Initial release (Closes: #113192)
-
- -- Gergely Nagy <address@hidden>  Sun, 23 Sep 2001 14:58:31 +0200
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 426291b..0000000
--- a/debian/control
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: erc
-Section: net
-Priority: optional
-Maintainer: Michael W. Olson (GNU address) <address@hidden>
-Uploaders: Mario Lang <address@hidden>, Romain Francoise <address@hidden>
-Build-Depends-Indep: texinfo, texi2html
-Standards-Version: 3.6.2
-
-Package: erc
-Architecture: all
-Depends: make, emacs21 | xemacs21 | emacsen
-Suggests: speedbar, bbdb, emacspeak, emacs-chess
-Replaces: erc-speak
-Conflicts: erc-speak
-Description: an IRC client for Emacs
- ERC is a powerful, modular, and extensible IRC client for Emacs.
- It supports multiple channel-buffers, nick completion, keyword
- highlighting, and more.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index d7de7d1..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,50 +0,0 @@
-This package was debianized by Gergely Nagy <address@hidden>
-
-It was downloaded from
-   http://sourceforge.net/projects/erc/
-
-Upstream Authors: Alexander L. Belikoff (address@hidden),
-                 Sergey Berezin (address@hidden),
-                 Mario Lang (address@hidden),
-                 Alex Schroeder (address@hidden),
-                 Gergely Nagy (address@hidden),
-                 Andreas Fuchs (address@hidden),
-                 Tijs van Bakel (address@hidden),
-                 Brian P Templeton (address@hidden),
-                 John Wiegley (address@hidden),
-                 Diane Murray (address@hidden),
-                 Benjamin Drieu (address@hidden),
-                 Jorgen Schaefer (address@hidden),
-                 Francis Litterio (address@hidden),
-                 Damien Elmes (address@hidden),
-                 Lawrence Mitchell (address@hidden),
-                 Sandra Jean Chua (address@hidden),
-                 Jeremy Bertram Maitin-Shepard (address@hidden),
-                 Johan Bockgard (address@hidden),
-                 Edward O'Connor (address@hidden),
-                 Brian Palmer (address@hidden),
-                 Adrian Aichner (address@hidden),
-                 Michael Olson (address@hidden)
-
-Copyright:
-
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-     2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-   Copyright (C) 2004 Brian Palmer
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; version 2 dated June, 1991.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA  02110-1301  USA
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/maint/conffiles b/debian/maint/conffiles
deleted file mode 100644
index 91af3c7..0000000
--- a/debian/maint/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/emacs/site-start.d/50erc.el
diff --git a/debian/maint/postinst b/debian/maint/postinst
deleted file mode 100644
index a0dde2b..0000000
--- a/debian/maint/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$1" = "configure" ] && \
-   [ -x /usr/lib/emacsen-common/emacs-package-install ]; then
-    /usr/lib/emacsen-common/emacs-package-install erc
-fi
-
-if [ "$1" = "configure" ]; then
-    install-info --quiet --section "Emacs" "emacs" /usr/share/info/erc.info
-fi
diff --git a/debian/maint/prerm b/debian/maint/prerm
deleted file mode 100644
index 45e0376..0000000
--- a/debian/maint/prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ -x /usr/lib/emacsen-common/emacs-package-remove ] ; then
-    /usr/lib/emacsen-common/emacs-package-remove erc
-fi
-
-if [ "$1" = remove ] || [ "$1" = upgrade ]; then
-       install-info --quiet --remove /usr/share/info/erc.info
-fi
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index f8e8c9b..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,90 +0,0 @@
-#! /usr/bin/make -f
-## Written by Gergely Nagy <address@hidden>
-## This is under GPL v2.
-
-PACKAGE                = erc
-PKGDIR         = debian/${PACKAGE}
-SOURCES                = $(wildcard *.el)
-DOCDIR         = /usr/share/doc/${PACKAGE}
-INFODIR                = /usr/share/info
-LISPDIR                = /usr/share/emacs/site-lisp/erc
-
-configure: configure-stamp
-configure-stamp:
-       touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-       makeinfo erc.texi
-       texi2html erc.texi
-       touch build-stamp
-
-clean: 
-       test -e debian/control 
-       rm -rf debian/erc debian/files
-
-install: build
-       test -e debian/control
-       install -d ${PKGDIR}${LISPDIR} ${PKGDIR}/etc/emacs/site-start.d
-       install -m 0644 ${SOURCES} ${PKGDIR}${LISPDIR}
-
-binary-erc: install
-       test -e debian/control && test "x`whoami`" = "xroot"
-## Install debian-specific stuff
-# Some directories
-       install -d ${PKGDIR}${DOCDIR} \
-               ${PKGDIR}/usr/lib/emacsen-common/packages/install \
-               ${PKGDIR}/usr/lib/emacsen-common/packages/remove
-# The changelog..
-       install -m 0644 debian/changelog ${PKGDIR}${DOCDIR}/changelog.Debian
-       install -m 0644 ChangeLog ${PKGDIR}${DOCDIR}/changelog
-       cat ChangeLog.2005 >> ${PKGDIR}${DOCDIR}/changelog
-       cat ChangeLog.2004 >> ${PKGDIR}${DOCDIR}/changelog
-       cat ChangeLog.2003 >> ${PKGDIR}${DOCDIR}/changelog
-       cat ChangeLog.2002 >> ${PKGDIR}${DOCDIR}/changelog
-       cat ChangeLog.2001 >> ${PKGDIR}${DOCDIR}/changelog
-# ..the copyright file..
-       install -m 0644 debian/copyright ${PKGDIR}${DOCDIR}/
-# ..some documentation
-       install -m 0644 CREDITS HISTORY NEWS erc.html ${PKGDIR}${DOCDIR}/
-       install -d ${PKGDIR}${INFODIR}
-       install -m 0644 erc.info ${PKGDIR}${INFODIR}/erc.info
-# the emacs-install scripts
-       install -m 0755 debian/scripts/install \
-               ${PKGDIR}/usr/lib/emacsen-common/packages/install/${PACKAGE}
-       install -m 0755 debian/scripts/remove \
-               ${PKGDIR}/usr/lib/emacsen-common/packages/remove/${PACKAGE}
-# Install an autoload script
-       install -m 0644 debian/scripts/startup.${PACKAGE} \
-               ${PKGDIR}/etc/emacs/site-start.d/50${PACKAGE}.el
-## Compress stuff
-       gzip -9f ${PKGDIR}${DOCDIR}/changelog.Debian \
-                ${PKGDIR}${DOCDIR}/changelog \
-                ${PKGDIR}${DOCDIR}/NEWS
-## Fix permissions
-       find ${PKGDIR} -print0 2>/dev/null | xargs -0r chown \
-                                                  --no-dereference 0.0
-       find ${PKGDIR} ! -type l -print 0 2>/dev/null | xargs -0r \
-               chmod go=rX,u+rw,a-s
-## Install stuff to DEBIAN/
-       install -d ${PKGDIR}/DEBIAN
-       install -m 0755 debian/maint/postinst debian/maint/prerm \
-               ${PKGDIR}/DEBIAN/
-# Install conffile list
-       install -m 0644 debian/maint/conffiles ${PKGDIR}/DEBIAN/conffiles
-## Install READMEs
-       install -m 0644 debian/README.erc-speak debian/README.Debian \
-               README ${PKGDIR}${DOCDIR}/
-## Generate DEBIAN/md5sums
-       cd ${PKGDIR} >/dev/null ;\
-        find * -type f ! -regex '^DEBIAN/.*' -print0 | xargs -r0 md5sum > 
DEBIAN/md5sums
-## Generate DEBIAN/control
-       dpkg-gencontrol -isp -p${PACKAGE} -P${PKGDIR}
-## Build the binary package
-       dpkg --build ${PKGDIR} ..
-
-binary-indep: binary-erc
-binary-arch: ;
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean build binary-erc install
diff --git a/debian/scripts/install b/debian/scripts/install
deleted file mode 100755
index 722b4d9..0000000
--- a/debian/scripts/install
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-# -*- Makefile -*-
-
-# This wrapper was written by Michael Olson <address@hidden>.
-
-# The purpose for doing this is to ensure that only the first argument
-# is acted on.  There does not seem to be a feasible way of doing this
-# using Make.
-
-# The only inconveniences we suffer here are (1) an extra shell
-# instance is loaded and (2) all `$' characters must be escaped.
-
-make -f - $1 <<EOF
-## Written by Gergely Nagy <address@hidden>
-## Adapted by Mario Lang <address@hidden>
-
-PACKAGE        := erc
-ELDIR  := /usr/share/emacs/site-lisp/\${PACKAGE}
-ELFILES        := \$(filter-out erc-bbdb.el erc-speedbar.el erc-speak.el 
erc-chess.el erc-ibuffer.el, \
-            \$(subst \${ELDIR}/,,\$(wildcard \${ELDIR}/erc*.el)))
-SITEFLAG = --no-site-file
-FLAGS  = -q -batch -l path.el -f batch-byte-compile
-FLAVOUR        = \$@
-ELCDIR = /usr/share/\${FLAVOUR}/site-lisp/\${PACKAGE}
-FILES = \$(ELFILES)
-
-emacs: ;
-
-xemacs%: SITEFLAG = -no-site-file
-
-emacs20:
-       @echo install/erc: Handling install for emacsen flavor \$@
-       @echo Sorry, ERC does no longer support emacs20.
-       @echo We recommend that you install emacs21.
-
-.DEFAULT: \${ELCDIR}/path.el
-       @echo install/erc: Handling install for emacsen flavor \$(FLAVOUR)
-       @install -m 755 -d \${ELCDIR}
-       @cd \${ELDIR} && cp \${FILES} \${ELCDIR}
-       @cd \${ELCDIR} && \
-       echo "(setq load-path (cons \".\" load-path) byte-compile-warnings 
nil)" >path.el && \
-       \${FLAVOUR} \${SITEFLAG} \${FLAGS} \${FILES}
-       @cd \${ELCDIR} && rm -f \${FILES} path.el
-
-.SUFFIXES:
-.PHONY:
-EOF
diff --git a/debian/scripts/remove b/debian/scripts/remove
deleted file mode 100755
index 57c17ca..0000000
--- a/debian/scripts/remove
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-set -e
-
-FLAVOR=$1
-PACKAGE=erc
-
-if [ ${FLAVOR} != emacs ]; then
-    echo remove/erc: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
diff --git a/debian/scripts/startup.erc b/debian/scripts/startup.erc
deleted file mode 100644
index f0f6eaf..0000000
--- a/debian/scripts/startup.erc
+++ /dev/null
@@ -1,13 +0,0 @@
-;; -*-emacs-lisp-*-
-;; Emacs startup file for the Debian erc package
-
-; add `/usr/share/{emacs20,xemacs20,...}/site-lisp/erc' to the
-; load-path
-(setq load-path (cons (concat "/usr/share/"
-                              "emacs"
-                              "/site-lisp/erc") load-path))
-(setq load-path (cons (concat "/usr/share/"
-                              (symbol-name flavor)
-                              "/site-lisp/erc") load-path))
-
-(load "erc-auto")