From 235e6b33a9f1f21ab5a6f22fb2384bca67262cbe Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 26 Nov 2013 12:48:33 +0100
Subject: [PATCH] =?utf8?q?first=20attempt=20at=20using=20dh=20=E2=80=94bui?=
 =?utf8?q?ldsystem=3Dpython=5Fdistutils=20for=20packaging=20myslice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Makefile               |  2 +-
 debian/control         |  1 +
 debian/myslice.install |  2 +-
 debian/rules           |  2 +-
 debian/unfold.install  | 16 ++++++++--------
 setup.py               | 10 +++++-----
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 9f3a563b..3cc9c2b0 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ debian.source: force
 	rsync -a $(RPMTARBALL) $(DEBTARBALL)
 
 debian.package:
-	debuild -uc -us -b 
+	debuild --set-envvar PREFIX=/usr -uc -us -b
 
 debian.clean:
 	$(MAKE) -f debian/rules clean
diff --git a/debian/control b/debian/control
index 207b30dc..4a4eb059 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Section: misc
 Priority: optional
 Standards-Version: 3.9.2
 Build-Depends: devscripts, debhelper (>=7.0.50~), debconf, dpatch, python-setuptools, make, python-django
+X-Python-Version: >= 2.7
 
 Package: myslice
 Architecture: any
diff --git a/debian/myslice.install b/debian/myslice.install
index 5c36f726..e0c711dd 100644
--- a/debian/myslice.install
+++ b/debian/myslice.install
@@ -1 +1 @@
-usr/share/unfold/portal
+usr/lib*/python*/dist-packages/portal
diff --git a/debian/rules b/debian/rules
index b8796e6e..62e2bb6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,4 +2,4 @@
 # -*- makefile -*-
 
 %:
-	dh $@
+	dh $@ --with python2 --buildsystem=python_distutils
diff --git a/debian/unfold.install b/debian/unfold.install
index 53291581..5bf0af9a 100644
--- a/debian/unfold.install
+++ b/debian/unfold.install
@@ -1,12 +1,12 @@
+usr/lib*/python*/dist-packages/auth
+usr/lib*/python*/dist-packages/insert_above
+usr/lib*/python*/dist-packages/manifold
+usr/lib*/python*/dist-packages/plugins
+usr/lib*/python*/dist-packages/unfold
+usr/lib*/python*/dist-packages/ui
+usr/lib*/python*/dist-packages/myslice
+usr/lib*/python*/dist-packages/sample
 usr/share/unfold/static
 usr/share/unfold/templates
-usr/share/unfold/auth
-usr/share/unfold/insert_above
-usr/share/unfold/manifold
-usr/share/unfold/plugins
-usr/share/unfold/unfold
-usr/share/unfold/ui
-usr/share/unfold/myslice
-usr/share/unfold/sample
 manage.py usr/share/unfold/
 apache/myslice.conf /etc/apache2/sites-available
diff --git a/setup.py b/setup.py
index e902e32f..b9b1a751 100644
--- a/setup.py
+++ b/setup.py
@@ -15,10 +15,10 @@ packages= [ os.path.dirname(init) for init in (glob("*/__init__.py")+glob("*/*/_
 setup(packages = packages,
       scripts = [ 'apache/unfold-init-ssl.sh' ],
       data_files = [ 
-        ( 'static/js', glob ('static/js/*')),
-        ( 'static/css', glob ('static/css/*')),
-        ( 'static/img', glob ('static/img/*')),
-        ( 'static/fonts', glob ('static/fonts/*')),
-        ( 'templates', glob ('templates/*')),
+        ( '/usr/share/unfold/static/js', glob ('static/js/*')),
+        ( '/usr/share/unfold/static/css', glob ('static/css/*')),
+        ( '/usr/share/unfold/static/img', glob ('static/img/*')),
+        ( '/usr/share/unfold/static/fonts', glob ('static/fonts/*')),
+        ( '/usr/share/unfold/templates', glob ('templates/*')),
         ( 'apache', [ 'apache/myslice.conf' ]),
         ])
-- 
2.43.0