--- cl-irc-0.8.1-dfsg.orig/protocol.lisp
+++ cl-irc-0.8.1-dfsg/protocol.lisp
@@ -346,7 +346,7 @@
                                                               :external-format
                                                               (external-format-fixup external-format))))
                   (read-line flexi nil nil)))
-              (flexi-streams:flexi-stream-encoding-error ()
+              (flexi-streams:external-format-encoding-error ()
                   nil)))
         if decoded
         do (return decoded)))
--- cl-irc-0.8.1-dfsg.orig/debian/README.building
+++ cl-irc-0.8.1-dfsg/debian/README.building
@@ -0,0 +1,36 @@
+To build this package you need to get the git repository:
+
+git clone git://git.debian.org/git/pkg-common-lisp/cl-irc.git
+
+Upstream gets imported directly from the tar.gz file into the upstream branch.
+
+To update the package from upstream do:
+
+git checkout upstream
+rm -rf *
+curl http://common-lisp.net/project/cl-irc/cl-irc_latest.tar.gz | tar zxvf -
+mv cl-irc-<foo>/* .
+rmdir cl-irc-<foo>
+
+be certain to remove the rfc files (!)
+
+rm  -rf doc/rfc*
+git status
+
+check if this is sane
+
+git add --all
+git tag upstream/<foo>
+git checkout master
+git pull . upstream
+
+To build:
+
+git-buildpackage -uc -us 
+
+please check your package with:
+
+lintian --verbose --info --display-info --md5sums *.changes
+
+Then commit any changes and either send me the diff or push this to somewhere were I can fetch it.
+ 
--- cl-irc-0.8.1-dfsg.orig/debian/copyright
+++ cl-irc-0.8.1-dfsg/debian/copyright
@@ -1,9 +1,9 @@
 Debian Copyright Section
 ========================
 
-Upstream Source URL: http://common-lisp.net/projects/cl-irc
+Upstream Source URL: http://common-lisp.net/project/cl-irc/
 Upstream Authors: Erik Enge and Brian Mastenbrook
-Debian Maintainer:  Kevin M. Rosenberg <kmr@debian.org>
+Debian Maintainer:  Peter Van Eynde <pvaneynd@debian.org>
 
 Upstream Copyright Statement
 ============================
--- cl-irc-0.8.1-dfsg.orig/debian/changelog
+++ cl-irc-0.8.1-dfsg/debian/changelog
@@ -1,16 +1,108 @@
-cl-irc (20070504-dfsg-2) UNRELEASED; urgency=low
+cl-irc (1:0.8.1-dfsg-3.1.4.201403170509) ucs4-0-0-0; urgency=low
 
-  * token new version
-  * Use Vcs-Bzr in control file
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Mon, 17 Mar 2014 05:09:20 +0100
+
+cl-irc (1:0.8.1-dfsg-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update for flexistream in unstable (Closes: #567812)
+
+ -- Christoph Egger <christoph@debian.org>  Sat, 13 Feb 2010 18:16:20 +0100
+
+cl-irc (1:0.8.1-dfsg-3) unstable; urgency=low
 
- -- Peter Van Eynde <pvaneynd@debian.org>  Fri, 26 Oct 2007 05:29:45 +0200
+  * debian/control:
+    + add Vcs-Browser field.
+  * Added debian/README.building file 
+  * Now use debhelper v7
+  * Updated Standards-Version no real changes
 
-cl-irc (20070504-dfsg-1) unstable; urgency=low
+ -- Peter Van Eynde <pvaneynd@debian.org>  Wed, 09 Sep 2009 06:32:40 +0100
 
-  * New upstream version.
-  * added XS-Vcs-Bzr field to control file
+cl-irc (1:0.8.1-dfsg-2) unstable; urgency=low
+
+  * debian/changelog:
+    + reflect uplodaded versions (Closes: #480242).
+
+  * debian/control:
+    + add myself to Uploaders:.
+    - remove trailing empty lines.
+
+ -- Luca Capello <luca@pca.it>  Fri, 06 Jun 2008 12:12:30 +0200
+
+cl-irc (1:0.8.1-dfsg-1) unstable; urgency=low
+
+  * Use Vcs-Bzr in control file
+  * New upstream version, using again release numbers.
+  * Fixed Homepage field
+  * Swap binary-arch and binary-indep round.
+  * Added usocket dependency
+  * updated standard version no real changes
+  * Removed dangerous rfc files that eat your children at night.
+    (Closes: #443158)
+  * Changed to group maintanance
+  * Corrected Vcs-Git control field
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Tue, 19 Feb 2008 06:20:06 +0100
+
+cl-irc (20070905-dfsg-1) unstable; urgency=low
+
+  * Fixed dependency on cl-trivial-sockets (Closes: #440007)
+  * New upstream. Major changes: 
+    + Make privmsg work for dcc CHAT connections.
+    + Make DCC commands and responses work with dcc CHAT connections.
+    + Fix incorrect type assumption (reported by antifuchs).
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sat, 15 Sep 2007 00:02:20 +0200
+
+cl-irc (20070430-dfsg-1) unstable; urgency=low
+
+  * New upstream version. Major changes:
+
+    + KICK messages generally don't originate at the user being kicked. Fixed.
+    + Remove - now unused - .cvsignore file. 
+    + No idea why I wrote this, but I think it's generally usefull: hostmask matching.
+    + Harmonize keyword expansion in tests/ directory.
+    + Fix typo, some refactoring and be more lenient on non-conforming input
+    + Silence UNHANDLED messages on the debug stream when they are in fact handled.
+    + Fix termination condition in read-protocol-line.
+    + Fix off-by-one error and make sure we don't keep looping when the network stream is lost.
+    + Move 2 utility routines.
+    + Other DCC protocols starting with an #\S have been introduced now (SCHAT,SSEND).
+    + Add a list of DCC session types.
+    + Rename shadowing local binding (type -> sess-type).
+    + Rearrange code. Make dcc-connection an abstract base class.
+    + Define fallback functions for the case where the message passed isn't even a subtype of ctcp-mixin.
+    + r193 followup: 'user' was renamed to 'remote-user' to disambiguate its meaning.
+    + Move connectedp into the dcc-connection section; ignore errors when closing a connection.
+    + Create a DCC CHAT message class, just like the IRC message classes we have.
+    + r197 followup: disable (yet) unimplemented part (ctcp messages).
+    + Add a dcc-chat-connection class; a non-abstract subclass of dcc-connection.
+    + r199 followup: read-message calls dcc-message-event. Provide it.
+    + Implement CTCP-over-DCC framework.
+    + Add missing CTCP primitive: ctcp-reply.
+    + Add SSL support for IRC connections, only if CL+SSL is available when calling
+    + DCC implementation checkpoint: Working DCC CHAT with passive local side.  'passive local' == either remote initiates or local passive initiative.
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 30 Apr 2007 22:54:14 +0200
+
+cl-irc (20070315-dfsg-1) unstable; urgency=low
+
+  * New upstream, fixes minor problem:
+    - Fix thinko reported by Lars Rune Nostdal (larsnostdal at gmail dot com).
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 09 Apr 2007 01:01:42 +0200
+
+cl-irc (20070106-dfsg-1) experimental; urgency=low
+
+  * Added XS-X-Vcs-Darcs header
+  * modified S-X-Vcs-Darcs to XS-Vcs-Darcs field
+  * New upstream release. Major changes with many changes.
+  * upload to experimental during the freeze
 
- -- Peter Van Eynde <pvaneynd@debian.org>  Fri, 04 May 2007 23:01:37 +0200
+ -- Peter Van Eynde <pvaneynd@debian.org>  Tue,  6 Feb 2007 09:03:53 +0100
 
 cl-irc (20060514-dfsg-1) unstable; urgency=low
 
--- cl-irc-0.8.1-dfsg.orig/debian/compat
+++ cl-irc-0.8.1-dfsg/debian/compat
@@ -1 +1 @@
-4
+7
--- cl-irc-0.8.1-dfsg.orig/debian/rules
+++ cl-irc-0.8.1-dfsg/debian/rules
@@ -34,17 +34,18 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	# Add here commands to install the package into debian/irc.
 	dh_installdirs $(clc-irc) $(doc-dir)
 	dh_install cl-irc.asd $(shell echo *.lisp) $(clc-irc)
 	dh_lisp
 
-# Build architecture-independent files here.
-binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
+
+# Build architecture-independent files here.
+binary-indep: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
--- cl-irc-0.8.1-dfsg.orig/debian/control
+++ cl-irc-0.8.1-dfsg/debian/control
@@ -1,19 +1,19 @@
 Source: cl-irc
 Section: devel
 Priority: optional
-Maintainer: Peter Van Eynde <pvaneynd@debian.org>
-Build-Depends: debhelper (>> 4.0.0)
+Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org>
+Uploaders: Peter Van Eynde <pvaneynd@debian.org>, Luca Capello <luca@pca.it>
+Build-Depends: debhelper (>> 7)
 Build-Depends-Indep: dh-lisp
-Standards-Version: 3.7.2.0
-Vcs-Bzr: http://cl-debian.alioth.debian.org/repository/pvaneynd/bzr-moved/cl-irc/
+Standards-Version: 3.8.3
+Vcs-Git: http://git.debian.org/git/pkg-common-lisp/cl-irc.git
+Vcs-Browser: http://git.debian.org/?p=pkg-common-lisp/cl-irc.git;a=summary
+Homepage: http://common-lisp.net/project/cl-irc/
 
 Package: cl-irc
 Architecture: all
-Depends: ${misc:Depends}, cl-split-sequence, cl-flexi-streams
+Depends: ${misc:Depends}, cl-split-sequence, cl-flexi-streams, cl-usocket
 Description: Common Lisp Internet Relay Chat Library
  cl-irc provides a library for Common Lisp programs to interact with
  IRC servers. This library has been most tested with SBCL.
  Several example programs are provided.
-
-
-
