The following commit has been merged in the master branch:
commit db9d3a90f7b226b49bc68b4f69cb2c4e1a3d1d3c
Merge: c77adf4390c5d304b5d4d0ee90552b515ed9bb5b
071f8b1936f049a9a9c69388b711e9a4d1c40704
Author: Francesco Paolo Lovergine <[email protected]>
Date: Thu Jan 19 20:53:18 2012 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/grass
Conflicts:
debian/control
debian/control.in
diff --combined debian/control
index efe2c26,e5b95e2..28943de
--- a/debian/control
+++ b/debian/control
@@@ -3,11 -3,11 +3,11 @@@ Section: scienc
Priority: optional
Maintainer: Debian GIS Project <[email protected]>
Uploaders: Francesco Paolo Lovergine <[email protected]>
- Build-depends: flex, bison,libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 7),
+ Build-depends: flex, bison, libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 8),
libtiff4-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), libfftw3-dev, libxmu-dev,
libglu1-mesa-dev | libglu1-xorg-dev,
libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0),
libproj-dev, proj-bin, libjpeg-dev,
libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot,
libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
- libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5)
+ libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig, python-support
(>= 0.7.1)
Standards-Version: 3.9.2
Build-Conflicts: wx2.6-headers
Homepage: http://grass.osgeo.org/
@@@ -21,7 -21,7 +21,7 @@@ Depends: ${shlibs:Depends}, xterm | x-t
python-opengl, python-wxgtk2.8, ${misc:Depends}
Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
gnuplot, xml2, wget | curl, netpbm
- Recommends: ghostscript
+ Recommends: ghostscript, python-wxgtk2.8
Provides: grass641
Description: Geographic Resources Analysis Support System
Commonly referred to as GRASS, this is a Geographic Information
@@@ -49,6 -49,7 +49,7 @@@ Package: grass-de
Section: devel
Architecture: any
Depends: grass (= ${binary:Version}), libproj-dev, libgdal1-dev,
${misc:Depends}
+ Recommends: fakeroot, subversion
Suggests: pkg-config
Provides: grass64-dev
Description: GRASS GIS development files
diff --combined debian/control.in
index 44c61f9,bb34fca..2f555da
--- a/debian/control.in
+++ b/debian/control.in
@@@ -3,11 -3,11 +3,11 @@@ Section: scienc
Priority: optional
Maintainer: Debian GIS Project <[email protected]>
Uploaders: Francesco Paolo Lovergine <[email protected]>
- Build-depends: flex, bison,libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 7),
+ Build-depends: flex, bison, libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 8),
libtiff4-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), libfftw3-dev, libxmu-dev,
libglu1-mesa-dev | libglu1-xorg-dev,
libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0),
libproj-dev, proj-bin, libjpeg-dev,
libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot,
libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
- libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5)
+ libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig, python-support
(>= 0.7.1)
Standards-Version: 3.9.2
Build-Conflicts: wx2.6-headers
Homepage: http://grass.osgeo.org/
@@@ -21,7 -21,7 +21,7 @@@ Depends: ${shlibs:Depends}, xterm | x-t
python-opengl, python-wxgtk2.8, ${misc:Depends}
Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
gnuplot, xml2, wget | curl, netpbm
- Recommends: ghostscript
+ Recommends: ghostscript, python-wxgtk2.8
Provides: grass@ABI@
Description: Geographic Resources Analysis Support System
Commonly referred to as GRASS, this is a Geographic Information
@@@ -48,7 -48,7 +48,7 @@@ Description: Geographic Resources Analy
Package: grass-dev
Section: devel
Architecture: any
- Depends: grass (= ${binary:Version}), libproj-dev, libgdal1-dev,
${misc:Depends}
+ Depends: grass (= ${binary:Version}), fakeroot, libproj-dev, libgdal1-dev,
${misc:Depends}
Suggests: pkg-config
Provides: grass@VERSION@-dev
Description: GRASS GIS development files
diff --combined debian/rules
index e3fae0b,5bed7f5..b15c5db
--- a/debian/rules
+++ b/debian/rules
@@@ -75,7 -75,7 +75,7 @@@ endi
--with-postgres-includes=$(shell pg_config --includedir) \
--with-mysql-includes=$(shell mysql_config --include|sed
-e 's/-I//') \
--with-proj-share=/usr/share/proj \
-
--with-wxwidgets=/usr/lib/wx/config/gtk2-unicode-release-2.8 \
+ --with-wxwidgets=/usr/bin/wx-config \
--with-python=/usr/bin/python-config \
--with-cairo
@@@ -129,15 -129,13 +129,13 @@@ endi
lib/segment/html \
lib/vector/dglib/html \
rfc/html \
- swig/html \
lib/g3d/latex \
lib/ogsf/latex \
lib/proj/latex \
lib/gmath/latex \
lib/segment/latex \
lib/vector/dglib/latex \
- rfc/latex \
- swig/latex
+ rfc/latex
install: build
dh_testdir
@@@ -163,18 -161,48 +161,48 @@@
# change section from 1 to .1grass
mv debian/tmp/usr/lib/$(BASE_NAME)/man/man1/grass6.1
debian/$(BASE_NAME).1
- for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do n=`basename
$$m .1`; mv $$m debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done
- for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do sed -i
-e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done
-
- # install module makefile
- install -m 644 include/Make/Module.make
debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/include/Make/Module.make
+ for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1; do \
+ n=`basename $$m .1`; mv $$m
debian/tmp/usr/lib/$(BASE_NAME)/man/man1/$$n.1grass; done
+ for m in debian/tmp/usr/lib/$(BASE_NAME)/man/man1/*.1grass; do \
+ sed -i -e 's/^.TH \(.*\) 1/.TH \1 1grass/' $$m; done
+
+ # install module makefile (redundant due to grass-dev.install?)
+ install -m 644 include/Make/Module.make \
+
debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/include/Make/Module.make
+
+ # adjust from build-server build dir to end-user's install dir
+ sed -i -e "s+^\(GRASS_HOME[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \
+ -e "s+^\(RUN_GISBASE[ ]*=\) .*+\1 /usr/lib/$(BASE_NAME)+" \
+ debian/tmp/usr/lib/$(BASE_NAME)/include/Make/Platform.make
+
+ # install helper scripts for building addon man pages
+ install -m 755 tools/mkhtml.sh \
+ debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/mkhtml.sh
+ install -m 755 tools/g.html2man/g.html2man \
+ debian/$(PKG_NAME)-dev/usr/lib/$(BASE_NAME)/tools/g.html2man
# install pkg-config file
install -m 644 grass.pc
debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc
# install icon file for debian menu system
- install -d debian/tmp/usr/share/icons debian/tmp/usr/bin
- install -m 644 debian/grass.xpm
debian/tmp/usr/share/icons/$(BASE_NAME).xpm
+ install -d debian/tmp/usr/share/icons \
+ debian/tmp/usr/share/applications \
+ debian/tmp/usr/bin
+ # is there a better way to make these exist?
+ mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
+ mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
+ mkdir -p debian/tmp/usr/share/applications
+ install -m 644 debian/grass.xpm \
+ debian/tmp/usr/share/icons/hicolor/32x32/apps/$(BASE_NAME).xpm
+ install -m 644 gui/icons/grass-48x48.png \
+ debian/tmp/usr/share/icons/hicolor/48x48/apps/$(BASE_NAME).png
+ install -m 644 gui/icons/grass.desktop \
+ debian/tmp/usr/share/applications/$(BASE_NAME).desktop
+ # 6.4.1 shipped with "grass65" as the Exec target
+ sed -i -e 's+/usr/share/icons/grass-48x48.png+$(BASE_NAME)+' \
+ -e 's+grass65+$(BASE_NAME)+' \
+ debian/tmp/usr/share/applications/$(BASE_NAME).desktop
+
# install x-grass wrapper script
install -m 755 debian/x-grass debian/tmp/usr/bin/x-grass
@@@ -226,7 -254,6 +254,7 @@@ binary-arch: instal
dh_link usr/share/doc/grass/AUTHORS usr/lib/$(BASE_NAME)/AUTHORS \
usr/share/doc/grass/COPYING usr/lib/$(BASE_NAME)/COPYING \
usr/share/common-licenses/GPL-2 usr/lib/$(BASE_NAME)/GPL.TXT
+ dh_pysupport -p$(PKG_NAME) /usr/lib/grass64/etc
dh_strip -a
dh_compress -a -XAUTHORS
dh_fixperms -a
--
Geographic Resources Analysis Support System
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
