From 18b55d05c0b70cca488e7ad5e090e32999713626 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 17 Sep 2012 18:35:18 -0700
Subject: [PATCH 1/3] Revert "Work around debian build issue related to node
 fibers."

This reverts commit 6121400983cc692eddb1acf27ed1df5257fc1842.

We will solve this by deleting distracting versions of fibers.node rather than
by working around them. This will fix rpmbuild as well.
---
 admin/debian/rules | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/admin/debian/rules b/admin/debian/rules
index 7b223eeb5e..6a83b44185 100755
--- a/admin/debian/rules
+++ b/admin/debian/rules
@@ -17,11 +17,5 @@ override_dh_prep:
 	tar -C debian/tmp/usr/lib -xzf $(TARBALL)
 	echo -n 'deb' > debian/tmp/usr/lib/meteor/.package_stamp
 
-# node fibers distributes copies of the library pre-compiled for many
-# different architectures. This confuses shlibdeps. Just ignore the
-# fibers library.
-override_dh_shlibdeps:
-	dh_shlibdeps -Xfibers.node
-
 %:
 	dh $@ 

From e50d71a208d1234ec6a2fc7cdcec4f5e541c66b6 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 17 Sep 2012 18:38:31 -0700
Subject: [PATCH 2/3] Only include the correct architecture's fibers.node in
 the dev bundle.

---
 admin/generate-dev-bundle.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh
index efc27770e6..3761eef2a4 100755
--- a/admin/generate-dev-bundle.sh
+++ b/admin/generate-dev-bundle.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -u
 
 BUNDLE_VERSION=0.2.2
 UNAME=$(uname)
@@ -182,7 +183,6 @@ npm install mongodb@1.1.5
 npm install uglify-js@1.3.3
 npm install clean-css@0.6.0
 npm install progress@0.0.5
-npm install fibers@0.6.9
 npm install useragent@1.1.0
 npm install request@2.11.0
 npm install http-proxy@0.8.2
@@ -201,6 +201,19 @@ git clone http://github.com/akdubya/rbytes.git
 npm install sockjs@0.3.1
 rm -rf rbytes
 
+npm install fibers@0.6.9
+# Fibers ships with compiled versions of its C code for a dozen platforms. This
+# bloats our dev bundle, and confuses dpkg-buildpackage and rpmbuild into
+# thinking that the packages need to depend on both 32- and 64-bit versions of
+# libstd++. Remove all the ones other than our architecture. (Expression based
+# on build.js in fibers source.)
+FIBERS_ARCH=$(node -p -e 'process.platform + "-" + process.arch + "-v8-" + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0]')
+cd fibers/bin
+mv $FIBERS_ARCH ..
+rm -rf *
+mv ../$FIBERS_ARCH .
+cd ../..
+
 
 cd "$DIR"
 curl "$MONGO_URL" | tar -xz

From 9285bd9cabebf184a08e27e795f6016283ba3350 Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Mon, 17 Sep 2012 18:51:21 -0700
Subject: [PATCH 3/3] Bump dev bundle version number to 0.2.3.

---
 admin/generate-dev-bundle.sh | 2 +-
 meteor                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh
index 3761eef2a4..6f495e7c2d 100755
--- a/admin/generate-dev-bundle.sh
+++ b/admin/generate-dev-bundle.sh
@@ -3,7 +3,7 @@
 set -e
 set -u
 
-BUNDLE_VERSION=0.2.2
+BUNDLE_VERSION=0.2.3
 UNAME=$(uname)
 ARCH=$(uname -m)
 
diff --git a/meteor b/meteor
index 34c354c120..70e583c498 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.2.2
+BUNDLE_VERSION=0.2.3
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.