The following commit has been merged in the master branch:
commit 56aa9870a3ef0442d8e3e9a5a8a80e9d86900af9
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jun 14 22:55:04 2013 +0200

    Additional cleanup to allow building twice.

diff --git a/debian/changelog b/debian/changelog
index e3475da..3b2804f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ mapserver (6.2.1-3) UNRELEASED; urgency=low
   * Empty dependency_libs in la files.
   * Use PHP5API variable instead of hardcoded path to la file.
   * Remove RPATH from mapscript libraries.
+  * Additional cleanup to allow building twice.
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Fri, 14 Jun 2013 22:00:07 +0200
 
diff --git a/debian/libmapserver.install b/debian/libmapserver.install
index 6546608..c5d9217 100644
--- a/debian/libmapserver.install
+++ b/debian/libmapserver.install
@@ -1 +1 @@
-usr/lib/libmapserver*.so*
\ No newline at end of file
+usr/lib/libmapserver*.so*
diff --git a/debian/rules b/debian/rules
index 03e637c..54fb3af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,12 +112,13 @@ clean-first-build:
        [ ! -f $(CURDIR)/Makefile ] || $(MAKE) mapscriptvars 
        touch mapscriptvars
        [ ! -f $(CURDIR)/mapscript/perl/Makefile ] || $(MAKE) distclean -C 
$(CURDIR)/mapscript/perl
+       -$(RM) mapscript/perl/Makefile.PL
        -cd mapscript/python && \
          for python in $(PYVERS); do $$python setup.py clean; done
-       -$(RM) -rf mapscript/python/build
+       -$(RM) -rf mapscript/python/build mapscript/python/Makefile
        [ ! -f $(CURDIR)/mapscript/ruby/Makefile ] || $(MAKE) distclean -C 
$(CURDIR)/mapscript/ruby
        -$(RM) -rf $(CURDIR)/mapscript/ruby/mapscript_wrap.c
-       -$(RM) mapscriptvars
+       -$(RM) mapscriptvars libtool
 
        -$(RM)  mapscript/perl/mapscript.i \
                mapscript/tcl/mapscript.i \

-- 
Mapserver

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to