Author: frankie
Date: 2009-03-27 16:19:55 +0000 (Fri, 27 Mar 2009)
New Revision: 2094
Added:
packages/grass/trunk/debian/control.in
packages/grass/trunk/debian/grass-dev.dirs.in
packages/grass/trunk/debian/grass-dev.install.in
packages/grass/trunk/debian/grass-dev.links.in
packages/grass/trunk/debian/grass-doc.install.in
packages/grass/trunk/debian/grass-doc.links.in
packages/grass/trunk/debian/grass.dirs.in
packages/grass/trunk/debian/grass.install.in
packages/grass/trunk/debian/grass.links.in
Removed:
packages/grass/trunk/debian/grass.conf
Modified:
packages/grass/trunk/debian/changelog
packages/grass/trunk/debian/control
packages/grass/trunk/debian/fixscripts.sh
packages/grass/trunk/debian/rules
Log:
Updated to use templates.
Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog 2009-03-27 16:16:58 UTC (rev
2093)
+++ packages/grass/trunk/debian/changelog 2009-03-27 16:19:55 UTC (rev
2094)
@@ -1,7 +1,7 @@
grass (6.4.0~rc3-3) unstable; urgency=low
* NOT RELEASED.
- * Fixed debian/watch to see also RC versions. Not perfect but working.
+ * Fixed debian/watch to see also RC versions. Not perfect but it works.
* Added xml2 and other r.in.wms related among Suggests in debian/control.
* Added proj-bin among Suggests in debian/control.
* Moved build-dep from proj to libproj-dev.
@@ -9,8 +9,14 @@
* Added a libgdal.so link to the system GDAL shlib, to allow external
raster/vector
support to work.
* Policy bumped to 3.8.1, without changes.
+ * Introduced grassVERSION and grassVERSION-dev Provides and
debian/control.in
+ templates to get grass major.minor versions automagically.
+ The new field is useful to introduce per-version dependency in external
+ plugins: mixing fluxes^Wversions is evil, and currently gdal-grass could
+ be installed with the wrong grass release.
+ * Now fixscripts.sh get automagically grass version for its paths.
- -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 23 Mar 2009 16:41:02
+0100
+ -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 27 Mar 2009 14:41:07
+0100
grass (6.4.0~rc3-2) unstable; urgency=low
Modified: packages/grass/trunk/debian/control
===================================================================
--- packages/grass/trunk/debian/control 2009-03-27 16:16:58 UTC (rev 2093)
+++ packages/grass/trunk/debian/control 2009-03-27 16:19:55 UTC (rev 2094)
@@ -18,6 +18,7 @@
Architecture: any
Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpstrans, gnuplot,
grass-doc, xml2, wget | curl
+Provides: grass64
Description: Geographic Resources Analysis Support System
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
@@ -47,6 +48,7 @@
Architecture: any
Depends: grass (= ${binary:Version})
Suggests: pkg-config
+Provides: grass64-dev
Description: GRASS GIS development files
Commonly referred to as GRASS, this is a Geographic Information
System (GIS) used for geospatial data management and analysis,
Added: packages/grass/trunk/debian/control.in
===================================================================
--- packages/grass/trunk/debian/control.in (rev 0)
+++ packages/grass/trunk/debian/control.in 2009-03-27 16:19:55 UTC (rev
2094)
@@ -0,0 +1,62 @@
+Source: grass
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
+Build-depends: flex, bison, libreadline5-dev, libncurses5-dev, lesstif2-dev,
debhelper (>= 7), dpatch,
+ libtiff4-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4), libfftw3-dev, libxmu-dev,
libglu1-mesa-dev | libglu1-xorg-dev,
+ libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0),
libproj-dev, libjpeg62-dev,
+ libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot,
libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
+ libcairo2-dev, libwxgtk2.8-dev, python2.5-dev, swig
+Standards-Version: 3.8.1
+Homepage: http://grass.osgeo.org/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/
+Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/grass/
+
+Package: grass
+Section: science
+Architecture: any
+Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
+Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpstrans, gnuplot,
grass-doc, xml2, wget | curl
+Provides: gr...@version@
+Description: Geographic Resources Analysis Support System
+ Commonly referred to as GRASS, this is a Geographic Information
+ System (GIS) used for geospatial data management and analysis,
+ image processing, graphics/map production, spatial modeling, and
+ visualization. GRASS is currently used in academic and commercial
+ settings around the world, as well as by many government agencies
+ and environmental consulting companies.
+
+Package: grass-doc
+Section: doc
+Architecture: all
+Conflicts: grass-doc
+Replaces: grass-doc
+Provides: grass-doc
+Description: Geographic Resources Analysis Support System documentation
+ Commonly referred to as GRASS, this is a Geographic Information
+ System (GIS) used for geospatial data management and analysis,
+ image processing, graphics/map production, spatial modeling, and
+ visualization. GRASS is currently used in academic and commercial
+ settings around the world, as well as by many government agencies
+ and environmental consulting companies.
+ .
+ This package contains HTML documentation for the GRASS system.
+
+Package: grass-dev
+Section: devel
+Architecture: any
+Depends: grass (= ${binary:Version})
+Suggests: pkg-config
+Provides: gr...@version@-dev
+Description: GRASS GIS development files
+ Commonly referred to as GRASS, this is a Geographic Information
+ System (GIS) used for geospatial data management and analysis,
+ image processing, graphics/map production, spatial modeling, and
+ visualization. GRASS is currently used in academic and commercial
+ settings around the world, as well as by many government agencies
+ and environmental consulting companies.
+ .
+ This package contains the header files for developing with GRASS.
+ Install this package if you wish to develop software that manipulates
+ GRASS data sets.
Modified: packages/grass/trunk/debian/fixscripts.sh
===================================================================
--- packages/grass/trunk/debian/fixscripts.sh 2009-03-27 16:16:58 UTC (rev
2093)
+++ packages/grass/trunk/debian/fixscripts.sh 2009-03-27 16:19:55 UTC (rev
2094)
@@ -4,11 +4,12 @@
# that makes lintian complain and fix them.
CURDIR=$(pwd)
+VERSION=$(echo $(head -2 $CURDIR/include/VERSION)|sed -e 's/ //')
# make these scripts executable
for x in etc/water/seg
do
- chmod +x $CURDIR/debian/tmp/usr/lib/grass64/$x
+ chmod +x $CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
done
# silence bogus lintian complaint about interpreter-not-absolute
@@ -18,15 +19,15 @@
script_file_tools \
nviz2.2_script
do
- f=$CURDIR/debian/tmp/usr/lib/grass64/etc/nviz2.2/scripts/$x
- sed 's.!nviz.!/usr/lib/grass64/bin/nviz.' $f >foo && cat foo >$f
+ f=$CURDIR/debian/tmp/usr/lib/grass$VERSION/etc/nviz2.2/scripts/$x
+ sed -e "s.!nviz.!/usr/lib/grass$VERSION/bin/nviz." $f >foo && cat foo >$f
done
for x in panel_label.tcl \
panel_scale.tcl
do
- f=$CURDIR/debian/tmp/usr/lib/grass64/etc/nviz2.2/scripts/$x
- sed 's%!../glnviz.new/nvwish%!/usr/lib/grass64/etc/nviz2.2/glnviz/nvwish%'
$f >foo && cat foo >$f
+ f=$CURDIR/debian/tmp/usr/lib/grass$VERSION/etc/nviz2.2/scripts/$x
+ sed -e
"s%!../glnviz.new/nvwish%!/usr/lib/grass$VERSION/etc/nviz2.2/glnviz/nvwish%" $f
>foo && cat foo >$f
done
rm foo
@@ -34,7 +35,7 @@
# add shebang to scripts that need it
for x in etc/copy
do
- f=$CURDIR/debian/tmp/usr/lib/grass64/$x
+ f=$CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
cp $f foo; echo "#!/bin/sh" >$f; cat foo >>$f
done
rm foo
@@ -98,5 +99,5 @@
etc/nviz2.2/scripts/wirecolorPopup.tcl \
etc/nviz2.2/scripts/fileBrowser.tcl
do
- chmod -x $CURDIR/debian/tmp/usr/lib/grass64/$x
+ chmod -x $CURDIR/debian/tmp/usr/lib/grass$VERSION/$x
done
Added: packages/grass/trunk/debian/grass-dev.dirs.in
===================================================================
--- packages/grass/trunk/debian/grass-dev.dirs.in
(rev 0)
+++ packages/grass/trunk/debian/grass-dev.dirs.in 2009-03-27 16:19:55 UTC
(rev 2094)
@@ -0,0 +1,3 @@
+usr/lib/gr...@version@/include
+usr/lib/gr...@version@/include/Make
+usr/share/pkgconfig
Added: packages/grass/trunk/debian/grass-dev.install.in
===================================================================
--- packages/grass/trunk/debian/grass-dev.install.in
(rev 0)
+++ packages/grass/trunk/debian/grass-dev.install.in 2009-03-27 16:19:55 UTC
(rev 2094)
@@ -0,0 +1 @@
+usr/lib/gr...@version@/include
Added: packages/grass/trunk/debian/grass-dev.links.in
===================================================================
--- packages/grass/trunk/debian/grass-dev.links.in
(rev 0)
+++ packages/grass/trunk/debian/grass-dev.links.in 2009-03-27 16:19:55 UTC
(rev 2094)
@@ -0,0 +1 @@
+usr/share/pkgconfig/gr...@version@.pc usr/share/pkgconfig/grass.pc
Added: packages/grass/trunk/debian/grass-doc.install.in
===================================================================
--- packages/grass/trunk/debian/grass-doc.install.in
(rev 0)
+++ packages/grass/trunk/debian/grass-doc.install.in 2009-03-27 16:19:55 UTC
(rev 2094)
@@ -0,0 +1,5 @@
+usr/lib/gr...@version@/docs/html usr/share/doc/grass-doc
+usr/lib/gr...@version@/man/man1 usr/share/man
+programming-manual/db usr/share/doc/grass-doc/programming-manual/html
+programming-manual/gis usr/share/doc/grass-doc/programming-manual/html
+programming-manual/vector usr/share/doc/grass-doc/programming-manual/html
Added: packages/grass/trunk/debian/grass-doc.links.in
===================================================================
--- packages/grass/trunk/debian/grass-doc.links.in
(rev 0)
+++ packages/grass/trunk/debian/grass-doc.links.in 2009-03-27 16:19:55 UTC
(rev 2094)
@@ -0,0 +1 @@
+usr/share/doc/grass-doc/html usr/lib/gr...@version@/docs/html
Deleted: packages/grass/trunk/debian/grass.conf
===================================================================
--- packages/grass/trunk/debian/grass.conf 2009-03-27 16:16:58 UTC (rev
2093)
+++ packages/grass/trunk/debian/grass.conf 2009-03-27 16:19:55 UTC (rev
2094)
@@ -1 +0,0 @@
-/usr/lib/grass/lib
Added: packages/grass/trunk/debian/grass.dirs.in
===================================================================
--- packages/grass/trunk/debian/grass.dirs.in (rev 0)
+++ packages/grass/trunk/debian/grass.dirs.in 2009-03-27 16:19:55 UTC (rev
2094)
@@ -0,0 +1,5 @@
+usr/lib/gr...@version@
+/usr/bin
+/usr/lib/gr...@version@
+/usr/share/doc/gr...@version@
+/usr/share/man
Added: packages/grass/trunk/debian/grass.install.in
===================================================================
--- packages/grass/trunk/debian/grass.install.in
(rev 0)
+++ packages/grass/trunk/debian/grass.install.in 2009-03-27 16:19:55 UTC
(rev 2094)
@@ -0,0 +1,8 @@
+usr/bin/gr...@version@
+usr/lib/gr...@version@/bin
+usr/lib/gr...@version@/bwidget
+usr/lib/gr...@version@/driver
+usr/lib/gr...@version@/etc
+usr/lib/gr...@version@/fonts
+usr/lib/gr...@version@/scripts
+usr/lib/gr...@version@/lib
Added: packages/grass/trunk/debian/grass.links.in
===================================================================
--- packages/grass/trunk/debian/grass.links.in (rev 0)
+++ packages/grass/trunk/debian/grass.links.in 2009-03-27 16:19:55 UTC (rev
2094)
@@ -0,0 +1 @@
+usr/bin/gr...@version@ usr/bin/grass
Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules 2009-03-27 16:16:58 UTC (rev 2093)
+++ packages/grass/trunk/debian/rules 2009-03-27 16:19:55 UTC (rev 2094)
@@ -9,7 +9,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-BASE_NAME=grass64
+VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION`|sed -e 's/ //')
+BASE_NAME=grass$(VERSION)
PKG_NAME=grass
CFLAGS=-Wall -g
@@ -29,6 +30,11 @@
include /usr/share/dpatch/dpatch.make
+templates: $(patsubst %.in,%,$(wildcard debian/*.in))
+
+debian/% :: debian/%.in
+ sed -e 's/@VERSION@/$(VERSION)/' $< >$@
+
configure: patch config.status
config.status:
dh_testdir
@@ -83,7 +89,7 @@
touch $@
-clean: clean-patched unpatch
+clean: templates clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
