[pywps] 01/02: Install copy of usr/bin/pywps as usr/lib/cgi-bin/wps.py instead of symlink.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pywps.

commit 38c1d2164768fb7c8420f52ed8de3c29b92bbb36
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 14 23:02:03 2016 +0200

    Install copy of usr/bin/pywps as usr/lib/cgi-bin/wps.py instead of symlink.
    
    Drop pywps dependency from pywps-cgi to break circular dependency.
---
 debian/changelog         | 8 ++++++++
 debian/control           | 2 +-
 debian/pywps-cgi.install | 1 +
 debian/pywps-cgi.links   | 1 -
 debian/rules             | 2 ++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb57757..b44c86e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pywps (3.2.5-2) UNRELEASED; urgency=medium
+
+  * Install copy of usr/bin/pywps as usr/lib/cgi-bin/wps.py instead of symlink.
+  * Drop pywps dependency from pywps-cgi to break circular dependency.
+    (closes: #827307)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 14 Jun 2016 22:57:42 +0200
+
 pywps (3.2.5-1) unstable; urgency=medium
 
   * Import pywps packaging from OSGeo-Live.
diff --git a/debian/control b/debian/control
index dedf6e3..6ce6238 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Package: pywps-cgi
 Architecture: all
 Section: web
 Depends: apache2 | httpd-cgi,
-         pywps,
+         python,
          ${misc:Depends}
 Recommends: ${misc:Recommends}
 Description: Implementation of OGC's Web Processing Service - CGI script
diff --git a/debian/pywps-cgi.install b/debian/pywps-cgi.install
index 6d88813..5c4a5ac 100644
--- a/debian/pywps-cgi.install
+++ b/debian/pywps-cgi.install
@@ -1 +1,2 @@
 debian/pywps-cgi.cfg etc/pywps/
+usr/lib/cgi-bin
diff --git a/debian/pywps-cgi.links b/debian/pywps-cgi.links
deleted file mode 100644
index 0c384c5..0000000
--- a/debian/pywps-cgi.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/pywps usr/lib/cgi-bin/wps.py
diff --git a/debian/rules b/debian/rules
index f9a46dd..56af31e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,8 @@ override_dh_auto_test:
 override_dh_auto_install:
 	dh_auto_install
 
+	mkdir -p debian/tmp/usr/lib/cgi-bin
+	cp debian/tmp/usr/bin/wps.py debian/tmp/usr/lib/cgi-bin/
 	mv debian/tmp/usr/bin/wps.py debian/tmp/usr/bin/pywps
 
 override_dh_install:

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