Merge branch 'master' into debian astakos/debian/v0.7.2
authorKostas Papadimitriou <kpap@grnet.gr>
Thu, 2 Aug 2012 17:14:55 +0000 (20:14 +0300)
committerKostas Papadimitriou <kpap@grnet.gr>
Thu, 2 Aug 2012 17:14:55 +0000 (20:14 +0300)
12 files changed:
snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ [deleted file]
snf-astakos-app/debian/changelog [new file with mode: 0644]
snf-astakos-app/debian/clean [new file with mode: 0644]
snf-astakos-app/debian/compat [new file with mode: 0644]
snf-astakos-app/debian/control [new file with mode: 0644]
snf-astakos-app/debian/copyright [new file with mode: 0644]
snf-astakos-app/debian/dirs [new file with mode: 0644]
snf-astakos-app/debian/gbp.conf [new file with mode: 0644]
snf-astakos-app/debian/pydist-overrides [new file with mode: 0644]
snf-astakos-app/debian/rules [new file with mode: 0755]
snf-astakos-app/debian/source/format [new file with mode: 0644]
snf-astakos-app/debian/source/include-binaries [new file with mode: 0644]

diff --git a/snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf~
deleted file mode 100644 (file)
index 50e2407..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-# Set the expiration time of newly created auth tokens
-# to be this many hours after their creation time.
-#ASTAKOS_AUTH_TOKEN_DURATION = 30 * 24
-
-# Authenticate via Twitter.
-#ASTAKOS_TWITTER_KEY = ''
-#ASTAKOS_TWITTER_SECRET = ''
-
-#ASTAKOS_DEFAULT_USER_LEVEL = 4
-
-#ASTAKOS_INVITATIONS_PER_LEVEL = {
-#    0   :   100,
-#    1   :   2,
-#    2   :   0,
-#    3   :   0,
-#    4   :   0
-#}
-
-# Address to use for outgoing emails
-#ASTAKOS_DEFAULT_FROM_EMAIL = 'GRNET Cloud <no-reply@grnet.gr>'
-#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@cloud.grnet.gr'
-#ASTAKOS_DEFAULT_ADMIN_EMAIL = 'admin@cloud.grnet.gr'
-
-# Identity Management enabled modules
-#ASTAKOS_IM_MODULES = ['local', 'twitter', 'shibboleth']
-
-# Force user profile verification
-#ASTAKOS_FORCE_PROFILE_UPDATE = True
-
-#Enable invitations
-#ASTAKOS_INVITATIONS_ENABLED = True
-
-#ASTAKOS_COOKIE_NAME = '_pithos2_a'
-#ASTAKOS_COOKIE_DOMAIN = None
-#ASTAKOS_COOKIE_SECURE = True
-
-#ASTAKOS_IM_STATIC_URL = '/static/im/'
-
-# If set to False and invitations not enabled newly created user will be 
-# automatically accepted
-#ASTAKOS_MODERATION_ENABLED = True
-
-# Set baseurl
-#ASTAKOS_BASEURL = 'http://pithos.dev.grnet.gr'
-
-# Set service name
-#ASTAKOS_SITENAME = 'GRNET Cloud'
-
-# Set cloud services appear in the horizontal bar
-#ASTAKOS_CLOUD_SERVICES = (
-#        { 'url':'/', 'name':'grnet cloud', 'id':'cloud', 'icon':'home-icon.png' },
-#        { 'url':'/okeanos.html', 'name':'~okeanos', 'id':'okeanos' },
-#        { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' })
-#
-
-# Set recaptcha keys
-# http://www.google.com/recaptcha/whyrecaptcha 
-#ASTAKOS_RECAPTCHA_PUBLIC_KEY = ''
-#ASTAKOS_RECAPTCHA_PRIVATE_KEY = ''
-ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'clean'}
-#ASTAKOS_RECAPTCHA_USE_SSL = True
-#ASTAKOS_RECAPTCHA_ENABLED = True
-
-# set AstakosUser fields to propagate in the billing system
-#ASTAKOS_BILLING_FIELDS = ['is_active']
-
-# Queue for billing.
-#'rabbitmq://guest:guest@localhost:5672/astakos'
-#QUEUE_CONNECTION = None 
-
-# Set where the user should be redirected after logout
-#ASTAKOS_LOGOUT_NEXT = ''
-
-# Set user email patterns that are automatically activated
-#ASTAKOS_RE_USER_EMAIL_PATTERNS = []
-
-# Messages to display on login page header
-# e.g. {'warning': 'This warning message will be displayed on the top of login page'}
-#ASTAKOS_LOGIN_MESSAGES = {}
-
-# messages to display as extra actions in account forms
-# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'}
-#ASTAKOS_PROFILE_EXTRA_LINKS = {}
-
diff --git a/snf-astakos-app/debian/changelog b/snf-astakos-app/debian/changelog
new file mode 100644 (file)
index 0000000..39f1983
--- /dev/null
@@ -0,0 +1,119 @@
+snf-astakos-app (0.7.2-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 02 Aug 2012 17:01:11 +0000
+
+snf-astakos-app (0.7.1-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Wed, 01 Aug 2012 13:51:06 +0300
+
+snf-astakos-app (0.7.0-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Wed, 01 Aug 2012 12:15:22 +0300
+
+snf-astakos-app (0.6.3-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 14 Jun 2012 14:24:41 +0300
+
+snf-astakos-app (0.6.2-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Tue, 12 Jun 2012 17:40:55 +0300
+
+snf-astakos-app (0.6.1-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Tue, 12 Jun 2012 16:45:49 +0300
+
+snf-astakos-app (0.6.0-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Mon, 11 Jun 2012 14:21:21 +0300
+
+snf-astakos-app (0.5.1-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Mon, 14 May 2012 13:42:08 +0300
+
+snf-astakos-app (0.5.0-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 03 May 2012 14:06:49 +0300
+
+snf-astakos-app (0.4.0-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Wed, 04 Apr 2012 14:49:35 +0300
+
+snf-astakos-app (0.3.8-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Wed, 28 Mar 2012 12:40:07 +0300
+
+snf-astakos-app (0.3.7-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 15 Mar 2012 19:58:47 +0200
+
+snf-astakos-app (0.3.6-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 15 Mar 2012 15:15:21 +0200
+
+snf-astakos-app (0.3.5-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 15 Mar 2012 13:38:39 +0200
+
+snf-astakos-app (0.3.4-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Tue, 13 Mar 2012 18:53:21 +0200
+
+snf-astakos-app (0.3.3-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 08 Mar 2012 17:31:07 +0200
+
+snf-astakos-app (0.3.2-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Mon, 05 Mar 2012 12:51:29 +0200
+
+snf-astakos-app (0.3.1-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 01 Mar 2012 13:48:09 +0200
+
+snf-astakos-app (0.3.0-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Fri, 24 Feb 2012 17:49:26 +0200
+
+snf-astakos-app (0.2-1) stable; urgency=low
+
+  * New upstream version.
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Fri, 22 Feb 2012 16:44:01 +0300
diff --git a/snf-astakos-app/debian/clean b/snf-astakos-app/debian/clean
new file mode 100644 (file)
index 0000000..f473cff
--- /dev/null
@@ -0,0 +1 @@
+snf_astakos_app.egg-info/*
diff --git a/snf-astakos-app/debian/compat b/snf-astakos-app/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
@@ -0,0 +1 @@
+8
diff --git a/snf-astakos-app/debian/control b/snf-astakos-app/debian/control
new file mode 100644 (file)
index 0000000..7de83e6
--- /dev/null
@@ -0,0 +1,21 @@
+Source: snf-astakos-app
+Section: python
+Priority: optional
+Maintainer: Vangelis Koukis <vkoukis@grnet.gr>
+Build-Depends: debhelper (>= 8), python-all (>= 2.5), snf-common
+Standards-Version: 3.9.2
+XS-Python-Version: >= 2.6
+Homepage: https://code.grnet.gr/projects/synnefo
+
+Package: snf-astakos-app
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+Recommends: snf-webproject
+XB-Python-Version: ${python:Versions}
+Description: Identity management, catalog and policy services.
+             Built by GRNET using Django (https://www.djangoproject.com/).
+             Learn more about Astakos at: http://code.grnet.gr/projects/astakos
+             Consult LICENSE for licensing information.
+
+
diff --git a/snf-astakos-app/debian/copyright b/snf-astakos-app/debian/copyright
new file mode 100644 (file)
index 0000000..18c41bc
--- /dev/null
@@ -0,0 +1,44 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co
+Upstream-Name: snf-astakos-app
+Upstream-Contact: GRNET development team <synnefo@lists.grnet.gr>
+Source: https://code.grnet.gr/projects/astakos
+
+Files: *
+Copyright: Copyright (C) 2011, 2012 GRNET S.A.
+Licence: BSD-2-clause
+
+Licence: BSD-2-clause
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ .
+ 1. Redistributions of source code must retain the above
+    copyright notice, this list of conditions and the following
+    disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials
+    provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ The views and conclusions contained in the software and
+ documentation are those of the authors and should not be
+ interpreted as representing official policies, either expressed
+ or implied, of GRNET S.A.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/BSD'.
diff --git a/snf-astakos-app/debian/dirs b/snf-astakos-app/debian/dirs
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/snf-astakos-app/debian/gbp.conf b/snf-astakos-app/debian/gbp.conf
new file mode 100644 (file)
index 0000000..4587f59
--- /dev/null
@@ -0,0 +1,9 @@
+[DEFAULT]
+sign-tags = False
+pristine-tar = False
+
+[git-buildpackage]
+export-dir = ../../build-area/
+tarball-dir = ../../tarballs/
+debian-branch = debian
+upstream-branch = master
diff --git a/snf-astakos-app/debian/pydist-overrides b/snf-astakos-app/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..94bbec6
--- /dev/null
@@ -0,0 +1,3 @@
+Django python-django
+httplib2 python-httplib2
+south python-django-south
diff --git a/snf-astakos-app/debian/rules b/snf-astakos-app/debian/rules
new file mode 100755 (executable)
index 0000000..bc1bfe0
--- /dev/null
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@ --with python2
+
+package=snf-astakos-app
+static_dir=debian/$(package)/usr/share/synnefo/static/
+astakos_static_dir=astakos/im/static/im/
+config_lvl=20
+
+override_dh_auto_install:
+       dh_auto_install
+       
+       mkdir -p $(static_dir)im;
+       -mv $(astakos_static_dir) $(static_dir);
+       
+       mkdir -p debian/$(package)/etc/synnefo
+       -mv conf/*.conf debian/$(package)/etc/synnefo
+
diff --git a/snf-astakos-app/debian/source/format b/snf-astakos-app/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/snf-astakos-app/debian/source/include-binaries b/snf-astakos-app/debian/source/include-binaries
new file mode 100644 (file)
index 0000000..8511f74
--- /dev/null
@@ -0,0 +1,28 @@
+astakos/im/static/im/cloudbar/home-icon.png
+astakos/im/static/im/images/accounts-logo.png
+astakos/im/static/im/images/arrow-down.png
+astakos/im/static/im/images/checkbox.png
+astakos/im/static/im/images/service_okeanos_logo.png
+astakos/im/static/im/images/local.png
+astakos/im/static/im/images/porta.png
+astakos/im/static/im/images/dashed_border.png
+astakos/im/static/im/images/arrow-white.png
+astakos/im/static/im/images/openid.png
+astakos/im/static/im/images/arrow-white-reverse.png
+astakos/im/static/im/images/arrow-lt.png
+astakos/im/static/im/images/symbols.png
+astakos/im/static/im/images/banner.png
+astakos/im/static/im/images/twitter.png
+astakos/im/static/im/images/arrow-up.png
+astakos/im/static/im/images/refresh_g.png
+astakos/im/static/im/images/sound_lg.png
+astakos/im/static/im/images/sound_g.png
+astakos/im/static/im/images/refresh_lg.png
+astakos/im/static/im/images/pictures/login_pic.png
+astakos/im/static/im/images/pictures/accounts_3.png
+astakos/im/static/im/images/pictures/signup_pic.png
+astakos/im/static/im/images/shibboleth.png
+astakos/im/static/im/images/service_pithos_logo.png
+astakos/im/static/im/images/question-mark.jpg
+astakos/im/static/im/images/arrow_01.jpg
+astakos/im/static/im/images/black-line.jpg