[grass] 03/06: Reorder (build) dependencies.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Apr 10 00:42:52 UTC 2016


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

sebastic pushed a commit to branch master
in repository grass.

commit 84b86e7136bc9f3dcc4dfbd86205cce44b57b954
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 9 20:13:56 2016 +0200

    Reorder (build) dependencies.
---
 debian/control    | 40 ++++++++++++++++++++--------------------
 debian/control.in | 40 ++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/debian/control b/debian/control
index c8547eb..9aa7d54 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,14 @@ Section: science
 Priority: optional
 Build-Depends: autoconf2.13,
                autotools-dev,
+               bison,
                debhelper (>= 9),
                dh-python,
                doxygen,
                fakeroot,
                flex,
-               bison,
                graphviz,
-               libmotif-dev | lesstif2-dev,
+               libblas-dev,
                libcairo2-dev,
                libfftw3-dev,
                libfreetype6-dev,
@@ -21,33 +21,33 @@ Build-Depends: autoconf2.13,
                libgeos-dev,
                libglu1-mesa-dev,
                libjpeg-dev,
-               libpng-dev,
-               libtiff-dev,
+               liblapack-dev,
+               liblas-c-dev (>= 1.8.0-8~),
+               libmotif-dev | lesstif2-dev,
                libmysqlclient-dev,
                libncurses5-dev,
+               libnetcdf-dev,
+               libpng-dev,
                libpq-dev,
                libproj-dev,
-# proj-bin needed for nad2bin during config
-               proj-bin,
                libreadline-dev,
                libsqlite3-dev,
+               libtiff-dev,
                libwxgtk3.0-dev,
                libxmu-dev,
+               netcdf-bin,
 # install optipng if compressing the PNG images in the programmers' manual
 #              optipng,
+# proj-bin needed for nad2bin during config
+               proj-bin,
                python,
-               python-wxgtk3.0,
                python-dev,
                python-numpy,
-               python-ply,
                python-pil,
-               libnetcdf-dev,
-               netcdf-bin,
-               libblas-dev,
-               liblapack-dev,
+               python-ply,
+               python-wxgtk3.0,
                unixodbc-dev,
-               zlib1g-dev,
-               liblas-c-dev (>= 1.8.0-8~)
+               zlib1g-dev
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git
@@ -125,11 +125,11 @@ Description: GRASS GIS core components
 Package: grass-gui
 Architecture: any
 Depends: grass-core,
-         ${python:Depends},
-         python-wxgtk3.0,
 # pyGL needed for wxNviz
          python-opengl,
+         python-wxgtk3.0,
          xterm | x-terminal-emulator,
+         ${python:Depends},
          ${misc:Depends}
 Recommends:
 # gs needed for wxPsmap PDF export
@@ -179,8 +179,8 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         libjs-jquery
+Depends: libjs-jquery,
+         ${misc:Depends}
 Suggests: grass
 Conflicts: grass70-dev-doc,
            grass7-dev-doc
@@ -204,10 +204,10 @@ Architecture: any
 Depends: grass-core (= ${binary:Version}),
 # fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2
          fakeroot,
-         libproj-dev,
-         libgdal-dev,
          libfreetype6-dev,
+         libgdal-dev,
          libpq-dev,
+         libproj-dev,
          python,
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index cf58ecc..8460f19 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,14 +6,14 @@ Section: science
 Priority: optional
 Build-Depends: autoconf2.13,
                autotools-dev,
+               bison,
                debhelper (>= 9),
                dh-python,
                doxygen,
                fakeroot,
                flex,
-               bison,
                graphviz,
-               libmotif-dev | lesstif2-dev,
+               libblas-dev,
                libcairo2-dev,
                libfftw3-dev,
                libfreetype6-dev,
@@ -21,33 +21,33 @@ Build-Depends: autoconf2.13,
                libgeos-dev,
                libglu1-mesa-dev,
                libjpeg-dev,
-               libpng-dev,
-               libtiff-dev,
+               liblapack-dev,
+               liblas-c-dev (>= 1.8.0-8~),
+               libmotif-dev | lesstif2-dev,
                libmysqlclient-dev,
                libncurses5-dev,
+               libnetcdf-dev,
+               libpng-dev,
                libpq-dev,
                libproj-dev,
-# proj-bin needed for nad2bin during config
-               proj-bin,
                libreadline-dev,
                libsqlite3-dev,
+               libtiff-dev,
                libwxgtk3.0-dev,
                libxmu-dev,
+               netcdf-bin,
 # install optipng if compressing the PNG images in the programmers' manual
 #              optipng,
+# proj-bin needed for nad2bin during config
+               proj-bin,
                python,
-               python-wxgtk3.0,
                python-dev,
                python-numpy,
-               python-ply,
                python-pil,
-               libnetcdf-dev,
-               netcdf-bin,
-               libblas-dev,
-               liblapack-dev,
+               python-ply,
+               python-wxgtk3.0,
                unixodbc-dev,
-               zlib1g-dev,
-               liblas-c-dev (>= 1.8.0-8~)
+               zlib1g-dev
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/grass.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/grass.git
@@ -125,11 +125,11 @@ Description: GRASS GIS core components
 Package: grass-gui
 Architecture: any
 Depends: grass-core,
-         ${python:Depends},
-         python-wxgtk3.0,
 # pyGL needed for wxNviz
          python-opengl,
+         python-wxgtk3.0,
          xterm | x-terminal-emulator,
+         ${python:Depends},
          ${misc:Depends}
 Recommends:
 # gs needed for wxPsmap PDF export
@@ -179,8 +179,8 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends},
-         libjs-jquery
+Depends: libjs-jquery,
+         ${misc:Depends}
 Suggests: grass
 Conflicts: grass at VERSION@-dev-doc,
            grass7-dev-doc
@@ -204,10 +204,10 @@ Architecture: any
 Depends: grass-core (= ${binary:Version}),
 # fakeroot used by patches/htmlgen-fakeroot; see changelog entry for 5.7.0+6.0.0beta2-2
          fakeroot,
-         libproj-dev,
-         libgdal-dev,
          libfreetype6-dev,
+         libgdal-dev,
          libpq-dev,
+         libproj-dev,
          python,
          ${shlibs:Depends},
          ${misc:Depends}

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



More information about the Pkg-grass-devel mailing list