[grass] 04/20: Restructure control file with cme, remove duplice section 'science', add ${misc:Depends} for grass.

Bas Couwenberg sebastic at xs4all.nl
Wed Sep 3 22:27:15 UTC 2014


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

sebastic-guest pushed a commit to branch master
in repository grass.

commit 7a07c611fcef9512a1375f545978db14a4a5caf6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Aug 20 05:00:57 2014 +0200

    Restructure control file with cme, remove duplice section 'science', add ${misc:Depends} for grass.
---
 debian/changelog  |   2 +
 debian/control    | 166 ++++++++++++++++++++++++++++--------------------------
 debian/control.in | 166 ++++++++++++++++++++++++++++--------------------------
 3 files changed, 176 insertions(+), 158 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57d0ed8..7315753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ grass (6.4.4-1) UNRELEASED; urgency=low
 
   [ Bas Couwenberg ]
   * Add gbp.conf to use pristine-tar by default.
+  * Restructure control file with cme, remove duplice section 'science',
+    add ${misc:Depends} for grass.
 
  -- M. Hamish Bowman <hamish.webmail at gmail.com>  Mon, 11 Aug 2014 18:09:42 +1200
 
diff --git a/debian/control b/debian/control
index 3f02cb5..1f52030 100644
--- a/debian/control
+++ b/debian/control
@@ -1,51 +1,57 @@
 Source: grass
-Section: science
-Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends:
-  autoconf2.13, autotools-dev,
-  debhelper (>= 9), 
-  doxygen,
-  fakeroot,
-  flex, bison,
-  graphviz,
-  libmotif-dev | lesstif2-dev,
-  libcairo2-dev,
-  libfftw3-dev,
-  libfreetype6-dev,
-  libgdal-dev,
-  libgeos-dev,
-  libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev,
-  libpng-dev | libpng12-dev,
-  libtiff5-dev | libtiff-dev,
-  libmysqlclient-dev | libmysqlclient15-dev,
-  libncurses5-dev,
-  libpq-dev,
+Section: science
+Priority: optional
+Build-Depends: autoconf2.13,
+               autotools-dev,
+               debhelper (>= 9),
+               doxygen,
+               fakeroot,
+               flex,
+               bison,
+               graphviz,
+               libmotif-dev | lesstif2-dev,
+               libcairo2-dev,
+               libfftw3-dev,
+               libfreetype6-dev,
+               libgdal-dev,
+               libgeos-dev,
+               libglu1-mesa-dev | libglu1-xorg-dev,
+               libjpeg-dev,
+               libpng-dev,
+               libtiff5-dev | libtiff-dev,
+               libmysqlclient-dev | libmysqlclient15-dev,
+               libncurses5-dev,
+               libpq-dev,
+               libproj-dev,
 # proj-bin needed for nad2bin during config
-  libproj-dev, proj-bin,
-  libreadline-dev | libreadline6-dev,
-  libsqlite3-dev,
-  libxmu-dev,
-#install optipng if compressing the PNG images in the programmers' manual
-#  optipng,
-  python (>= 2.6.6-3~),
-  python-wxgtk2.8, libwxgtk2.8-dev,
-  python-dev,
-  tcl-dev (>= 8.5), tk-dev (>= 8.5),
-  unixodbc-dev,
-  hardening-includes
-Standards-Version: 3.9.5
+               proj-bin,
+               libreadline-dev | libreadline6-dev,
+               libsqlite3-dev,
+               libxmu-dev,
+# install optipng if compressing the PNG images in the programmers' manual
+#              optipng,
+               python,
+               python-wxgtk2.8,
+               libwxgtk2.8-dev,
+               python-dev,
+               tcl-dev (>= 8.5),
+               tk-dev (>= 8.5),
+               unixodbc-dev,
+               hardening-includes
 Build-Conflicts: wx2.6-headers
