This is an automated email from the git hooks/post-receive script. frankie pushed a commit to branch experimental in repository grass.
commit ef17bcadf77b05f98660eff31a44f8638433df72 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed May 20 10:44:55 2015 +0200 Introduced liblas-dev b-d for lidar tools. A little change in debian/rules allow resyncing of templates at will. Note that all v.lidar.* modules requires the liblas library to be built. --- debian/changelog | 6 ++++++ debian/control | 3 ++- debian/control.in | 3 ++- debian/grass-gui.links | 4 ++-- debian/rules | 10 ++++++---- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index c55fd4d..0cbdd31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ grass (7.0.0-1~exp2) UNRELEASED; urgency=medium + [ Bas Couwenberg ] * Use upstream grass startup script, and install custom x-grass7 as x-grass70. * Add Conflicts/Provides/Replaces on the grass7* packages by upstream. + [ Francesco Paolo Lovergine ] + * Added liblas-dev b-d to support new Lidar modules. + * Introduced a separate tag in debian/rules to regenerate debian stuff from + templates. + -- Bas Couwenberg <sebas...@debian.org> Sat, 21 Feb 2015 18:46:48 +0100 grass (7.0.0-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index cd05708..1856383 100644 --- a/debian/control +++ b/debian/control @@ -46,7 +46,8 @@ Build-Depends: autoconf2.13, libblas-dev, liblapack-dev, unixodbc-dev, - zlib1g-dev + zlib1g-dev, + liblas-dev Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/grass.git Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git -b experimental diff --git a/debian/control.in b/debian/control.in index 1ff1b1e..93e8c56 100644 --- a/debian/control.in +++ b/debian/control.in @@ -46,7 +46,8 @@ Build-Depends: autoconf2.13, libblas-dev, liblapack-dev, unixodbc-dev, - zlib1g-dev + zlib1g-dev, + liblas-dev Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/grass.git Vcs-Git: git://anonscm.debian.org/pkg-grass/grass.git -b experimental diff --git a/debian/grass-gui.links b/debian/grass-gui.links index 9688789..ea02ab9 100644 --- a/debian/grass-gui.links +++ b/debian/grass-gui.links @@ -3,7 +3,7 @@ usr/share/grass70/gui/images usr/lib/grass70/gui/images usr/share/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/lib/grass70/gui/wxpython/animation/wxGUI_animation_tool.jpg usr/share/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg usr/lib/grass70/gui/wxpython/dbmgr/dbmgr_frame.jpg -usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.png usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.png +usr/share/grass70/gui/wxpython/gmodeler/gmodeler_frame.jpg usr/lib/grass70/gui/wxpython/gmodeler/gmodeler_frame.jpg usr/share/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/lib/grass70/gui/wxpython/iclass/iclass_frame.jpg usr/share/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/lib/grass70/gui/wxpython/mapswipe/mapswipe_tsunami.jpg usr/share/grass70/gui/wxpython/psmap/psmap_frame.jpg usr/lib/grass70/gui/wxpython/psmap/psmap_frame.jpg @@ -15,6 +15,6 @@ usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_5.png usr/lib/g usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_6.png usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_7.png usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_8.png -usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.png usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.png +usr/share/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg usr/lib/grass70/gui/wxpython/rlisetup/g_gui_rlisetup_sampleAreas.jpg usr/share/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/lib/grass70/gui/wxpython/timeline/timeline_2D.jpg usr/share/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg usr/lib/grass70/gui/wxpython/vdigit/vdigit_toolbar.jpg diff --git a/debian/rules b/debian/rules index 89c7230..69fc894 100755 --- a/debian/rules +++ b/debian/rules @@ -55,14 +55,15 @@ override_dh_clean: $(RM) -r lib/$$LIBRARY/html lib/$$LIBRARY/latex ; \ done -override_dh_auto_clean: - [ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean - -override_dh_auto_configure: +templates: for TEMPLATE in $(TEMPLATES) ; do \ sed -e 's/@VERSION@/$(VERSION)/g' -e 's/@ABI@/$(ABI)/g' $$TEMPLATE > `echo $$TEMPLATE | sed 's/.in$$//'` ; \ done +override_dh_auto_clean: + [ ! -f $(CURDIR)/include/Make/Platform.make ] || $(MAKE) distclean + +override_dh_auto_configure: templates dh_auto_configure -- \ --prefix=/usr/lib \ --enable-socket \ @@ -268,3 +269,4 @@ override_dh_shlibdeps: override_dh_compress: dh_compress -XAUTHORS +.PHONY: templates -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel