--- cl-rt-20040621.orig/rt-test.lisp
+++ cl-rt-20040621/rt-test.lisp
@@ -32,22 +32,29 @@
 (defmacro setup (&rest body)
   `(do-setup '(progn ., body)))
 
+(defmacro with-empty-test-database (&body body)
+  `(let ((regression-test::*entries* (list nil))
+	 (regression-test::*entries-table* (make-hash-table
+					    :test #'equal))
+	 (*test* nil)
+	 (regression-test::*in-test* nil))
+     (let ((regression-test::*entries-tail* regression-test::*entries*))
+       ,@body)))
+
 (defun do-setup (form)
-  (let ((*test* nil)
-	(*do-tests-when-defined* nil)
-	(rt::*entries* (list nil))
-	(rt::*in-test* nil)
-	(rt::*debug* t)
-	result)
-    (deftest t1 4 4)
-    (deftest (t 2) 4 3)
-    (values-list
-      (cons (normalize
+  (with-empty-test-database
+    (let ((*do-tests-when-defined* nil)
+	  (rt::*debug* t)
+	  result)
+      (deftest t1 4 4)
+      (deftest (t 2) 4 3)
+      (values-list
+       (cons (normalize
 	      (with-output-to-string (*standard-output*)
 		(setq result
 		      (multiple-value-list
-			(catch 'rt::*debug* (eval form))))))
-	    result))))
+		       (catch 'rt::*debug* (eval form))))))
+	     result)))))
 
 (defun normalize (string)
   (with-input-from-string (s string)
--- cl-rt-20040621.orig/debian/README.building
+++ cl-rt-20040621/debian/README.building
@@ -0,0 +1,16 @@
+To build this package you need to get the git repository:
+
+git clone http://git.debian.org/git/pkg-common-lisp/cl-rt.git
+
+Upstream is as stable as a rock.
+
+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-rt-20040621.orig/debian/copyright
+++ cl-rt-20040621/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Kevin M. Rosenberg <kmr@debian.org> in
+Nov 2002.
+
+It was downloaded from:
+http://www-2.cs.cmu.edu/afs/cs/project/ai-repository/ai/lang/lisp/code/testing/rt/
+Upstream Author: MIT
+
+
+Copyright:
+
+#|----------------------------------------------------------------------------|
+ | Copyright 1990 by the Massachusetts Institute of Technology, Cambridge MA. |
+ |                                                                            |
+ | Permission  to  use,  copy, modify, and distribute this software  and  its |
+ | documentation for any purpose  and without fee is hereby granted, provided |
+ | that this copyright  and  permission  notice  appear  in  all  copies  and |
+ | supporting  documentation,  and  that  the  name  of M.I.T. not be used in |
+ | advertising or  publicity  pertaining  to  distribution  of  the  software |
+ | without   specific,   written   prior   permission.      M.I.T.  makes  no |
+ | representations  about  the  suitability of this software for any purpose. |
+ | It is provided "as is" without express or implied warranty.                |
+ |                                                                            |
+ |  M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,  INCLUDING  |
+ |  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL  |
+ |  M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL  DAMAGES  OR  |
+ |  ANY  DAMAGES  WHATSOEVER  RESULTING  FROM  LOSS OF USE, DATA OR PROFITS,  |
+ |  WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER  TORTIOUS  ACTION,  |
+ |  ARISING  OUT  OF  OR  IN  CONNECTION WITH THE USE OR PERFORMANCE OF THIS  |
+ |  SOFTWARE.                                                                 |
+ |----------------------------------------------------------------------------|#
--- cl-rt-20040621.orig/debian/changelog
+++ cl-rt-20040621/debian/changelog
@@ -0,0 +1,98 @@
+cl-rt (20040621-4.4.201403170651) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Mon, 17 Mar 2014 06:51:55 +0100
+
+cl-rt (20040621-4) unstable; urgency=low
+
+  [ Kevin M. Rosenberg ]
+  * Non-maintainer patch sent to package Maintainer (not NMU)
+  * debian/rules
+  - Simplified rules to a minimum
+  - Now uses dh_lisp
+  - Ported to Debhelper 7
+  * debian/compat
+  - Change to version 7
+  * debian/control
+  - Add dh-lisp to Build-Depends-Indep
+  - Remove unneccesary ${shlibs:Depends}. Added ${misc:Depends}
+  - Updated standards-version (no other changes)
+  * debian/prerm, debian/postinst
+  - Removed as now taken care of by dh_lisp
+  * debian/watch
+  - New file explaining that there is no versioned upstream source
+  
+  [ Peter Van Eynde ]
+  * As we use dh-lisp we can remove the postinst and prerm scripts
+  * Updated Standards-Version no real changes
+  * Added README.building file
+  * Applied patches from Joseph A. Oswald, III to self-tests. (Closes:
+    #537501)
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Thu, 10 Sep 2009 07:17:43 +0100
+
+cl-rt (20040621-3) unstable; urgency=low
+
+  * Changed to group maintanance
+  * Added Vcs-Git control field
+  * Added homepage field
+  * Updated standard version without real changes
+  * swap binary-indep and binary-arch
+  * debhelper is Build-Depends
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sun, 24 Feb 2008 13:59:11 +0100
+
+cl-rt (20040621-2) unstable; urgency=low
+
+  * New maintainer. (Closes: #297406: O: cl-rt -- Common Lisp regression
+    tester from MIT)
+  * Adopted by Peter Van Eynde
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Tue,  1 Mar 2005 10:19:40 +0100
+
+cl-rt (20040621-1) unstable; urgency=low
+
+  * New upstream from Paul Dietz's ansi-tests
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 21 Jun 2004 15:27:33 -0600
+
+cl-rt (20030428b-1) unstable; urgency=low
+
+  * Fix dos line endings
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 11 Nov 2003 03:58:15 -0700
+
+cl-rt (20030428a-1) unstable; urgency=low
+
+  * Rename package to :regression-test and add nickname of :rtest.
+  Don't use nickname of :rt on lispworks because of conflict with the
+  Lispworks :runtime package.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 28 Apr 2003 13:03:21 -0600
+
+cl-rt (20030428-1) unstable; urgency=low
+
+  * Update with Paul Dietz's modifications (same as used by
+  SBCL's sb-rt package)
+  * Update to standards-version 3.5.9.0 [no changes needed]
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 28 Apr 2003 11:30:36 -0600
+
+cl-rt (19901219.1-1) unstable; urgency=low
+
+  * Add examples file and documentation file (closes: 170890)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 27 Nov 2002 11:08:06 -0700
+
+cl-rt (19901219-2) unstable; urgency=low
+
+  * Remove 'load-compiled-op from .asd file
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri,  8 Nov 2002 09:31:31 -0700
+
+cl-rt (19901219-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri,  8 Nov 2002 01:08:01 -0700
--- cl-rt-20040621.orig/debian/compat
+++ cl-rt-20040621/debian/compat
@@ -0,0 +1 @@
+7
--- cl-rt-20040621.orig/debian/rules
+++ cl-rt-20040621/debian/rules
@@ -0,0 +1,43 @@
+#!/usr/bin/make -f
+
+pkg	:= rt
+debpkg  := cl-rt
+
+clc-source	:= usr/share/common-lisp/source
+clc-files	:= $(clc-source)/$(pkg)
+
+
+build:
+
+clean:
+	dh_testdir
+	dh_testroot
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+	dh_install $(pkg).asd $(pkg).lisp $(clc-files)
+
+binary-arch:
+
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	dh_installdocs rt-doc.txt
+	dh_installexamples rt-test.lisp
+	dh_installchangelogs
+	dh_lisp
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep
+
+
+.PHONY: build clean binary-indep binary-arch binary install
--- cl-rt-20040621.orig/debian/control
+++ cl-rt-20040621/debian/control
@@ -0,0 +1,19 @@
+Source: cl-rt
+Section: devel
+Priority: optional
+Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org>
+Uploaders: Peter Van Eynde <pvaneynd@debian.org>
+Build-Depends-Indep: dh-lisp
+Build-Depends: debhelper (>= 7.0.0)
+Standards-Version: 3.8.3
+Homepage: http://www-2.cs.cmu.edu/afs/cs/project/ai-repository/ai/lang/lisp/code/testing/rt/
+Vcs-Git: http://git.debian.org/git/pkg-common-lisp/cl-rt.git
+
+Package: cl-rt
+Architecture: all
+Depends: ${misc:Depends}
+Description: Common Lisp regression tester from MIT
+ This is MIT's regression tester for Common Lisp programs. It provides a 
+ framework for writing
+ regression tests for Common Lisp packages. This package includes
+ Paul Dietz's modifications to the original MIT release.
--- cl-rt-20040621.orig/debian/watch
+++ cl-rt-20040621/debian/watch
@@ -0,0 +1 @@
+# There is no versioned upstream file at the package's homepage
