debian: updated debian build scripts, changelog

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

diff --git a/build_upload_debian_packages.sh b/build_upload_debian_packages.sh
index 34b3fc18074b6b01c3ff6e65110b0e24e05efd82..712aeda78879702d5e7b5c05eec3e810f13399db 100755 (executable)
--- a/build_upload_debian_packages.sh
+++ b/build_upload_debian_packages.sh
@@ -7,7 +7,6 @@ echo vers $vers
 
 repo=$1
 arch=$2
-snapshot=$3
 
 [ -z "$repo" ] && echo no repo && exit 1
 [ -z "$arch" ] && echo no arch && exit 1
@@ -28,8 +27,8 @@ fi
 echo final vers $finalvers
 
 echo cleanup
-rm *.deb *.tar.gz *.changes *.dsc || true
-rm -rf ceph-$vers* || true
+rm -rf ceph-* || true
+rm -rf debtmp || true
 
 echo generating git version stamp
 cd src
@@ -43,37 +42,53 @@ make dist
 echo extracting
 tar zxf ceph-$vers.tar.gz
 
+# mangle version
 if [ "$vers" != "$finalvers" ]; then
     echo "renaming ceph-$vers to ceph-$finalvers, rebuilding tarball"
     mv ceph-$vers ceph-$finalvers
     sed -i "s/ceph, $vers/ceph, $finalvers/" ceph-$finalvers/configure.ac
+   
+    tar zcf ceph-$finalvers.tar.gz ceph-$finalvers
+fi;
 
-    mv ceph-$finalvers/debian/changelog ceph-$finalvers/debian/changelog.tmp
-    cat <<EOF > ceph-$finalvers/debian/changelog
-ceph ($finalvers) unstable; urgency=low
 
-   * snapshot from git at $versuffix
+## go
 
- -- sage <sage@newdream.net>  $debdate
+echo creating debtmp with .orig.tar.gz
+mkdir -p debtmp
+cp ceph-$finalvers.tar.gz debtmp/ceph_$finalvers.orig.tar.gz
+cd debtmp
 
-EOF
-    cat ceph-$finalvers/debian/changelog.tmp >> ceph-$finalvers/debian/changelog
-    
-    tar zcf ceph-$finalvers.tar.gz ceph-$finalvers
-fi;
+echo extracting .orig.tar.gz
+tar zxf ceph_$finalvers.orig.tar.gz
 
-if [ "$repo" = "stable" -a "$arch" = "amd64" ]; then
-    scp ceph-$vers.tar.gz sage@ceph.newdream.net:ceph.newdream.net/downloads
+# copy in debian dir, fix up changelog
+echo setting up debian dir
+cp -aL ../debian ceph-$finalvers
+if [ "$vers" != "$finalvers" ]; then
+    cd ceph-$finalvers
+    DEBEMAIL="sage@newdream.net" dch -v $finalvers-1 'git snapshot'
+    cd ..
 fi
 
 cd ceph-$finalvers
-./autogen.sh
 dpkg-buildpackage -rfakeroot -us -uc
 cd ..
 
-# upload
-rsync -v --progress *$arch.{deb,changes} sage@ceph.newdream.net:debian/dists/$repo/main/binary-$arch
-rsync -v --progress ceph_* sage@ceph.newdream.net:debian/dists/$repo/main/source
+if [ "$3" = "upload" ]; then
+
+    # upload
+    rsync -v --progress *$arch* sage@ceph.newdream.net:debian/dists/$repo/main/binary-$arch
+    rsync -v --progress ceph_$finalvers[.-]* sage@ceph.newdream.net:debian/dists/$repo/main/source
+
+    cd ..
+
+#exit 0
+
+    if [ "$repo" = "stable" -a "$arch" = "amd64" ]; then
+       scp ceph-$vers.tar.gz sage@ceph.newdream.net:ceph.newdream.net/downloads
+    fi
 
-# rebuild index
-ssh sage@ceph.newdream.net build_debian_repo.sh
+    # rebuild index
+    ssh sage@ceph.newdream.net build_debian_repo.sh
+fi
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index 02d1ea3ec6f518f7f442a9d6f439f4caebc76cd4..e6c01b4529deb7e81a31b9c2d3a51b9c4f785c5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ceph (0.18) unstable; urgency=low
+ceph (0.18-1) unstable; urgency=low
 
   * crush: selectable hash functions
   * osdmap: selectable hash functions
@@ -18,7 +18,7 @@ ceph (0.18) unstable; urgency=low
 
  -- Sage Weil <sage@newdream.net>  Fri,  4 Dec 2009 10:01:00 -0800
 
-ceph (0.17) unstable; urgency=low
+ceph (0.17-1) unstable; urgency=low
 
   * kclient: fix multiple mds mdsmap decoding
   * kclient: fix mon subscription renewal

diff --git a/debian/rules b/debian/rules
index 0ea7dff048654fce4962f20c24397e657ae10ca1..bef753c44b337d8d1dcb9c8177d6fa9dde7f2352 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,6 @@ build-stamp: configure-stamp
        ./configure --prefix=/usr
        $(MAKE)
 
-       # LAME: 'make dist' won't include symlinks with non-existant targets.
-       cp src/init-ceph debian/ceph.init
-
        touch $@
 clean: 
        dh_testdir