-Homepage: http://grass.osgeo.org/
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git
+Homepage: http://grass.osgeo.org/
 
 Package: grass
-Section: metapackages
 Architecture: all
-Depends: grass-core, grass-gui
+Section: metapackages
+Depends: grass-core,
+         grass-gui,
+         ${misc:Depends}
 Recommends: grass-doc
 Suggests: grass-dev
 Description: Geographic Resources Analysis Support System (GRASS GIS)
@@ -59,38 +65,38 @@ Description: Geographic Resources Analysis Support System (GRASS GIS)
  Install this virtual package to get a full GRASS system.
 
 Package: grass-core
-Section: science
 Architecture: any
-Replaces: grass (<< 6.4.2-1~)
-Breaks: grass (<< 6.4.2-1~)
-Depends:
-  ${shlibs:Depends},
-  ${python:Depends},
+Depends: ${shlibs:Depends},
+         ${python:Depends},
 # numpy used by the GRASS Python Library
-  python-numpy,
-  ${misc:Depends}
-Recommends:
+         python-numpy,
+         ${misc:Depends}
+Recommends: gdal-bin,
 # cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
-  gdal-bin, proj-bin
-Suggests:
-  grass-doc, grass-gui, grass-dev,
+            proj-bin
+Suggests: grass-doc,
+          grass-gui,
+          grass-dev,
 # used by v.in.e00
-  e00compr, avce00,
+          e00compr,
+          avce00,
 # used by i.spectral
-  gnuplot,
+          gnuplot,
 # used by v.in.gpsbabel
-  gpsbabel,
+          gpsbabel,
 # used by v.in.garmin
-  gpstrans,
+          gpstrans,
 # used by NVIZ, d.out.gpsdrive, r.out.mpeg
-  netpbm,
+          netpbm,
 # used by v.kridge
-  python-rpy2,
+          python-rpy2,
 # used by r.in.wms, v.in.wfs, g.extension
-  wget | curl,
+          wget | curl,
 # used by r.in.wms
-  xml2
+          xml2
+Breaks: grass (<< 6.4.2-1~)
 Provides: grass644
+Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -102,23 +108,22 @@ Description: GRASS GIS core components
  This package contains the core processing components, but not the GUI.
 
 Package: grass-gui
-Section: science
 Architecture: any
-Replaces: grass (<< 6.4.2-1~)
-Breaks: grass (<< 6.4.2-1~)
 Depends: ${shlibs:Depends},
-  grass-core,
-  ${python:Depends},
-  python-wxgtk2.8,
+         grass-core,
+         ${python:Depends},
+         python-wxgtk2.8,
 # pyGL needed for wxNviz
-  python-opengl,
-  xterm | x-terminal-emulator,
-  ${misc:Depends}
+         python-opengl,
+         xterm | x-terminal-emulator,
+         ${misc:Depends}
 Recommends:
 # gs needed for wxPsmap PDF export
-  ghostscript,
+            ghostscript,
 # PIL needed for wxPsmap preview
-  python-imaging
+            python-imaging
+Breaks: grass (<< 6.4.2-1~)
+Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS graphical user interfaces
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -133,7 +138,8 @@ Package: grass-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: grass, grass-dev-doc
+Suggests: grass,
+          grass-dev-doc
 Description: GRASS GIS user documentation
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -147,7 +153,8 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends},
+         libjs-jquery
 Suggests: grass
 Description: GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
@@ -162,17 +169,17 @@ Description: GRASS GIS Programmers' Manual
 Package: grass-dev
 Section: devel
 Architecture: any
-Depends:
-  grass-core (= ${binary:Version}),
+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 | libgdal1-dev (>= 1.5.0),
-  libfreetype6-dev,
-  ${misc:Depends}
+         fakeroot,
+         libproj-dev,
+         libgdal-dev,
+         libfreetype6-dev,
+         ${misc:Depends}
 # Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg
 Recommends: subversion
