[SCM] gdal branch, master, updated. upstream/1.8.0-18-gbad5afb
The following commit has been merged in the master branch: commit 029c9d5d3c72ee6d99f707c380dd7095306d10f0 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat Apr 23 16:30:21 2011 +0200 Commenting out libtool hack diff --git a/debian/rules b/debian/rules index 4d38cf2..5292d29 100755 --- a/debian/rules +++ b/debian/rules @@ -93,17 +93,17 @@ configure-stamp: # Overrides the generated libtool with official one, due to # breakage in upstream version. - cp /usr/bin/libtool $(CURDIR)/libtool + #cp /usr/bin/libtool $(CURDIR)/libtool # Patch the generated libtool to avoid passing -rpath when linking, # and to explicitly link libraries against the libraries they # depend on. - sed libtool libtool-2 \ + #sed libtool libtool-2 \ -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec= -D__LIBTOOL_IS_A_FOOL__ /' \ -e '/^archive_cmds=/s/$$/ \\$$deplibs/' \ -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/' - mv libtool-2 libtool - chmod 755 libtool + #mv libtool-2 libtool + #chmod 755 libtool touch $@ -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.0-18-gbad5afb
The following commit has been merged in the master branch: commit 86c9ab70cdbbe20c4d98ce487b2fa10d4a070c9e Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat Apr 23 16:40:56 2011 +0200 Fixed typo. diff --git a/debian/rules b/debian/rules index 5292d29..d67b8e5 100755 --- a/debian/rules +++ b/debian/rules @@ -99,9 +99,9 @@ configure-stamp: # and to explicitly link libraries against the libraries they # depend on. #sed libtool libtool-2 \ - -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec= -D__LIBTOOL_IS_A_FOOL__ /' \ - -e '/^archive_cmds=/s/$$/ \\$$deplibs/' \ - -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/' + # -e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec= -D__LIBTOOL_IS_A_FOOL__ /' \ + # -e '/^archive_cmds=/s/$$/ \\$$deplibs/' \ + # -e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/' #mv libtool-2 libtool #chmod 755 libtool -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[SCM] gdal branch, master, updated. upstream/1.8.0-18-gbad5afb
The following commit has been merged in the master branch: commit bad5afbf71e96bc0f6cb877ca4be804eaa3ffef5 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sat Apr 23 17:27:26 2011 +0200 Create missing html directory. diff --git a/debian/rules b/debian/rules index d67b8e5..02c0579 100755 --- a/debian/rules +++ b/debian/rules @@ -126,6 +126,7 @@ build-stamp: $(MAKE) -C $(CURDIR)/swig/python install DESTDIR=$(CURDIR)/debian/python-tmp; \ done + mkdir $(CURDIR)/html || true $(MAKE) docs $(MAKE) man # a temporary workaround for doxygen problem #564243 @@ -142,6 +143,7 @@ clean: rm -f GDALmake.opt-* rm -rf $(CURDIR)/man/man1 rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp + rm -rf $(CURDIR)/html dh_clean -- GDAL/OGR library and tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
