From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Aug 2014 20:37:52 +0000 (-0700)
Subject: Revert "build_debs: horrible hack to remove libbabeltrace from wheezy build deps"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ee83bfe2e985a595c9cfc56402d53dfb2511a225;p=ceph-build.git

Revert "build_debs: horrible hack to remove libbabeltrace from wheezy build deps"

This reverts commit 40a6547fbd2260b4d2e3277242fe97348a826cb9.

This doesn't work.
---

diff --git a/build_debs.sh b/build_debs.sh
index db88ef65..c3b5e4dc 100755
--- a/build_debs.sh
+++ b/build_debs.sh
@@ -37,16 +37,6 @@ do
 
 #[ "$dist" = "sid" ] && dist="wheezy"
 
-    # big fat hack: do not require libbabeltrace for wheezy
-    if [ "$dist" = "wheezy" ]; then
-	echo "doing horribly ugly things to patch the wheezy debian/control file to remove libbabeltrace"
-	mv $releasedir/$cephver/ceph_$cephver.orig.tar.gz $releasedir/$cephver/backup.tgz
-	tar zxvf $releasedir/$cephver/backup.tgz
-	grep -v babeltrace ceph-$cephver/debian/control > ceph-$cephver/debian/control.new
-	mv ceph-$cephver/debian/control.new ceph-$cephver/debian/control
-	tar zcvf $releasedir/$cephver/ceph_$cephver.orig.tar.gz ceph-$cephver
-    fi
- 
     $bindir/update_pbuilder.sh $pbuilddir $dist
 
     echo building debs for $dist
@@ -69,11 +59,6 @@ do
             $releasedir/$cephver/ceph_$bpvers.dsc
     fi
  
-    if [ "$dist" = "wheezy" ]; then
-	echo "restoring original tarball (end wheezy hack)"
-	mv $releasedir/$cephver/backup.tgz $releasedir/$cephver/ceph_$cephver.orig.tar.gz
-    fi
-
 done
 
 # do lintian checks