[doris] 05/05: Better handling of the 'install' Python package

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository doris.

commit 24197d7c58c02354b7a19ce1e8f7cf5bc40317af
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Aug 7 21:01:25 2017 +0000

    Better handling of the 'install' Python package
---
 debian/changelog                                   |  3 ++
 debian/patches/0007-drop-the-install-package.patch | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 +++
 4 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a879b06..e2ea8e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,10 +22,13 @@ doris (5.0.3~beta+dfsg-1) UNRELEASED; urgency=medium
     - refresh remaining patches
     - new 0005-fix-build.patch (Closes: #871231)
     - new 0006-remove-osr-from-dependencies.patch
+    - new 0007-drop-the-install-package.patch (do not install the Python
+      package named "install")
   * debiam/rules
     - update to new directory layout
     - dropped get-orig-source target (implemented via uscan)
     - set hardening options
+    - install the configuration script in /usr/share/doris
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Jan 2017 15:48:04 +0100
 
diff --git a/debian/patches/0007-drop-the-install-package.patch b/debian/patches/0007-drop-the-install-package.patch
new file mode 100644
index 0000000..6b62055
--- /dev/null
+++ b/debian/patches/0007-drop-the-install-package.patch
@@ -0,0 +1,32 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 7 Aug 2017 20:55:03 +0000
+Subject: drop the install package
+
+---
+ install/init_cfg.py | 2 ++
+ setup.py            | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/install/init_cfg.py b/install/init_cfg.py
+index a125057..29bf004 100644
+--- a/install/init_cfg.py
++++ b/install/init_cfg.py
+@@ -1,3 +1,5 @@
++#!/usr/bin/env python
++
+ import xml.etree.ElementTree as ET
+ import os
+ 
+diff --git a/setup.py b/setup.py
+index 5f55643..fb17780 100644
+--- a/setup.py
++++ b/setup.py
+@@ -3,7 +3,7 @@ from setuptools import setup
+ setup(
+     name='doris',
+     version='5.0.3',
+-    packages=['install', 'doris_stack', 'doris_stack.functions', 'doris_stack.main_code', 'prepare_stack'],
++    packages=['doris_stack', 'doris_stack.functions', 'doris_stack.main_code', 'prepare_stack'],
+     url='https://github.com/TUDelftGeodesy/Doris',
+     license='LICENSE.txt',
+     author='Gert Mulder',
diff --git a/debian/patches/series b/debian/patches/series
index 5914b6c..23bfa91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-csh-path.patch
 0005-fix-build.patch
 0006-remove-osr-from-dependencies.patch
+0007-drop-the-install-package.patch
diff --git a/debian/rules b/debian/rules
index 277afaf..e410ee1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,7 @@ override_dh_auto_install:
 
 	#dh_auto_install --sourcedirectory=doris_core -- INSTALLDIR=../debian/doris/usr/lib/doris
 	install -D --mode=0755 doris_core/doris debian/doris/usr/lib/doris
+
 	cp bin/* debian/doris/usr/share/doris
 	chmod 0755 debian/doris/usr/share/doris/*
 	rm -f debian/doris/usr/share/doris/README*
@@ -68,6 +69,9 @@ override_dh_auto_install:
 	install -D --mode=0644 bin/README_CSK.txt \
 		debian/doris/usr/share/doc/doris/README_CSK.txt
 
+	cp install/init_cfg.py install/*.xml debian/doris/usr/share/doris
+	chmod 0755 debian/doris/usr/share/doris/init_cfg.py
+
 	dh_auto_install
 
 	install -D --mode=0644 debian/overrides debian/doris/usr/share/lintian/overrides/doris

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/doris.git