Move "debian" directory to a place that reflects what it really does; add the debian directory from the dapper pyopenssl package
diff --git a/debian/README.Debian b/dapper/README.Debian
similarity index 100%
rename from debian/README.Debian
rename to dapper/README.Debian
diff --git a/dapper/changelog b/dapper/changelog
new file mode 100644
index 0000000..a9db879
--- /dev/null
+++ b/dapper/changelog
@@ -0,0 +1,201 @@
+pyopenssl (0.6-2ubuntu3) dapper; urgency=low
+
+ * Drop python2.3 package.
+
+ -- Matthias Klose <doko@ubuntu.com> Tue, 14 Feb 2006 15:32:47 +0000
+
+pyopenssl (0.6-2ubuntu2) dapper; urgency=low
+
+ * Rebuild against openssl 0.9.8.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 30 Jan 2006 12:54:52 +0000
+
+pyopenssl (0.6-2ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com> Wed, 27 Jul 2005 08:52:44 +0000
+
+pyopenssl (0.6-2) unstable; urgency=low
+
+ * Add support for python 2.4. (Closes: #297870)
+ * Build-depend on v0.9.7 of openssl.
+
+ -- Martin Sjogren <sjogren@debian.org> Mon, 14 Mar 2005 08:56:27 +0100
+
+pyopenssl (0.6-1ubuntu3) hoary; urgency=low
+
+ * Drop python2.2 package.
+
+ -- Matthias Klose <doko@ubuntu.com> Mon, 24 Jan 2005 08:17:19 +0100
+
+pyopenssl (0.6-1ubuntu2) hoary; urgency=low
+
+ * Tighten build dependency on python.
+
+ -- Matthias Klose <m@klose.in-berlin.de> Thu, 16 Dec 2004 22:56:53 +0100
+
+pyopenssl (0.6-1ubuntu1) hoary; urgency=low
+
+ * Support python2.4 as default python version.
+
+ -- Matthias Klose <m@klose.in-berlin.de> Wed, 15 Dec 2004 20:59:11 +0100
+
+pyopenssl (0.6-1) unstable; urgency=low
+
+ * New upstream release, including:
+ - Add Netscape SPKI extensions. (Closes: #205132)
+ - Add X509.subject_name_hash, X509.digest. (Closes: #205136)
+ - Fix full names of exceptions. (Closes: #250342)
+ - Add SSL.Context.use_certificate_chain_file. (Closes: #260134)
+ * Docs are built upstream, so the build-deps have been trimmed.
+ This also means that HTML and text documentation are back.
+ * Bumped standards-version.
+ * Use dh_python.
+
+ -- Martin Sjogren <sjogren@debian.org> Fri, 13 Aug 2004 20:53:27 +0200
+
+pyopenssl (0.5.1-4) unstable; urgency=low
+
+ * Drop HTML and text documentation since latex2html moved to non-free.
+ This is a temporary solution, until I can hack mkhowto to use something
+ else. (Closes: #221344)
+ * Fix the copyright file to mention the copyright holder.
+
+ -- Martin Sjogren <sjogren@debian.org> Mon, 15 Dec 2003 20:16:25 +0100
+
+pyopenssl (0.5.1-3) unstable; urgency=low
+
+ * MANIFEST.in: Include the src/RATIONALE file. (Closes: #197401)
+ * doc/pyOpenSSL.tex: Fix typo. (Closes: #197435)
+ * Drop Python 1.5 and 2.1 support.
+ * Make python-pyopenssl depend on python2.3-pyopenssl, which is no longer
+ "experimental".
+
+ -- Martin Sjogren <sjogren@debian.org> Mon, 11 Aug 2003 18:37:07 +0200
+
+pyopenssl (0.5.1-2) unstable; urgency=low
+
+ * Make sure names in control and changelog match. Stupid changelogs, bleh.
+ * Change section to 'python'.
+ * Rebuild with openssl 0.9.7. (Closes: #189826)
+ * __init__.py: Import tsafe module.
+ * tsafe.py: Add some missing methods.
+ * debian/copyright: Fix Author(s) boilerplate thingy to shut lintian up.
+
+ -- Martin Sjogren <sjogren@debian.org> Sun, 20 Apr 2003 17:50:24 +0200
+
+pyopenssl (0.5.1-1) unstable; urgency=low
+
+ * New upstream version. (Closes: #159530)
+ * Added a python-pyopenssl dummy package.
+ * Added an experimental python2.3-pyopenssl package.
+
+ -- Martin Sjögren <martin@strakt.com> Sun, 25 Aug 2002 12:08:31 +0200
+
+pyopenssl (0.5-1) unstable; urgency=low
+
+ * New upstream version
+ * Support for python1.5.
+ * Fix stupid mistakes for python 1.5 and python 2.1.
+
+ -- Martin Sjögren <martin@strakt.com> Wed, 24 Jul 2002 09:05:28 +0200
+
+pyopenssl (0.4.1-8) unstable; urgency=low
+
+ * Added examples to pyopenssl-doc
+
+ -- Martin Sjögren <martin@strakt.com> Wed, 5 Jun 2002 14:58:04 +0200
+
+pyopenssl (0.4.1-7) unstable; urgency=low
+
+ * The cute arrow icons in the HTML documentation should be there now too.
+
+ -- Martin Sjögren <martin@strakt.com> Thu, 30 May 2002 00:53:44 +0200
+
+pyopenssl (0.4.1-6) unstable; urgency=low
+
+ * Commented out some unused things in debian/rules
+
+ -- Martin Sjögren <martin@strakt.com> Wed, 29 May 2002 11:20:33 +0200
+
+pyopenssl (0.4.1-5) unstable; urgency=low
+
+ * Adding to the build-depends.
+ * Initial upload (Closes: #140687)
+
+ -- Martin Sjögren <martin@strakt.com> Sat, 6 Apr 2002 14:15:49 +0200
+
+pyopenssl (0.4.1-4) unstable; urgency=low
+
+ * Fixes in packaging, it shouldn't be regarded a native package now.
+
+ -- Martin Sjögren <martin@strakt.com> Sat, 6 Apr 2002 11:26:39 +0200
+
+pyopenssl (0.4.1-3) unstable; urgency=low
+
+ * Moved from non-US to main/devel
+
+ -- Martin Sjögren <martin@strakt.com> Fri, 5 Apr 2002 22:44:10 +0200
+
+pyopenssl (0.4.1-2) unstable; urgency=low
+
+ * Fixes in the packaging, dependencies and build dependencies should be
+ all right now.
+
+ -- Martin Sjögren <martin@strakt.com> Thu, 10 Jan 2002 10:00:06 +0100
+
+pyopenssl (0.4.1-1) unstable; urgency=low
+
+ * New "upstream" release
+ * New packaging, python2.1-pyopenssl, python2.2-pyopenssl, pyopenssl-doc
+
+ -- Martin Sjögren <martin@strakt.com> Mon, 7 Jan 2002 15:38:51 +0100
+
+pyopenssl (0.4-4) unstable; urgency=low
+
+ * Grrr, this time then...
+
+ -- Martin Sjögren <martin@strakt.com> Fri, 17 Aug 2001 14:53:19 +0200
+
+pyopenssl (0.4-3) unstable; urgency=low
+
+ * Fixed a big nasty bug
+
+ -- Martin Sjögren <martin@strakt.com> Fri, 17 Aug 2001 14:33:06 +0200
+
+pyopenssl (0.4-2) unstable; urgency=low
+
+ * Fixes
+
+ -- Martin Sjögren <martin@strakt.com> Fri, 17 Aug 2001 13:53:11 +0200
+
+pyopenssl (0.4-1) unstable; urgency=low
+
+ * New "upstream" version
+
+ -- Martin Sjögren <martin@strakt.com> Thu, 9 Aug 2001 12:32:47 +0200
+
+pyopenssl (0.3-3) unstable; urgency=low
+
+ * X509 objects now has a has_expired method
+
+ -- Martin Sjögren <martin@strakt.com> Tue, 7 Aug 2001 14:16:13 +0200
+
+pyopenssl (0.3-2) unstable; urgency=low
+
+ * X509Name objects now has a compare method
+
+ -- Martin Sjögren <martin@strakt.com> Tue, 7 Aug 2001 10:53:58 +0200
+
+pyopenssl (0.3-1) unstable; urgency=low
+
+ * New "upstream" version
+
+ -- Martin Sjögren <martin@strakt.com> Fri, 3 Aug 2001 16:36:26 +0200
+
+pyopenssl (0.1-1) unstable; urgency=low
+
+ * Initial version.
+
+ -- Anders Hammarquist <iko@strakt.com> Mon, 23 Jul 2001 15:17:38 +0200
diff --git a/dapper/control b/dapper/control
new file mode 100644
index 0000000..5d33a7f
--- /dev/null
+++ b/dapper/control
@@ -0,0 +1,31 @@
+Source: pyopenssl
+Section: python
+Priority: optional
+Maintainer: Martin Sjogren <sjogren@debian.org>
+Build-Depends: debhelper (>> 4.2.28), python (>= 2.4), python2.4-dev, libssl-dev (>= 0.9.7)
+Standards-Version: 3.6.1
+
+Package: python2.4-pyopenssl
+Architecture: any
+Depends: ${shlibs:Depends}, ${python:Depends}
+Suggests: pyopenssl-doc
+Description: Python wrapper around the OpenSSL library, experimental!
+ Includes: SSL Context objects, SSL Connection objects, using
+ Python sockets as transport layer. The Connection object
+ wraps all the socket methods and can therefore be used
+ interchangeably.
+
+Package: python-pyopenssl
+Architecture: all
+Depends: ${python:Depends}
+Description: Python wrapper around the OpenSSL library (dummy package)
+ This is a dummy package that depends on the version of pyOpenSSL
+ that is compiled for the default version of Python.
+
+Package: pyopenssl-doc
+Section: doc
+Architecture: all
+Suggests: python-pyopenssl
+Description: Documentation for pyOpenSSL
+ This package provides documentation for the pyOpenSSL package,
+ in HTML, postscript and text formats.
diff --git a/debian/copyright b/dapper/copyright
similarity index 100%
rename from debian/copyright
rename to dapper/copyright
diff --git a/debian/pyopenssl-doc.doc-base b/dapper/pyopenssl-doc.doc-base
similarity index 100%
rename from debian/pyopenssl-doc.doc-base
rename to dapper/pyopenssl-doc.doc-base
diff --git a/debian/pyopenssl-doc.docs b/dapper/pyopenssl-doc.docs
similarity index 100%
rename from debian/pyopenssl-doc.docs
rename to dapper/pyopenssl-doc.docs
diff --git a/debian/pyopenssl-doc.examples b/dapper/pyopenssl-doc.examples
similarity index 100%
rename from debian/pyopenssl-doc.examples
rename to dapper/pyopenssl-doc.examples
diff --git a/debian/python-pyopenssl.docs b/dapper/python-pyopenssl.docs
similarity index 100%
rename from debian/python-pyopenssl.docs
rename to dapper/python-pyopenssl.docs
diff --git a/dapper/rules b/dapper/rules
new file mode 100755
index 0000000..d9a3394
--- /dev/null
+++ b/dapper/rules
@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=3
+
+VERSIONS = 2.3 2.4
+VERSIONS = 2.4
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+
+ for ver in $(VERSIONS); do \
+ cp debian/python-pyopenssl.docs debian/python$$ver-pyopenssl.docs; \
+ done
+
+ touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+ dh_testdir
+
+ for ver in $(VERSIONS); do \
+ /usr/bin/python$$ver setup.py build; \
+ done
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ for ver in $(VERSIONS); do \
+ rm -f debian/python$$ver-pyopenssl.docs; \
+ done
+ rm -rf build
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ for ver in $(VERSIONS); do \
+ /usr/bin/python$$ver setup.py install --prefix=$(CURDIR)/debian/python$$ver-pyopenssl/usr; \
+ done
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installexamples -i
+# dh_installmenu -i
+# dh_installcron -i
+# dh_installinfo -i
+ dh_installchangelogs ChangeLog -i
+# dh_link -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_python -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a
+ dh_installexamples -a
+# dh_installmenu -a
+# dh_installcron -a
+# dh_installinfo -a
+ dh_installchangelogs ChangeLog -a
+ dh_strip -a
+# dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_python -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/README.Debian b/gutsy/README.Debian
similarity index 100%
copy from debian/README.Debian
copy to gutsy/README.Debian
diff --git a/debian/changelog b/gutsy/changelog
similarity index 100%
rename from debian/changelog
rename to gutsy/changelog
diff --git a/debian/compat b/gutsy/compat
similarity index 100%
rename from debian/compat
rename to gutsy/compat
diff --git a/debian/control b/gutsy/control
similarity index 100%
rename from debian/control
rename to gutsy/control
diff --git a/debian/copyright b/gutsy/copyright
similarity index 100%
copy from debian/copyright
copy to gutsy/copyright
diff --git a/debian/pycompat b/gutsy/pycompat
similarity index 100%
rename from debian/pycompat
rename to gutsy/pycompat
diff --git a/debian/pyopenssl-doc.doc-base b/gutsy/pyopenssl-doc.doc-base
similarity index 100%
copy from debian/pyopenssl-doc.doc-base
copy to gutsy/pyopenssl-doc.doc-base
diff --git a/debian/pyopenssl-doc.docs b/gutsy/pyopenssl-doc.docs
similarity index 100%
copy from debian/pyopenssl-doc.docs
copy to gutsy/pyopenssl-doc.docs
diff --git a/debian/pyopenssl-doc.examples b/gutsy/pyopenssl-doc.examples
similarity index 100%
copy from debian/pyopenssl-doc.examples
copy to gutsy/pyopenssl-doc.examples
diff --git a/debian/python-pyopenssl.docs b/gutsy/python-pyopenssl.docs
similarity index 100%
copy from debian/python-pyopenssl.docs
copy to gutsy/python-pyopenssl.docs
diff --git a/debian/rules b/gutsy/rules
similarity index 100%
rename from debian/rules
rename to gutsy/rules