--- twisted-calendarserver-8.2.0.svn27622.orig/debian/compat
+++ twisted-calendarserver-8.2.0.svn27622/debian/compat
@@ -0,0 +1 @@
+5
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/changelog
+++ twisted-calendarserver-8.2.0.svn27622/debian/changelog
@@ -0,0 +1,199 @@
+twisted-calendarserver (8.2.0.svn27622-2ubuntu1) oneiric; urgency=low
+
+  * rebuild for python 2.7 support (LP: #697044)
+  * set used interpreter for executables to /usr/bin/python
+
+ -- Julian Taylor <jtaylor.debian@googlemail.com>  Tue, 09 Aug 2011 13:19:43 +0200
+
+twisted-calendarserver (8.2.0.svn27622-2) unstable; urgency=low
+
+  * Copied /usr/share/doc/quilt/README.source
+  * Modified debian/patches/series to remove non-standard options
+  * Updated standards version to 3.9.1
+  * Removed Uploaders field in debian/control
+
+ -- Rahul Amaram <amaramrahul@users.sourceforge.net>  Tue, 17 Aug 2010 19:15:04 +0530
+
+twisted-calendarserver (8.2.0.svn27622-1) experimental; urgency=low
+
+  * New upstream release:
+    svn export svn://svn.twistedmatrix.com/svn/Twisted/branches/dav-take-two-3081-4@27622 twisted-calendarserver-8.2.0.svn27622
+  * twisted calendar is installed into a separate directory along with other
+    dependent twisted packages so that it does not conflict with the existing
+    twisted packages
+  * Modified debian/rules to work with recent versions of cdbs
+
+ -- Rahul Amaram <rahul@amaram.name>  Tue, 27 Jul 2010 13:48:44 +0530
+
+twisted-calendarserver (0.2.0.svn19773-5) unstable; urgency=low
+
+  * upload to unstable
+
+ -- Guido Guenther <agx@sigxcpu.org>  Thu, 26 Jun 2008 19:48:44 +0200
+
+twisted-calendarserver (0.2.0.svn19773-4) experimental; urgency=low
+
+  * Build-Depend on python-all-dev (Closes: #479857)
+  * set maintainer to the calendarserver team
+
+ -- Guido Guenther <agx@sigxcpu.org>  Wed, 07 May 2008 09:34:21 +0200
+
+twisted-calendarserver (0.2.0.svn19773-3) experimental; urgency=low
+
+  * only build a patched twisted.web2 and twisted.stamp instead of shipping
+    the whole twisted
+  * adjust dependencies accordingly
+  * use pycenatral so the modules can be found by twisted-core
+
+ -- Guido Guenther <agx@sigxcpu.org>  Mon, 05 May 2008 17:40:47 +0200
+
+twisted-calendarserver (0.2.0.svn19773-2) unstable; urgency=low
+
+  * synchronize patches with calendarserver 1.2 final
+
+ -- Guido Guenther <agx@sigxcpu.org>  Fri, 25 Apr 2008 22:30:17 +0200
+
+twisted-calendarserver (0.2.0.svn19773-1) unstable; urgency=low
+
+  * first upload to unstable
+  * conflict with python-twisted-core since otherwise the module loading
+    breaks - in the long run we need to depend on python-twisted-core and
+    provide a patched python-twisted-web2 only
+  * choose version number based on the web2 component's version
+  * switch to python 2.5
+
+ -- Guido Guenther <agx@sigxcpu.org>  Sun, 20 Apr 2008 13:24:03 +0200
+
+twisted-calendarserver (0.0.svn19773-2) experimental; urgency=low
+
+  * update patches from
+    http://svn.macosforge.org/repository/calendarserver/\
+    CalendarServer/branches/release/CalendarServer-1.2-dev/lib-patches/twisted@2165
+  * rename source and binary package according to python policy and make clear
+    it's for calendarserver only
+  * remove superflous debian/dirs 
+  * fix script path of testcase
+
+ -- Guido Guenther <agx@sigxcpu.org>  Sun, 24 Feb 2008 16:58:45 +0100
+
+twisted-acl-branch (0.0.svn19773-1) experimental; urgency=low
+
+  * New Upstream Version:
+    svn co -r 19773 svn://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608-4 twisted-acl-branch-upstream
+  * import and update patches from calendarserver/lib-patches/twisted@1755:
+
+ -- Guido Guenther <agx@sigxcpu.org>  Thu, 09 Aug 2007 10:23:32 +0200
+
+twisted-acl-branch (0.0.svn18289-3) calendarserver; urgency=low
+
+  * conflict with python-twisted-acl-branch instead of twisted-acl-branch
+  * depend on python-zopeinterface
+
+ -- Guido Guenther <agx@sigxcpu.org>  Thu, 28 Sep 2006 18:59:03 +0200
+
+twisted-acl-branch (0.0.svn18289-2) calendarserver; urgency=low
+
+  * conflict on twisted-acl-branch to force this package off the system
+  * remove unused debian/README.Debian
+  * remove debian/dirs
+  * add python-zopeinterface to build-depens (Thanks to Philipp Matthias Hahn
+    <pmhahn@debian.org> for spotting this)
+  * import new patches from calendarserver/lib-patches/twisted@209:
+      twisted.web2.server.patch 
+      twisted.web2.log.patch (now enabled)
+
+ -- Guido Guenther <agx@sigxcpu.org>  Wed, 27 Sep 2006 12:37:01 +0200
+
+twisted-acl-branch (0.0.svn18289-1) calendarserver; urgency=low
+
+  * New Upstream Version, branch siwtched to dav-acl-1608-1:
+      svn co -r 18289 svn://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608-1
+  * import new patches from calendarserver/lib-patches/twisted@187:
+      twisted.web2.dav.davxml.patch
+      twisted.web2.dav.element.__init__.patch
+      twisted.web2.dav.element.rfc4331.patch
+      twisted.web2.dav.idav.patch
+      twisted.web2.dav.method.copymove.patch
+      twisted.web2.dav.method.delete.patch
+      twisted.web2.dav.method.__init__.patch
+      twisted.web2.dav.method.proppatch.patch
+      twisted.web2.dav.method.put_common.patch
+      twisted.web2.dav.method.put.patch
+      twisted.web2.dav.resource.patch
+      twisted.web2.dav.static.patch
+      twisted.web2.dav.test.test_prop.patch
+      twisted.web2.log.patch (imported but not applied since it breaks every
+      http request)
+
+ -- Guido Guenther <agx@sigxcpu.org>  Tue, 26 Sep 2006 09:34:44 +0200
+
+twisted-acl-branch (0.0.svn18218-1) unstable; urgency=low
+
+  * New upstream version, branch switched to dav-acl-1608:
+       svn co -r18218 svn://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608
+  * remove obsolete patch from calendarserver/lib-patches/twisted:
+      twisted.web2.dav.filter.patch
+      twisted.svnversion.patch
+  * update copyright 
+
+ -- Guido Guenther <agx@sigxcpu.org>  Tue, 26 Sep 2006 09:31:17 +0200
+
+twisted-acl-branch (0.0.svn18202-1) unstable; urgency=low
+
+  * New upstream version 0.0.svn18202
+      svn co -r 18202 svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8
+  * remove obsolete patch from calendarserver/lib-patches/twisted:
+      twisted.web2.dav.filter.patch
+  * import new patches from calendarserver/lib-patches/twisted:
+      twisted.svnversion.patch
+
+ -- Guido Guenther <agx@sigxcpu.org>  Sun, 24 Sep 2006 00:40:55 +0200
+
+twisted-acl-branch (0.0.svn18165-1) unstable; urgency=low
+
+  * new SVN upstream version from:
+      svn co -r 18165 svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8
+  * remove obosolete (applied) patches from calendarserver/lib-patches/twisted:
+       twisted.web2.auth.wrapper.patch
+       twisted.web2.auth.interfaces.patch
+       twisted.web2.test.test_httpauth.patch
+       twisted.web2.auth.basic.patch
+       twisted.web2.dav.resource.patch
+       twisted.web2.auth.digest.patch
+       twisted.web2.dav.static.patch
+
+ -- Guido Guenther <agx@sigxcpu.org>  Mon, 18 Sep 2006 17:24:10 +0200
+
+twisted-acl-branch (0.0.svn18155-1) unstable; urgency=low
+
+  * new SVN upstream version from:
+      svn co -r 18155 svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8
+  * remove twisted.web2.dav.linux.patch - applied upstream
+  * obsoleted patches from calendarserver/patches/twisted
+        twisted.web2.dav.acl.patch
+        twisted.web2.dav.auth.patch
+        twisted.web2.dav.element.rfc3744.patch
+        twisted.web2.dav.http.patch
+        twisted.web2.dav.linux.patch
+  * import new patches from calendarserver/lib-patches/twisted:
+        twisted.web2.auth.basic.patch
+        twisted.web2.auth.digest.patch
+        twisted.web2.auth.interfaces.patch
+        twisted.web2.auth.wrapper.patch
+        twisted.web2.dav.filter.patch
+        twisted.web2.server.patch
+        twisted.web2.test.test_httpauth.patch
+  * updated patches from calendarserver/lib-patches/twisted:
+        twisted.web2.dav.resource.patch
+        twisted.web2.dav.static.patch
+  * remove superflous heimdal-dev from build-depends
+
+
+ -- Guido Guenther <agx@sigxcpu.org>  Fri, 15 Sep 2006 17:42:01 +0200
+
+twisted-acl-branch (0.0.svn17097-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Guido Guenther <agx@sigxcpu.org>  Wed,  6 Sep 2006 17:55:03 +0200
+
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/pycompat
+++ twisted-calendarserver-8.2.0.svn27622/debian/pycompat
@@ -0,0 +1 @@
+2
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/copyright
+++ twisted-calendarserver-8.2.0.svn27622/debian/copyright
@@ -0,0 +1,58 @@
+This package was debianized by Guido Guenther <agx@sigxcpu.org> on
+Wed,  6 Sep 2006 17:55:03 +0200.
+
+It was downloaded from  svn://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608-4
+
+Copyright: (c) 2001-2006
+	Allen Short
+	Andrew Bennetts
+	Apple Computer, Inc.
+	Benjamin Bruheim
+	Bob Ippolito
+	Canonical Limited
+	Christopher Armstrong
+	David Reid
+	Donovan Preston
+	Eric Mangold
+	Itamar Shtull-Trauring
+	James Knight
+	Jason A. Mobarak
+	Jonathan Lange
+	Jonathan D. Simms
+	Jp Calderone
+	Jürgen Hermann
+	Kevin Turner
+	Mary Gardiner
+	Matthew Lefkowitz
+	Massachusetts Institute of Technology
+	Moshe Zadka
+	Paul Swartz
+	Pavel Pergamenshchik
+	Ralph Meijer
+	Sean Riley
+	Travis B. Hartwell
+
+License:
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+The Debian packaging is (C) 2006, Guido Guenther <agx@sigxcpu.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/rules
+++ twisted-calendarserver-8.2.0.svn27622/debian/rules
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+  
+DEB_AUTO_CLEANUP_RCS            := yes
+
+DEB_PYTHON_SYSTEM = pycentral
+DEB_PYTHON_CLEAN_ARGS = --all
+
+# Add here any variable or target overrides you need
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+install/python-twisted-calendarserver ::
+	rm -rf $(DEB_BUILDDIR)/build $(DEB_DESTDIR)
+	cd $(DEB_SRCDIR)
+	set -e; for buildver in $(cdbs_python_build_versions); do \
+		python$$buildver - install --root=$(DEB_DESTDIR) --prefix=/usr/lib/twisted-calendarserver < ./twisted/topfiles/setup.py; \
+		python$$buildver - install --root=$(DEB_DESTDIR) --prefix=/usr/lib/twisted-calendarserver < ./twisted/web2/topfiles/setup.py; \
+		python$$buildver - install --root=$(DEB_DESTDIR) --prefix=/usr/lib/twisted-calendarserver < ./twisted/mail/topfiles/setup.py; \
+		python$$buildver - install --root=$(DEB_DESTDIR) --prefix=/usr/lib/twisted-calendarserver < ./twisted/web/topfiles/setup.py; \
+		python$$buildver - install --root=$(DEB_DESTDIR) --prefix=/usr/lib/twisted-calendarserver < ./twisted/words/topfiles/setup.py; \
+		python$$buildver - install --root=$(DEB_DESTDIR) --prefix=/usr/lib/twisted-calendarserver < ./twisted/runner/topfiles/setup.py; \
+	done
+	sed -i -e "s#/usr/bin/python2\.[0-9]#/usr/bin/python#" $(DEB_DESTDIR)/usr/lib/twisted-calendarserver/bin/*
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/pyversions
+++ twisted-calendarserver-8.2.0.svn27622/debian/pyversions
@@ -0,0 +1 @@
+2.5-
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/control
+++ twisted-calendarserver-8.2.0.svn27622/debian/control
@@ -0,0 +1,18 @@
+Source: twisted-calendarserver
+Section: python
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Rahul Amaram <amaramrahul@users.sourceforge.net>
+Build-Depends: cdbs, debhelper (>= 5), quilt, python-all-dev, python-central, python-zopeinterface
+Standards-Version: 3.9.1
+XS-Python-Version: >= 2.5
+
+Package: python-twisted-calendarserver
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-zopeinterface
+XB-Python-Version: ${python:Versions}
+Description: Twisted components for Apple's Calendarserver
+ Twisted is a event-based framework for internet applications. This is
+ twisted's dav-acl branch needed for Apple's Calendarserver only.
+ .
+ If you're looking for twisted itself use the python-twisted package.
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/README.source
+++ twisted-calendarserver-8.2.0.svn27622/debian/README.source
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+                export QUILT_PATCHES=debian/patches
+        fi
+    done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/docs
+++ twisted-calendarserver-8.2.0.svn27622/debian/docs
@@ -0,0 +1 @@
+README
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/patches/twisted-path.patch
+++ twisted-calendarserver-8.2.0.svn27622/debian/patches/twisted-path.patch
@@ -0,0 +1,120 @@
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/mail/mailmail twisted-calendarserver-8.2.0.svn27622/bin/mail/mailmail
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/mail/mailmail	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/mail/mailmail	2010-03-25 10:46:40.000000000 +0000
+@@ -18,6 +18,8 @@
+         sys.path.insert(0, path)
+         break
+     path = os.path.dirname(path)
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ ### end of preamble
+ 
+ from twisted.mail.scripts import mailmail
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/manhole twisted-calendarserver-8.2.0.svn27622/bin/manhole
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/manhole	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/manhole	2010-03-25 10:47:23.000000000 +0000
+@@ -14,6 +14,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ ### end of preamble
+ 
+ 
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/mktap twisted-calendarserver-8.2.0.svn27622/bin/mktap
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/mktap	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/mktap	2010-03-25 10:47:38.000000000 +0000
+@@ -9,6 +9,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ if not hasattr(os, "getuid") or os.getuid() != 0:
+     sys.path.insert(0, os.getcwd())
+ ### end of preamble
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/pyhtmlizer twisted-calendarserver-8.2.0.svn27622/bin/pyhtmlizer
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/pyhtmlizer	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/pyhtmlizer	2010-03-25 10:47:46.000000000 +0000
+@@ -10,6 +10,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ sys.path.insert(0, os.curdir)
+ ### end of preamble
+ 
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/tap2deb twisted-calendarserver-8.2.0.svn27622/bin/tap2deb
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/tap2deb	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/tap2deb	2010-03-25 10:48:03.000000000 +0000
+@@ -14,6 +14,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ ### end of preamble
+ 
+ from twisted.scripts import tap2deb
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/tap2rpm twisted-calendarserver-8.2.0.svn27622/bin/tap2rpm
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/tap2rpm	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/tap2rpm	2010-03-25 10:48:10.000000000 +0000
+@@ -16,6 +16,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ ### end of preamble
+ 
+ from twisted.scripts import tap2rpm
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/tapconvert twisted-calendarserver-8.2.0.svn27622/bin/tapconvert
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/tapconvert	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/tapconvert	2010-03-25 10:48:18.000000000 +0000
+@@ -12,6 +12,8 @@
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
+ if not hasattr(os, "getuid") or os.getuid() != 0:
+     sys.path.insert(0, os.getcwd())
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ ### end of preamble
+ 
+ from twisted.scripts.tapconvert import run
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/trial twisted-calendarserver-8.2.0.svn27622/bin/trial
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/trial	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/trial	2010-03-25 10:48:28.000000000 +0000
+@@ -10,6 +10,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ if hasattr(os, "getuid") and os.getuid() != 0:
+     sys.path.insert(0, os.curdir)
+ ### end of preamble
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/twistd twisted-calendarserver-8.2.0.svn27622/bin/twistd
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/twistd	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/twistd	2010-03-25 10:48:45.000000000 +0000
+@@ -10,6 +10,8 @@
+ import sys, os, string
+ if string.find(os.path.abspath(sys.argv[0]), os.sep+'Twisted') != -1:
+     sys.path.insert(0, os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), os.pardir, os.pardir)))
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ if hasattr(os, "getuid") and os.getuid() != 0:
+     sys.path.insert(0, os.path.abspath(os.getcwd()))
+ ### end of preamble
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/bin/words/im twisted-calendarserver-8.2.0.svn27622/bin/words/im
+--- twisted-calendarserver-8.2.0.svn27622.orig/bin/words/im	2009-04-08 21:56:55.000000000 +0000
++++ twisted-calendarserver-8.2.0.svn27622/bin/words/im	2010-03-25 10:46:19.000000000 +0000
+@@ -14,6 +14,8 @@
+         sys.path.insert(0, path)
+         break
+     path = os.path.dirname(path)
++else:
++    sys.path.insert(0, "/usr/lib/twisted-calendarserver/lib/python%s/site-packages" % (sys.version[:3]))
+ ### end of preamble
+ 
+ from twisted.words.scripts import im
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/patches/series
+++ twisted-calendarserver-8.2.0.svn27622/debian/patches/series
@@ -0,0 +1,2 @@
+twisted.python.filepath.patch
+twisted-path.patch
--- twisted-calendarserver-8.2.0.svn27622.orig/debian/patches/twisted.python.filepath.patch
+++ twisted-calendarserver-8.2.0.svn27622/debian/patches/twisted.python.filepath.patch
@@ -0,0 +1,12 @@
+diff -Naur twisted-calendarserver-8.2.0.svn27622.orig/twisted/python/filepath.py twisted-calendarserver-8.2.0.svn27622/twisted/python/filepath.py
+--- twisted-calendarserver-8.2.0.svn27622.orig/twisted/python/filepath.py	2009-12-01 02:37:58.000000000 +0530
++++ twisted-calendarserver-8.2.0.svn27622/twisted/python/filepath.py	2010-08-17 17:22:12.000000000 +0530
+@@ -339,6 +339,8 @@
+         return d
+ 
+     def child(self, path):
++        if isinstance(path, unicode):
++            path = path.encode('utf-8')
+         if platform.isWindows() and path.count(":"):
+             # Catch paths like C:blah that don't have a slash
+             raise InsecurePath("%r contains a colon." % (path,))
