[DebianGIS-dev] [SCM] gsdview branch, master, updated. upstream/0.6.4-6-g1c04141

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 7e5f995aa047bde626147fa861309f49e63b2002
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Thu Jan 6 10:41:51 2011 +0100

    Now python packages are installed as private application packages

diff --git a/debian/patches/no-setuptools.patch b/debian/patches/no-setuptools.patch
new file mode 100644
index 0000000..fbbbbe2
--- /dev/null
+++ b/debian/patches/no-setuptools.patch
@@ -0,0 +1,11 @@
+Don't use setuptools in setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -42,6 +42,7 @@
+ from distutils import log
+ from distutils.command.build import build as Build
+ try:
++    raise ImportError
+     from setuptools import setup, find_packages
+     from setuptools.command.install_lib import install_lib
+     has_setuptools = True
diff --git a/debian/patches/series b/debian/patches/series
index 63df08e..d3836f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-manifest.patch
+no-setuptools.patch
diff --git a/debian/rules b/debian/rules
index 2a9bc28..573f88c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,13 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 DEB_COMPRESS_EXCLUDE += .txt .pdf .inv .ico .js
+DEB_PYTHON_INSTALL_ARGS_ALL += --install-lib=/usr/share/$(DEB_SOURCE_PACKAGE)
+
 
 install/gsdview::
 	find $(DEB_DESTDIR) -name 'LICENSE.txt' -delete
 	find $(DEB_DESTDIR) -name 'jquery.js*' -delete
 	dh_link /usr/share/javascript/jquery/jquery.js usr/share/doc/gsdview/html/_static/jquery.js
+
+	mv $(DEB_DESTDIR)/usr/bin/gsdview $(DEB_DESTDIR)/usr/share/$(DEB_SOURCE_PACKAGE)/gsdviewer
+	dh_link /usr/share/$(DEB_SOURCE_PACKAGE)/gsdviewer usr/bin/gsdview

-- 
Geo-Spatial Data Viewer