[DebianGIS-dev] CVS Update: mapserver/debian changelog rules

[pabs-guest at haydn.debian.org]

  User: pabs-guest
  Date: 06/02/09 07:12:31

  Modified:    debian   changelog rules
  Log:
  Fix building with sudo
  
  Revision  Changes    Path
  1.65      +2 -1      mapserver/debian/changelog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?annotate=1.65&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog?rev=1.65&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/changelog.diff?r1=1.65&r2=1.64&cvsroot=
  
  -----------------------------------
  
  Index: changelog
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/changelog,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- changelog	9 Feb 2006 04:44:43 -0000	1.64
  +++ changelog	9 Feb 2006 07:12:30 -0000	1.65
  @@ -6,8 +6,9 @@
     * Move the bindings examples into examples subdirs
     * Add a TODO.Debian so we don't forget some things
     * Completely revamp copyright information
  +  * Prevent FTBFS when using sudo instead of fakeroot (Closes: #351869)
   
  - -- Paul Wise <pabs3 at bonedaddy.net>  Thu,  9 Feb 2006 12:41:15 +0800
  + -- Paul Wise <pabs3 at bonedaddy.net>  Thu,  9 Feb 2006 13:00:24 +0800
   
   mapserver (4.6.2-2) UNRELEASED; urgency=low
   
  
  
  
  1.20      +7 -9      mapserver/debian/rules
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules?annotate=1.20&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules?rev=1.20&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/mapserver/debian/rules.diff?r1=1.20&r2=1.19&cvsroot=
  
  -----------------------------------
  
  Index: rules
  ===================================================================
  RCS file: /cvsroot/pkg-grass/mapserver/debian/rules,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- rules	8 Feb 2006 13:42:06 -0000	1.19
  +++ rules	9 Feb 2006 07:12:31 -0000	1.20
  @@ -100,10 +100,11 @@
   	touch build-indep-stamp
   
   build-arch: build-arch-stamp
  -build-arch-stamp: configure-stamp mapscriptvars
  +build-arch-stamp: configure-stamp
   	dh_testdir
   
   	# Build binary lib
  +	$(MAKE) mapscriptvars || touch mapscriptvars
   	$(MAKE)  
   
   	# Build Perl mapscript
  @@ -133,20 +134,17 @@
   # This is needed to do 'make clean', but will be removed by the clean
   # targets.  The end result is that 'debuild clean' only can execute
   # once.  Hack around this problem by faking the creation when make fail.
  -mapscriptvars:
  -	# Needed by perl and python target
  -	$(MAKE) mapscriptvars || touch $@
   
  -clean-first-build: mapscriptvars
  +clean-first-build:
   	dh_testdir
   
   	-$(RM) configure-stamp build-arch-stamp build-indep-stamp
   
   	-$(RM) tile4ms
  +	-$(MAKE) mapscriptvars || touch mapscriptvars
   	-cd mapscript/perl && $(MAKE) distclean
  -
  -	-cd mapscript/python && \
  -		$(PYTHON) setup.py clean --all
  +	-cd mapscript/python && $(PYTHON) setup.py clean --all
  +	-$(RM) mapscriptvars
   
   	-$(RM) mapscript/perl/mapscript.i \
   		mapscript/tcl/mapscript.i \
  @@ -160,7 +158,7 @@
   
   	-$(RM) -rf html/
   
  -	$(RM) debian/.#* .#*
  +	-$(RM) debian/.#* .#*
   
   
   clean: unpatch clean-first-build