-Suggests: grass-dev-doc, pkg-config
+Suggests: grass-dev-doc,
+          pkg-config
 Provides: grass64-dev
 Description: GRASS GIS development files
  Commonly referred to as GRASS, this is a Geographic Information
@@ -185,3 +192,4 @@ Description: GRASS GIS development files
  This package contains the header files for developing with GRASS.
  Install this package if you wish to develop software that manipulates
  GRASS data sets or install addons using the g.extension module.
+
diff --git a/debian/control.in b/debian/control.in
index 2a72ecd..9dfeb28 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,51 +1,57 @@
 Source: grass
-Section: science
-Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-depends:
-  autoconf2.13, autotools-dev,
-  debhelper (>= 9), 
-  doxygen,
-  fakeroot,
-  flex, bison,
-  graphviz,
-  libmotif-dev | lesstif2-dev,
-  libcairo2-dev,
-  libfftw3-dev,
-  libfreetype6-dev,
-  libgdal-dev,
-  libgeos-dev,
-  libglu1-mesa-dev | libglu1-xorg-dev, 
-  libjpeg-dev,
-  libpng-dev | libpng12-dev,
-  libtiff5-dev | libtiff-dev,
-  libmysqlclient-dev | libmysqlclient15-dev,
-  libncurses5-dev,
-  libpq-dev,
+Section: science
+Priority: optional
+Build-Depends: autoconf2.13,
+               autotools-dev,
+               debhelper (>= 9),
+               doxygen,
+               fakeroot,
+               flex,
+               bison,
+               graphviz,
+               libmotif-dev | lesstif2-dev,
+               libcairo2-dev,
+               libfftw3-dev,
+               libfreetype6-dev,
+               libgdal-dev,
+               libgeos-dev,
+               libglu1-mesa-dev | libglu1-xorg-dev,
+               libjpeg-dev,
+               libpng-dev,
+               libtiff5-dev | libtiff-dev,
+               libmysqlclient-dev | libmysqlclient15-dev,
+               libncurses5-dev,
+               libpq-dev,
+               libproj-dev,
 # proj-bin needed for nad2bin during config
-  libproj-dev, proj-bin,
-  libreadline-dev | libreadline6-dev,
-  libsqlite3-dev,
-  libxmu-dev,
-#install optipng if compressing the PNG images in the programmers' manual
-#  optipng,
-  python (>= 2.6.6-3~),
-  python-wxgtk2.8, libwxgtk2.8-dev,
-  python-dev,
-  tcl-dev (>= 8.5), tk-dev (>= 8.5),
-  unixodbc-dev,
-  hardening-includes
-Standards-Version: 3.9.5
+               proj-bin,
+               libreadline-dev | libreadline6-dev,
+               libsqlite3-dev,
+               libxmu-dev,
+# install optipng if compressing the PNG images in the programmers' manual
+#              optipng,
+               python,
+               python-wxgtk2.8,
+               libwxgtk2.8-dev,
+               python-dev,
+               tcl-dev (>= 8.5),
+               tk-dev (>= 8.5),
+               unixodbc-dev,
+               hardening-includes
 Build-Conflicts: wx2.6-headers
-Homepage: http://grass.osgeo.org/
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/grass.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git
+Homepage: http://grass.osgeo.org/
 
 Package: grass
-Section: metapackages
 Architecture: all
-Depends: grass-core, grass-gui
+Section: metapackages
+Depends: grass-core,
+         grass-gui,
+         ${misc:Depends}
 Recommends: grass-doc
 Suggests: grass-dev
 Description: Geographic Resources Analysis Support System (GRASS GIS)
@@ -59,38 +65,38 @@ Description: Geographic Resources Analysis Support System (GRASS GIS)
  Install this virtual package to get a full GRASS system.
 
 Package: grass-core
-Section: science
 Architecture: any
