# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1266758552 -3600
# Node ID a306de9b89168e817cf19ddc93cb624b768a9069
# Parent  11b67f0f548a4d4275724a170cb84ae934d76f2f# Parent  4125ce84f068391b5ae13f18e88a852d793de04f
merge

diff -r 4125ce84f068 -r a306de9b8916 Makefile
--- a/Makefile	Sun Feb 21 02:11:55 2010 +0100
+++ b/Makefile	Sun Feb 21 14:22:32 2010 +0100
@@ -96,6 +96,7 @@
 $(1): $(PREFIX)/installed/$(1)
 $(PREFIX)/installed/$(1): $(TOP_DIR)/src/$(1).mk \
                           $(wildcard $(TOP_DIR)/src/$(1)-*.patch) \
+                          $(wildcard $(TOP_DIR)/src/$(1)-test*) \
                           $(addprefix $(PREFIX)/installed/,$($(1)_DEPS))
 	@[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'
 	@[ -d '$(PKG_DIR)' ]              || mkdir -p '$(PKG_DIR)'
@@ -234,6 +235,7 @@
 	cp -p '$(TOP_DIR)/Makefile'    '$(DIST_DIR)/mingw-cross-env-$(VERSION)/'
 	cp -p '$(TOP_DIR)/src'/*.mk    '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
 	cp -p '$(TOP_DIR)/src'/*.patch '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
+	cp -p '$(TOP_DIR)/src'/*-test* '$(DIST_DIR)/mingw-cross-env-$(VERSION)/src/'
 	(cd '$(DIST_DIR)' && tar cvf - 'mingw-cross-env-$(VERSION)' | gzip -9) >'$(DIST_DIR)/releases/mingw-cross-env-$(VERSION).tar.gz'
 	rm -rf '$(DIST_DIR)/mingw-cross-env-$(VERSION)'
 
diff -r 4125ce84f068 -r a306de9b8916 doc/index.html
--- a/doc/index.html	Sun Feb 21 02:11:55 2010 +0100
+++ b/doc/index.html	Sun Feb 21 14:22:32 2010 +0100
@@ -405,11 +405,11 @@
 
     <dl>
 
-    <dt>2010-xx-xx &ndash; Release <span id="latest-version">2.12</span></dt>
+    <dt>2010-xx-xx &ndash; Release <span id="latest-version">2.13</span></dt>
     <dd>
         <p>
-        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.12.tar.gz">Download</a> |
-        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.12">Changelog</a>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.13.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.13">Changelog</a>
         </p>
 
         <p>
@@ -847,11 +847,11 @@
 
     <dl>
 
-    <dt>2010-02-20 &ndash; Release 2.11</dt>
+    <dt>2010-02-21 &ndash; Release 2.12</dt>
     <dd>
         <p>
-        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.11.tar.gz">Download</a> |
-        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.11">Changelog</a>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.12.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.12">Changelog</a>
         </p>
 
         <p>
@@ -878,6 +878,19 @@
         </p>
     </dd>
 
+    <dt>2010-02-20 &ndash; Release 2.11</dt>
+    <dd>
+        <p>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.11.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.11">Changelog</a>
+        </p>
+
+        <p>
+        This release contains a packaging bug.
+        Please use release 2.12 instead.
+        </p>
+    </dd>
+
     <dt>2009-12-23 &ndash; Release 2.10</dt>
     <dd>
         <p>