Merge branch 'master' of git://github.com/svetlyak40wt/django-compress

This fixes:
* Missing MANIFEST.in file
* A bug with Django > r9110 with duplicated verbosity in synccompress
* Name in setup.py should be django-compress and not compress

git-svn-id: https://django-compress.googlecode.com/svn/trunk@83 98d35234-f74b-0410-9e22-51d878bdf110

.gitignore

@@ -3,3 +3,7 @@
 :2e_*
 /build
 *.tmproj
+.*.swp
+build
+dist
+MANIFEST

MANIFEST.in

+recursive-include compress/templates *.html

compress/management/commands/synccompress.py

@@ -6,9 +6,6 @@ from django.conf import settings
 class Command(NoArgsCommand):
     option_list = NoArgsCommand.option_list + (
         make_option('--force', action='store_true', default=False, help='Force update of all files, even if the source files are older than the current compressed file.'),
-        make_option('--verbosity', action='store', dest='verbosity', default='1',
-            type='choice', choices=['0', '1', '2'],
-            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
     )
     help = 'Updates and compresses CSS and JavsScript on-demand, without restarting Django'
     args = ''
@@ -50,4 +47,12 @@ class Command(NoArgsCommand):
                 filter_js(js, verbosity)
 
             if (force or u) or verbosity >= 2:
-                print
+                print
\ No newline at end of file
+
+# Backwards compatibility for Django r9110
+if not [opt for opt in Command.option_list if opt.dest=='verbosity']:
+    Command.option_list += (
+    make_option('--verbosity', '-v', action="store", dest="verbosity",
+        default='1', type='choice', choices=['0', '1', '2'],
+        help="Verbosity level; 0=minimal output, 1=normal output, 2=all output"),
+    )

setup.py

@@ -24,8 +24,8 @@ for dirpath, dirnames, filenames in os.walk('compress'):
             data_files.append(os.path.join(prefix, f))
 
 setup(
-	name='compress',
-	version='0.1-svn',
+	name='django-compress',
+	version='0.1.1',
 	description='django-compress provides an automated system for compressing CSS and JavaScript files',
 	author='Andreas Pelme',
 	author_email='Andreas Pelme <andreas@pelme.se>',