From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 3 May 2013 16:14:57 +0000 (+0200)
Subject: deb pkg ctd
X-Git-Tag: myslice-0.2-1~133
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=17a3607447bf4599160cdc920c50b80e7f481da8

deb pkg ctd
---

diff --git a/Makefile b/Makefile
index 781a85d0..35538551 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@ build: static templates
 
 install: 
 	python setup.py install \
-	    --install-purelib=$(DESTDIR)/$(datadir)/myslice \
-	    --install-scripts=$(DESTDIR)/$(datadir)/myslice \
-	    --install-data=$(DESTDIR)/$(datadir)/myslice
+	    --install-purelib=$(DESTDIR)/$(datadir)/unfold \
+	    --install-scripts=$(DESTDIR)/$(datadir)/unfold \
+	    --install-data=$(DESTDIR)/$(datadir)/unfold
 
 ####################
 # general stuff
@@ -164,6 +164,7 @@ RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 # putting it together
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
+##### convenience for development only, push code on a specific test box
 # xxx until we come up with a packaging this is going to be a wild guess
 # on debian04 I have stuff in /usr/share/myslice and a symlink in /root/myslice
 #INSTALLED=/usr/share/myslice
diff --git a/debian/myslice.install b/debian/myslice.install
index 93b0ce59..03975ed3 100644
--- a/debian/myslice.install
+++ b/debian/myslice.install
@@ -1 +1 @@
-usr/lib*/python*/site-packages/unfold/plugins
+usr/share/unfold/plugins
diff --git a/debian/unfold.install b/debian/unfold.install
index 13a05e49..02fa3c55 100644
--- a/debian/unfold.install
+++ b/debian/unfold.install
@@ -1,2 +1,9 @@
-usr/lib*/python*/site-packages/unfold/unfold
-usr/lib*/python*/site-packages/unfold/engine
+usr/share/unfold/all-static
+usr/share/unfold/all-templates
+usr/share/unfold/apache
+usr/share/unfold/auth
+usr/share/unfold/insert_above
+usr/share/unfold/manifold
+usr/share/unfold/plugins
+usr/share/unfold/unfold
+usr/share/unfold/views
diff --git a/setup.py b/setup.py
index d6b487e8..8783260a 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ import os.path
 from glob import glob
 from distutils.core import setup
 
-# we don't have a final list os let's keep it simple for now
+# we don't have a final list so let's keep it simple for now
 packages= [ os.path.dirname(init) for init in (glob("*/__init__.py")+glob("*/*/__init__.py")) ]
 
 setup(packages = packages,