From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 25 Sep 2013 16:35:11 +0000 (+0200)
Subject: Merge branch 'master' of git.onelab.eu:/git/myslice
X-Git-Tag: myslice-0.2-4
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=c6bb9886f7fa0a6e804eb46b5fbb6479bae14b36;hp=ddf0f334a01046d2e1f9a40ae757a2fbfafa4853

Merge branch 'master' of git.onelab.eu:/git/myslice
---

diff --git a/myslice.spec b/myslice.spec
index 1c7bf540..e0504ea4 100644
--- a/myslice.spec
+++ b/myslice.spec
@@ -1,6 +1,6 @@
 %define name myslice
 %define version 0.2
-%define taglevel 3
+%define taglevel 4
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -47,6 +47,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/myslice/*
 
 %changelog
+* Wed Sep 25 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myslice-0.2-4
+- move to bootstrap v3 complete - hopefully
+- static files directory is now plain static/
+- templates files directory is now plain templates/
+- packaging for debian should be working fine, using apache+wsgi
+
 * Fri Sep 20 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myslice-0.2-3
 - checkpoint for deployment on test.myslice.info