[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit c2e2da8a1949eda933885ac7cd491d1b1628dfcc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 13 17:55:43 2013 +0200

    Drop temporary fix for #564243, doxygen doesn't generate files with extra underscores anymore.

diff --git a/debian/changelog b/debian/changelog
index 8277fda..b1188c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
     (closes: #677693)
   * Reinstate doc patch, refresh and update to fix more links.
     (closes: #471198)
+  * Drop temporary fix for #564243, doxygen doesn't generate files with extra
+    underscores anymore.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 03 Oct 2013 23:19:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 8a1a09c..95a32ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -129,9 +129,7 @@ build-stamp: configure-stamp
 	mkdir $(CURDIR)/html || true
 	$(MAKE) docs
 	$(MAKE) man
-	# a temporary workaround for doxygen problem #564243
-	cd man/man1 && \
-			for i in `find . -name "*__*"`; do basename=`basename $$i`; mv $$basename `echo $$basename|sed -e 's/__/_/'`; done
+
 	touch $@
 
 clean:

-- 
GDAL/OGR library and tools