The following commit has been merged in the master branch:
commit 6c47cfd9a3c225346d136f5883048b30457a65c3
Author: Hamish Bowman <hamis...@yahoo.com>
Date: Tue Sep 13 01:31:00 2011 +1200
icon fixes; g.extension fixes; line wrap
diff --git a/debian/changelog b/debian/changelog
index b9ca0f8..65e4ab3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ grass (6.4.1-2) unstable; urgency=low
[ Hamish Bowman ]
* Desktop icon cleanup.
* Recommend wx; suggest gs, python-imaging, python-rpy2.
+ * Remove more obsolete swig references.
+ * grass-dev: further support for building add-ons.
- -- Hamish Bowman <hamis...@yahoo.com> Sun, 29 May 2011 14:16:22 +1200
+ -- Hamish Bowman <hamis...@yahoo.com> Mon, 12 Sep 2011 19:48:52 +1200
grass (6.4.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 160d104..6939b86 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ 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,libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 7),
+Build-depends: flex, bison, libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 7),
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), swig
+ libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5)
Standards-Version: 3.9.2
Build-Conflicts: wx2.6-headers
Homepage: http://grass.osgeo.org/
@@ -48,7 +48,7 @@ Description: Geographic Resources Analysis Support System
documentation
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: grass64-dev
Description: GRASS GIS development files
diff --git a/debian/control.in b/debian/control.in
index 81ada15..0d15c7f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,11 +3,11 @@ 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,libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 7),
+Build-depends: flex, bison, libreadline-dev | libreadline6-dev,
libncurses5-dev, lesstif2-dev, debhelper (>= 7),
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), swig
+ libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5)
Standards-Version: 3.9.2
Build-Conflicts: wx2.6-headers
Homepage: http://grass.osgeo.org/
@@ -48,7 +48,7 @@ Description: Geographic Resources Analysis Support System
documentation
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 --git a/debian/grass-dev.dirs b/debian/grass-dev.dirs
index d8cf208..5640abe 100644
--- a/debian/grass-dev.dirs
+++ b/debian/grass-dev.dirs
@@ -1,3 +1,5 @@
usr/lib/grass64/include
usr/lib/grass64/include/Make
+usr/lib/grass64/tools
+usr/lib/grass64/tools/g.html2man
usr/share/pkgconfig
diff --git a/debian/grass-dev.dirs.in b/debian/grass-dev.dirs.in
index 8588834..14be6a7 100644
--- a/debian/grass-dev.dirs.in
+++ b/debian/grass-dev.dirs.in
@@ -1,3 +1,5 @@
usr/lib/grass@VERSION@/include
usr/lib/grass@VERSION@/include/Make
+usr/lib/grass@VERSION@/tools
+usr/lib/grass@VERSION@/tools/g.html2man
usr/share/pkgconfig
diff --git a/debian/grass.dirs b/debian/grass.dirs
index bd9d2db..8bc78d4 100644
--- a/debian/grass.dirs
+++ b/debian/grass.dirs
@@ -2,4 +2,4 @@ usr/lib/grass64
usr/bin
usr/share/doc/grass
usr/share/man
-usr/share/icons
+usr/share/icons/hicolor/32x32/apps
diff --git a/debian/grass.dirs.in b/debian/grass.dirs.in
index a9ed75b..e04321b 100644
--- a/debian/grass.dirs.in
+++ b/debian/grass.dirs.in
@@ -2,4 +2,4 @@ usr/lib/grass@VERSION@
usr/bin
usr/share/doc/grass
usr/share/man
-usr/share/icons
+usr/share/icons/hicolor/32x32/apps
diff --git a/debian/grass.install b/debian/grass.install
index 00607cf..455ea38 100644
--- a/debian/grass.install
+++ b/debian/grass.install
@@ -7,7 +7,6 @@ usr/lib/grass64/fonts
usr/lib/grass64/scripts
usr/lib/grass64/lib
usr/lib/grass64/locale
-usr/share/icons/hicolor/32x32
-gui/icons/grass-48x48.png /usr/share/icons/hicolor/48x48/grass64.png
-gui/icons/grass.desktop /usr/share/applications/grass64.desktop
+usr/share/icons/hicolor
+usr/share/applications
usr/bin/x-grass
diff --git a/debian/grass.install.in b/debian/grass.install.in
index 37a43eb..cae68bd 100644
--- a/debian/grass.install.in
+++ b/debian/grass.install.in
@@ -7,7 +7,6 @@ usr/lib/grass@VERSION@/fonts
usr/lib/grass@VERSION@/scripts
usr/lib/grass@VERSION@/lib
usr/lib/grass@VERSION@/locale
-usr/share/icons/hicolor/32x32
-gui/icons/grass-48x48.png /usr/share/icons/hicolor/48x48/grass@VERSION@.png
-gui/icons/grass.desktop /usr/share/applications/grass@VERSION@.desktop
+usr/share/icons/hicolor
+usr/share/applications
usr/bin/x-grass
diff --git a/debian/rules b/debian/rules
index 19931b9..56fc61c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,15 +129,13 @@ endif
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 @@ install: build
# 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
+ 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
+ # 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 $${INST_DIR}+' \
+ -e 's+^\(RUN_GISBASE[ ]*=\) .*+\1 $${INST_DIR}+' \
+ 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/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/hicolor/32x32/apps/$(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
+ 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/$(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
--
Geographic Resources Analysis Support System
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
