Merge branch 'django-base-library-master-tmp'

README

@@ -1 +1 @@
-documentation for djangobaselibrary
+documentation for browsecap

djangobaselibrary/sample/admin.py → browsecap/sample/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from djangobaselibrary.sample.models import Spam, Type
+from browsecap.sample.models import Spam, Type
 
 admin.site.register([Spam, Type])
 

djangobaselibrary/sample/migrations/0001_initial.py → browsecap/sample/migrations/0001_initial.py

@@ -1,11 +1,11 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 '''
 created via:
-./djangobaseproject/manage.py startmigration djangobaselibrary.sample initial
+./proj/manage.py startmigration browsecap.sample initial
 '''
 
 class Migration:

djangobaselibrary/sample/migrations/0002_create_spam.py → browsecap/sample/migrations/0002_create_spam.py

@@ -1,11 +1,11 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 '''
 created via:
-./djangobaseproject/manage.py startmigration sample create_spam --model Spam
+./proj/manage.py startmigration sample create_spam --model Spam
 '''
 
 class Migration:

djangobaselibrary/sample/migrations/0003_add_spam_count.py → browsecap/sample/migrations/0003_add_spam_count.py

@@ -1,11 +1,11 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 '''
 created via:
-./djangobaseproject/manage.py startmigration sample add_spam_count --add-field Spam.count
+./proj/manage.py startmigration sample add_spam_count --add-field Spam.count
 '''
 
 class Migration:

djangobaselibrary/sample/migrations/0004_freeze.py → browsecap/sample/migrations/0004_freeze.py

@@ -1,11 +1,11 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 '''
 created via:
-./djangobaseproject/manage.py startmigration sample freeze --freeze sample
+./proj/manage.py startmigration sample freeze --freeze sample
 '''
 
 class Migration:

djangobaselibrary/sample/migrations/0005_add_unique_together.py → browsecap/sample/migrations/0005_add_unique_together.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
     def forwards(self, orm):

djangobaselibrary/sample/migrations/0006_auto.py → browsecap/sample/migrations/0006_auto.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
 

djangobaselibrary/sample/migrations/0007_add_type.py → browsecap/sample/migrations/0007_add_type.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
 

djangobaselibrary/sample/migrations/0008_spam_unique_blank.py → browsecap/sample/migrations/0008_spam_unique_blank.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
 

djangobaselibrary/sample/migrations/0009_fk_to_int.py → browsecap/sample/migrations/0009_fk_to_int.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
 

djangobaselibrary/sample/migrations/0010_employee_custom_pks.py → browsecap/sample/migrations/0010_employee_custom_pks.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
 

djangobaselibrary/sample/migrations/0011_dummy_remove_add_pk.py → browsecap/sample/migrations/0011_dummy_remove_add_pk.py

@@ -1,7 +1,7 @@
 
 from south.db import db
 from django.db import models
-from djangobaselibrary.sample.models import *
+from browsecap.sample.models import *
 
 class Migration:
 

browsecap/sample/urls.py

@@ -0,0 +1,8 @@
+from django.conf.urls.defaults import *
+
+from browsecap.sample import views
+
+urlpatterns = patterns('',
+    url(r'^$', views.homepage, name='browsecap-homepage'),
+)
+

debian/README.Debian

@@ -1,2 +1,2 @@
-centrum-python-djangobaselibrary for debian
+centrum-python-browsecap for debian
 -------------------------------------------

debian/changelog

@@ -1,4 +1,4 @@
-centrum-python-djangobaselibrary (0.0.0) unstable; urgency=low
+centrum-python-browsecap (0.0.0) unstable; urgency=low
 
   * initial build
 

debian/control

@@ -1,12 +1,12 @@
-Source: centrum-python-djangobaselibrary
+Source: centrum-python-browsecap
 Section: python
 Priority: optional
 Maintainer: Jan Kral <jan.kral@centrumholdings.com>
 Uploaders: Ondrej Kohout <ondrej.kohout@centrumholdings.com>, Jakub Vysoky <jakub.vysoky@centrumholdings.com>, Lukas Linhart <lukas.linhart@centrumholdings.com>
 Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.2), python-dev, python-support (>= 0.3), python-setuptools, centrum-python-setuptoolsdummy
 Standards-Version: 3.7.2
 
-Package: centrum-python-djangobaselibrary
+Package: centrum-python-browsecap
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-django, python-docutils
 Description: django base library

setup.py

@@ -1,5 +1,5 @@
 from setuptools import setup, find_packages
-import djangobaselibrary
+import browsecap
 
 # all fields marked with TODO: REPLACE
 # must be filled with some meanigful values
@@ -9,7 +9,7 @@
 __versionstr__ = '.'.join(map(str, VERSION))
 
 setup(
-    name = 'djangobaselibrary',
+    name = 'browsecap',
     version = __versionstr__,
     description = 'Django Base Library', # TODO: REPLACE
     long_description = '\n'.join((

tests/example_project/settings/base.py

@@ -4,7 +4,7 @@
 
 import django
 
-import djangobaselibrary
+import browsecap
 
 import example_project
 

tests/example_project/settings/config.py

@@ -14,8 +14,8 @@
 DISABLE_CACHE_TEMPLATE = DEBUG
 
 DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = join(gettempdir(), 'djangobaselibrary_example_project.db')
-TEST_DATABASE_NAME =join(gettempdir(), 'test_djangobaselibrary_example_project.db')
+DATABASE_NAME = join(gettempdir(), 'browsecap_example_project.db')
+TEST_DATABASE_NAME =join(gettempdir(), 'test_browsecap_example_project.db')
 DATABASE_USER = ''
 DATABASE_PASSWORD = ''
 DATABASE_HOST = ''

tests/example_project/urls.py

@@ -5,7 +5,7 @@
     (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT, 'show_indexes': True }),
 
     # reverse url lookups
-#    (r'^', include('djangobaselibrary.sample.urls')),
+#    (r'^', include('browsecap.sample.urls')),
 
 )
 

tests/unit_project/settings/base.py

@@ -22,7 +22,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 )
 
-ROOT_URLCONF = 'djangobaselibrary.sample.urls'
+ROOT_URLCONF = 'browsecap.sample.urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -37,7 +37,7 @@
 )
 
 INSTALLED_APPS = (
-    'djangobaselibrary.sample',
+    'browsecap.sample',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',

tests/unit_project/settings/config.py

@@ -14,7 +14,7 @@
 
 
 DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = join(gettempdir(), 'djangobaselibrary_unit_project.db')
+DATABASE_NAME = join(gettempdir(), 'browsecap_unit_project.db')
 TEST_DATABASE_NAME =join(gettempdir(), 'test_unit_project.db')
 DATABASE_USER = ''
 DATABASE_PASSWORD = ''