debian: put debian/ in .diff.gz, not release tarball

diff --git a/Makefile.am b/Makefile.am
index 5e076812305eb7bfbb176a5465a12f483b9529af..7c52f738ed4d87314d8ad9932954dde12e947f35 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = gnu
-EXTRA_DIST = autogen.sh ceph.spec.in debian
+EXTRA_DIST = autogen.sh ceph.spec.in
 SUBDIRS = src man
 
 dist-hook:

diff --git a/builddebs.sh b/builddebs.sh
index ab95ebedc0e9166b33f53ddfdfca7ecb7200e343..55ebb12b235c2b8423b249559d507c03c3b892ed 100755 (executable)
--- a/builddebs.sh
+++ b/builddebs.sh
@@ -11,6 +11,8 @@ vers=$1
 
 for dist in sid squeeze lenny
 do
+    pbuilder --clean
+
     if [ -e $basedir/$dist.tgz ]; then
        echo updating $dist base.tgz
        pbuilder update --basetgz $basedir/$dist.tgz --distribution $dist

diff --git a/release.sh b/release.sh
index 5d8fca2b8b13fa91ee3944cd907724128b972e83..5d282b36dad5f317f76e565414f3d1f9d7f12b9b 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -50,6 +50,9 @@ tar zxf ../../ceph-$vers.tar.gz
 [ "$vers" != "$finalvers" ] && mv ceph-$vers ceph-$finalvers
 tar zcf ceph_$finalvers.orig.tar.gz ceph-$finalvers
 
+# add debian dir
+cp -a ../../debian ceph-$finalvers
+
 for dist in sid squeeze lenny
 do
     echo building $dist dsc