Author: frankie Date: 2007-10-19 11:50:17 +0000 (Fri, 19 Oct 2007) New Revision: 1227
Modified: packages/grass/branches/6.3/debian/changelog packages/grass/branches/6.3/debian/control packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch Log: Fixes for a new snapshot Modified: packages/grass/branches/6.3/debian/changelog =================================================================== --- packages/grass/branches/6.3/debian/changelog 2007-10-18 11:55:56 UTC (rev 1226) +++ packages/grass/branches/6.3/debian/changelog 2007-10-19 11:50:17 UTC (rev 1227) @@ -1,10 +1,16 @@ -grass (6.3~20070922-2) NOT-FOR-RELEASE; urgency=low +grass (6.3~20070922-1) NOT-FOR-RELEASE; urgency=low -- THIS IS A NOT FOR RELEASE BRANCH OF THE MAIN DEVELOPMENT TREE -- * Added Homepage field in debian/control. + * Revised 6.2.2 patches as needed. + * Merges from 6.2.2 tree: + * Removed libgl1-mesa-swx11-dev in debian/control + * Removed --with-glx in debian/rules + * libglu1-mesa-dev replaces libglu1-xorg-dev which replaced xlibmesa-glu-dev. + Kept libglu1-xorg-dev around for sarge backports. - -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Fri, 28 Sep 2007 23:37:46 +0200 + -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Thu, 18 Oct 2007 20:43:08 +0200 grass (6.3~20070922-1) NOT-FOR-RELEASE; urgency=low Modified: packages/grass/branches/6.3/debian/control =================================================================== --- packages/grass/branches/6.3/debian/control 2007-10-18 11:55:56 UTC (rev 1226) +++ packages/grass/branches/6.3/debian/control 2007-10-19 11:50:17 UTC (rev 1227) @@ -4,7 +4,7 @@ Maintainer: Debian GIS Project <[email protected]> Uploaders: Francesco Paolo Lovergine <[EMAIL PROTECTED]>, Steve Halasz <[EMAIL PROTECTED]> Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 5), dpatch, - libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libgl1-mesa-swx11-dev, libglu1-xorg-dev | xlibmesa-glu-dev, + libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.4.0) | libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev Standards-Version: 3.7.2 Modified: packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch =================================================================== --- packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch 2007-10-18 11:55:56 UTC (rev 1226) +++ packages/grass/branches/6.3/debian/patches/htmlgen-fakeroot.dpatch 2007-10-19 11:50:17 UTC (rev 1227) @@ -8,14 +8,14 @@ @DPATCH@ diff -urNad grass-6.3~20070922~/include/Make/Html.make grass-6.3~20070922/include/Make/Html.make ---- grass-6.3~20070922~/include/Make/Html.make 2007-05-12 06:20:06.000000000 +0200 -+++ grass-6.3~20070922/include/Make/Html.make 2007-09-26 11:25:39.000000000 +0200 -@@ -44,7 +44,7 @@ +--- grass-6.3~20071013~/include/Make/Html.make 2007-10-16 09:51:23.000000000 +0200 ++++ grass-6.3~20071013/include/Make/Html.make 2007-10-16 10:05:27.000000000 +0200 +@@ -34,7 +34,7 @@ GISBASE=$(RUN_GISBASE) \ PATH="$(BIN):$$PATH" \ $(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \ -- LC_ALL=C $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true -+ LC_ALL=C fakeroot $(1) --html-description | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true +- LC_ALL=C $(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true ++ LC_ALL=C $(1) fakeroot --html-description < /dev/null | grep -v '</body>\|</html>' > $(PGM).tmp.html ; true - # html rules for cmd commands - htmlcmd: htmlcmd1 htmlgen + $(HTMLDIR)/$(PGM).html: $(HTMLSRC) + if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<) ; fi _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
