[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[DebianGIS] GRASS: htmlgen-fakeroot.dpatch does not apply any more



Hi,

I tried to build the GRASSS Debian package from CVS:

export CVSROOT=:pserver:grass-guest@intevation.de:/home/grass/grassrepository
cvs -z3 co grass6

using Debian files from:

svn export svn://svn.debian.org/pkg-grass/packages/grass/branches/6.3/debian

Unfortunately the debian/patches/htmlgen-fakeroot.dpatch does not 
apply any more. I attach a new patch that worked here.

Many thanks for all your hard work.

-- 
Niccolo Rigacci
Firenze - Italy
#! /bin/sh /usr/share/dpatch/dpatch-run
## htmlgen-fakeroot.dpatch by  <debian@adkgis.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: use fakeroot to avoid weird stat/permission problem when
## DP: building under pbuilder. This was preventing most man
## DP: pages from being built.

@DPATCH@
diff -urNad grass-6.3~20070922~/include/Make/Html.make grass-6.3~20070922/include/Make/Html.make
--- 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 < /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
 
 $(HTMLDIR)/$(PGM).html: $(HTMLSRC)
 	if [ "$(HTMLSRC)" != "" ] ; then $(call htmldesc,$<) ; fi

Reply to: