Merge branch 'master' into debian

Conflicts:
	version

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..c8cd91a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,83 @@
+snf-cloudcms (0.7.3-2) stable; urgency=low
+
+  * Fix permissions for conf files/dir
+
+ -- Stratos Psomadakis <psomas@grnet.gr>  Tue, 16 Oct 2012 18:15:20 +0300
+
+snf-cloudcms (0.7.3-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Mon, 06 Aug 2012 16:43:49 +0300
+
+snf-cloudcms (0.7.2-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Mon, 06 Aug 2012 16:01:29 +0300
+
+snf-cloudcms (0.7.1-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 02 Aug 2012 20:55:21 +0300
+
+snf-cloudcms (0.7.0-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Tue, 31 Jul 2012 21:51:15 +0300
+
+snf-cloudcms (0.6.1-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Mon, 02 Apr 2012 18:29:52 +0300
+
+snf-cloudcms (0.6-2) stable; urgency=low
+
+  * New debian version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 29 Mar 2012 15:58:22 +0300
+
+snf-cloudcms (0.6-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Wed, 28 Mar 2012 12:10:41 +0300
+
+snf-cloudcms (0.5.2-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 15 Mar 2012 15:02:27 +0200
+
+snf-cloudcms (0.5.1-1) stable; urgency=low
+
+  * New upstream version 
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 15 Mar 2012 13:44:53 +0200
+
+snf-cloudcms (0.4.1-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Tue, 13 Mar 2012 19:36:22 +0200
+
+snf-cloudcms (0.4-1) stable; urgency=low
+
+  * New upstream version.
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Tue, 13 Mar 2012 13:04:36 +0200
+
+snf-cloudcms (0.3-1) stable; urgency=low
+
+  * New upstream version.
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Thu, 08 Mar 2012 14:44:41 +0200
+
+snf-cloudcms (0.1-1) stable; urgency=low
+
+  * New upstream version.
+
+ -- Kostas Papadimitriou <kpap@grnet.gr>  Fri, 22 Feb 2012 16:44:01 +0300

diff --git a/debian/clean b/debian/clean
new file mode 100644 (file)
index 0000000..3c1cb46
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+snf_cloudcms.egg-info/*

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..1301f35
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,17 @@
+Source: snf-cloudcms
+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-cloudcms
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+Recommends: snf-webproject
+XB-Python-Version: ${python:Versions}
+Description: CMS application based on django and django-feincms
+

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..1312e02
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co
+Upstream-Name: snf-cloudcms
+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/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644 (file)
index 0000000..06a5874
--- /dev/null
+++ b/debian/gbp.conf
@@ -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/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644 (file)
index 0000000..6625896
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,7 @@
+Django python-django
+south python-django-south
+feincms python-django-feincms
+django-pagination python-django-pagination
+pil python-imaging
+lxml python-lxml
+docutils python-docutils

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..8a26a35
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+%:
+       dh $@ --with python2
+
+package=snf-cloudcms
+static_dir=debian/$(package)/usr/share/synnefo/static/
+package_static_dir=cloudcms/static/cloudcms/
+resources_static_dir=cloudcmsresources/static/cloudcmsresources/
+
+override_dh_auto_install:
+       dh_auto_install
+       
+       mkdir -p $(static_dir)
+       -mv $(package_static_dir) $(static_dir)
+
+       mkdir -p $(static_dir)
+       -mv $(resources_static_dir) $(static_dir)
+
+       mkdir -p debian/$(package)/etc/synnefo
+       -mv conf/*.conf debian/$(package)/etc/synnefo
+
+override_dh_fixperms:
+       dh_fixperms
+       chmod 0640 debian/$(package)/etc/synnefo/*
+       chmod 0750 debian/$(package)/etc/synnefo
+       chown -R root:www-data debian/$(package)/etc/synnefo

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644 (file)
index 0000000..c88610c
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,98 @@
+cloudcms/static/cloudcms/css/uniform.default.css
+cloudcms/static/cloudcms/css/boxsizing.htc
+cloudcms/static/cloudcms/css/print.css
+cloudcms/static/cloudcms/css/max768.css
+cloudcms/static/cloudcms/css/browser-fixes.css
+cloudcms/static/cloudcms/css/custom.css
+cloudcms/static/cloudcms/css/ie7.css
+cloudcms/static/cloudcms/css/max960.css
+cloudcms/static/cloudcms/css/jquery-ui-1.8.21.custom.css
+cloudcms/static/cloudcms/css/formating.css
+cloudcms/static/cloudcms/css/dropkick.css
+cloudcms/static/cloudcms/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
+cloudcms/static/cloudcms/css/images/ui-icons_2e83ff_256x240.png
+cloudcms/static/cloudcms/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+cloudcms/static/cloudcms/css/images/ui-icons_222222_256x240.png
+cloudcms/static/cloudcms/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+cloudcms/static/cloudcms/css/images/ui-bg_glass_75_dadada_1x400.png
+cloudcms/static/cloudcms/css/images/ui-bg_glass_65_ffffff_1x400.png
+cloudcms/static/cloudcms/css/images/ui-icons_888888_256x240.png
+cloudcms/static/cloudcms/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+cloudcms/static/cloudcms/css/images/ui-icons_454545_256x240.png
+cloudcms/static/cloudcms/css/images/ui-icons_cd0a0a_256x240.png
+cloudcms/static/cloudcms/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+cloudcms/static/cloudcms/css/images/ui-bg_glass_75_ffffff_1x400.png
+cloudcms/static/cloudcms/css/forms.css
+cloudcms/static/cloudcms/css/max480.css
+cloudcms/static/cloudcms/css/modules.css
+cloudcms/static/cloudcms/css/global.css
+cloudcms/static/cloudcms/css/colorbox.css
+cloudcms/static/cloudcms/images/documentation.png
+cloudcms/static/cloudcms/images/cloud_03.png
+cloudcms/static/cloudcms/images/arrow_02.jpg
+cloudcms/static/cloudcms/images/dots.jpg
+cloudcms/static/cloudcms/images/_cloud_01.png
+cloudcms/static/cloudcms/images/synnefo-overview.png
+cloudcms/static/cloudcms/images/arrow_03.xcf
+cloudcms/static/cloudcms/images/loading.gif
+cloudcms/static/cloudcms/images/checkbox.png
+cloudcms/static/cloudcms/images/cloud_01_top.png
+cloudcms/static/cloudcms/images/double-dots-unequal.jpg
+cloudcms/static/cloudcms/images/question-mark.jpg
+cloudcms/static/cloudcms/images/bullet_01.png
+cloudcms/static/cloudcms/images/bullet_02.png
+cloudcms/static/cloudcms/images/arrow_01.jpg
+cloudcms/static/cloudcms/images/cloud_03_top.png
+cloudcms/static/cloudcms/images/dashed_border.png
+cloudcms/static/cloudcms/images/arrow-white.png
+cloudcms/static/cloudcms/images/_shadow_03.png
+cloudcms/static/cloudcms/images/_cloud_03.png
+cloudcms/static/cloudcms/images/arrow_03.jpg
+cloudcms/static/cloudcms/images/video_image_hover.png
+cloudcms/static/cloudcms/images/symbols.png
+cloudcms/static/cloudcms/images/teno.jpg
+cloudcms/static/cloudcms/images/_shadow_02.png
+cloudcms/static/cloudcms/images/resource_down_arrow-active.png
+cloudcms/static/cloudcms/images/_cloud_02_top.png
+cloudcms/static/cloudcms/images/video_image.png
+cloudcms/static/cloudcms/images/double-dots.jpg
+cloudcms/static/cloudcms/images/cloud_02_top.png
+cloudcms/static/cloudcms/images/shadow_03.png
+cloudcms/static/cloudcms/images/temp2.jpg
+cloudcms/static/cloudcms/images/pithos_expand.png
+cloudcms/static/cloudcms/images/resource_down_arrow.png
+cloudcms/static/cloudcms/images/shadow_01.png
+cloudcms/static/cloudcms/images/_cloud_03_top.png
+cloudcms/static/cloudcms/images/black-line.jpg
+cloudcms/static/cloudcms/images/cloud_02.png
+cloudcms/static/cloudcms/images/cloud_01.png
+cloudcms/static/cloudcms/images/colorbox/loading.gif
+cloudcms/static/cloudcms/images/colorbox/controls.png
+cloudcms/static/cloudcms/images/double-dots.xcf
+cloudcms/static/cloudcms/images/arrow_01-yellow.jpg
+cloudcms/static/cloudcms/images/_cloud_01_top.png
+cloudcms/static/cloudcms/images/blog-dots.jpg
+cloudcms/static/cloudcms/images/shadow_02.png
+cloudcms/static/cloudcms/images/_shadow_01.png
+cloudcms/static/cloudcms/images/temp.jpg
+cloudcms/static/cloudcms/images/_cloud_02.png
+cloudcms/static/cloudcms/images/black-line.xcf
+cloudcms/static/cloudcms/js/jquery.infieldlabel.js
+cloudcms/static/cloudcms/js/client-downloads.js
+cloudcms/static/cloudcms/js/modernizr-2.0.6.js
+cloudcms/static/cloudcms/js/html5shiv-printshiv.js
+cloudcms/static/cloudcms/js/underscore.js
+cloudcms/static/cloudcms/js/jquery.dropkick-1.0.0.js
+cloudcms/static/cloudcms/js/jquery.tablesorter.js
+cloudcms/static/cloudcms/js/os.js
+cloudcms/static/cloudcms/js/forms.js
+cloudcms/static/cloudcms/js/jquery.colorbox.js
+cloudcms/static/cloudcms/js/jquery-1.7.1.min.js
+cloudcms/static/cloudcms/js/resources_list.js
+cloudcms/static/cloudcms/js/jqModal.js
+cloudcms/static/cloudcms/js/jquery-ui-1.8.21.custom.min.js
+cloudcms/static/cloudcms/js/common.js
+cloudcms/static/cloudcms/js/twitter/ba-linkify.js
+cloudcms/static/cloudcms/js/twitter/jquery.twitter.js
+cloudcms/static/cloudcms/js/twitter/jquery.timeago.js
+cloudcmsresources/static/cloudcmsresources/js/resources_list.js