This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit d9b5a3c525f6376eab1a7cf858d10debc539863d
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Feb 13 18:59:17 2015 +0100
Drop check4dev patch, rely on upstream check.
---
debian/changelog | 1 +
debian/patches/check4dev | 50 ------------------------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 671a668..f751d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
grass (7.0.0~rc2-1~exp2) UNRELEASED; urgency=medium
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
+ * Drop check4dev patch, rely on upstream check.
-- Bas Couwenberg <sebas...@debian.org> Tue, 10 Feb 2015 22:55:48 +0100
diff --git a/debian/patches/check4dev b/debian/patches/check4dev
deleted file mode 100644
index 3a3ce32..0000000
--- a/debian/patches/check4dev
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Check if we have the grass include and Make files
- GRASS 6 used a shell script for g.extension.
- GRASS 7 reimplemented the shell script in Python.
- .
- The original version of this patch was made by M. Hamish Bowman,
- and ported to Python by Bas Couwenberg.
-Author: M. Hamish Bowman <hamish.webm...@gmail.com>
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: not-needed
-
---- a/scripts/g.extension/g.extension.py
-+++ b/scripts/g.extension/g.extension.py
-@@ -122,6 +122,7 @@ import atexit
- import shutil
- import zipfile
- import tempfile
-+import subprocess
-
- from urllib2 import HTTPError
- from urllib import urlopen
-@@ -144,6 +145,20 @@ def check_progs():
- if not grass.find_program(prog, '--help'):
- grass.fatal(_("'%s' required. Please install '%s' first.") %
(prog, prog))
-
-+def check_pkg(pkg):
-+ process = subprocess.Popen(["dpkg-query", "-l", pkg],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+ output = process.communicate()[0]
-+
-+ installed = 0
-+ for line in output.split('\n'):
-+ result = re.match('^ii', line)
-+ if result:
-+ installed = 1
-+ break
-+
-+ if installed == 0:
-+ grass.fatal(_("This module requires the \"%s\" package.") % pkg)
-+
- # expand prefix to class name
- def expand_module_class_name(c):
- name = { 'd' : 'display',
-@@ -1014,6 +1029,8 @@ def main():
- # check dependecies
- if sys.platform != "win32":
- check_progs()
-+ # check if we have the grass include and Make files
-+ check_pkg("grass-dev")
-
- # manage proxies
- global PROXIES
diff --git a/debian/patches/series b/debian/patches/series
index 960e0e2..a7227ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
www-browser
pager
instdir
-check4dev
python-ctypes-ternary.patch
no-fail-html.patch
wxpy3.0-compat.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