-Replaces: grass (<< 6.4.2-1~)
-Breaks: grass (<< 6.4.2-1~)
-Depends:
-  ${shlibs:Depends},
-  ${python:Depends},
+Depends: ${shlibs:Depends},
+         ${python:Depends},
 # numpy used by the GRASS Python Library
-  python-numpy,
-  ${misc:Depends}
-Recommends:
+         python-numpy,
+         ${misc:Depends}
+Recommends: gdal-bin,
 # cs2cs used by m.proj, gdalinfo+gdal_translate used by a number of scripts
-  gdal-bin, proj-bin
-Suggests:
-  grass-doc, grass-gui, grass-dev,
+            proj-bin
+Suggests: grass-doc,
+          grass-gui,
+          grass-dev,
 # used by v.in.e00
-  e00compr, avce00,
+          e00compr,
+          avce00,
 # used by i.spectral
-  gnuplot,
+          gnuplot,
 # used by v.in.gpsbabel
-  gpsbabel,
+          gpsbabel,
 # used by v.in.garmin
-  gpstrans,
+          gpstrans,
 # used by NVIZ, d.out.gpsdrive, r.out.mpeg
-  netpbm,
+          netpbm,
 # used by v.kridge
-  python-rpy2,
+          python-rpy2,
 # used by r.in.wms, v.in.wfs, g.extension
-  wget | curl,
+          wget | curl,
 # used by r.in.wms
-  xml2
+          xml2
+Breaks: grass (<< 6.4.2-1~)
 Provides: grass at ABI@
+Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS core components
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -102,23 +108,22 @@ Description: GRASS GIS core components
  This package contains the core processing components, but not the GUI.
 
 Package: grass-gui
-Section: science
 Architecture: any
-Replaces: grass (<< 6.4.2-1~)
-Breaks: grass (<< 6.4.2-1~)
 Depends: ${shlibs:Depends},
-  grass-core,
-  ${python:Depends},
-  python-wxgtk2.8,
+         grass-core,
+         ${python:Depends},
+         python-wxgtk2.8,
 # pyGL needed for wxNviz
-  python-opengl,
-  xterm | x-terminal-emulator,
-  ${misc:Depends}
+         python-opengl,
+         xterm | x-terminal-emulator,
+         ${misc:Depends}
 Recommends:
 # gs needed for wxPsmap PDF export
-  ghostscript,
+            ghostscript,
 # PIL needed for wxPsmap preview
-  python-imaging
+            python-imaging
+Breaks: grass (<< 6.4.2-1~)
+Replaces: grass (<< 6.4.2-1~)
 Description: GRASS GIS graphical user interfaces
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -133,7 +138,8 @@ Package: grass-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: grass, grass-dev-doc
+Suggests: grass,
+          grass-dev-doc
 Description: GRASS GIS user documentation
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -147,7 +153,8 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
+Depends: ${misc:Depends},
+         libjs-jquery
 Suggests: grass
 Description: GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
@@ -162,17 +169,17 @@ Description: GRASS GIS Programmers' Manual
 Package: grass-dev
 Section: devel
 Architecture: any
-Depends:
-  grass-core (= ${binary:Version}),
+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 | libgdal1-dev (>= 1.5.0),
-  libfreetype6-dev,
-  ${misc:Depends}
+         fakeroot,
+         libproj-dev,
+         libgdal-dev,
+         libfreetype6-dev,
+         ${misc:Depends}
 # Subversion is needed by g.extension, a primary motivator for installing the grass-dev pkg
 Recommends: subversion
-Suggests: grass-dev-doc, pkg-config
+Suggests: grass-dev-doc,
+          pkg-config
 Provides: grass at VERSION@-dev
 Description: GRASS GIS development files
  Commonly referred to as GRASS, this is a Geographic Information
@@ -185,3 +192,4 @@ Description: GRASS GIS development files
  This package contains the header files for developing with GRASS.
  Install this package if you wish to develop software that manipulates
  GRASS data sets or install addons using the g.extension module.
+

-- 
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