From 506e48b2e0603834e2e14762febe9207d6388bfd Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 18 Oct 2010 12:13:37 +0200
Subject: [PATCH] v1.1.0

--HG--
branch : py3k
---
 CHANGES  | 14 +++++++++++---
 README   | 10 +++-------
 setup.py |  6 ++++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/CHANGES b/CHANGES
index 754dbe9..0b2be57 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,14 +1,22 @@
+Changes
+=======
+
+Version 1.1.0 -- 2010/10/18
+---------------------------
+
+* Converted compiled modules to ctypes so that cross-platform compilation isn't necessary anymore.
+
 Version 1.0.2 -- 2010/07/10
----
+---------------------------
 
 * Fixed bugs with external volumes in plat_other.
 
 Version 1.0.1 -- 2010/04/19
----
+---------------------------
 
 * Fixed memory leak in OS X module.
 
 Version 1.0.0 -- 2010/04/07
----
+---------------------------
 
 * Initial Release
\ No newline at end of file
diff --git a/README b/README
index d623f49..0e780d5 100644
--- a/README
+++ b/README
@@ -7,18 +7,14 @@ This is a Python 3 package. The Python 2 package is at http://pypi.python.org/py
 Send2Trash is a small package that sends files to the Trash (or Recycle Bin) *natively* and on
 *all platforms*. On OS X, it uses native ``FSMoveObjectToTrashSync`` Cocoa calls, on Windows, it uses native (and ugly) ``SHFileOperation`` win32 calls. On other platforms, it moves the file to the first folder it finds that looks like a trash (so far, it's known to work on Ubuntu).
 
+``ctypes`` is used to access native libraries, so no compilation is necessary.
+
 Installation
 ------------
 
 Download the source from http://hg.hardcoded.net/send2trash and install it with::
 
->>> sudo python setup.py install
-
-On Windows, you'll need Visual Studio 2008 to compile it. Note that the install you'll get will not be a "universal" package. If you install it on OS X, only the "osx" module will be compiled, and if you install it on Windows, only the "win" module will be compiled.
-
-To have a cross-platform package you can ship around, you'll have compile the package on both platforms and merge the results so that both compiled modules are in the same package.
-
-There's no package available on PyPI because packages produced by setuptools/distribute are all crappy (god I hate packaging). That's, I think, because I look at ``sys.platform`` to determine which of the extension module (if any) has to be built. However, when I create a ``sdist``, only the module of the platform I build it on is included in the source package. I don't know how to go around that and configuring that ``setup()`` function is hell. Just download the source from the repo.
+>>> python setup.py install
 
 Usage
 -----
diff --git a/setup.py b/setup.py
index 524e909..0bc4a8b 100644
--- a/setup.py
+++ b/setup.py
@@ -16,9 +16,11 @@ CLASSIFIERS = [
     'Topic :: Desktop Environment :: File Managers',
 ]
 
+LONG_DESCRIPTION = open('README', 'rt').read() + '\n\n' + open('CHANGES', 'rt').read()
+
 setup(
     name='Send2Trash3k',
-    version='1.0.2',
+    version='1.1.0',
     author='Hardcoded Software',
     author_email='hsoft@hardcoded.net',
     packages=['send2trash'],
@@ -26,7 +28,7 @@ setup(
     url='http://hg.hardcoded.net/send2trash/',
     license='BSD License',
     description='Send file to trash natively under Mac OS X, Windows and Linux.',
-    long_description=open('README').read(),
+    long_description=LONG_DESCRIPTION,
     classifiers=CLASSIFIERS,
     zip_safe=False,
 )
\ No newline at end of file