debian: fix builder; add newish headers to Makefile.am

diff --git a/build_upload_debian_packages.sh b/build_upload_debian_packages.sh
index c5119cd9ae7270d788057ba615332db5dfb9952f..34b3fc18074b6b01c3ff6e65110b0e24e05efd82 100755 (executable)
--- a/build_upload_debian_packages.sh
+++ b/build_upload_debian_packages.sh
@@ -62,7 +62,7 @@ EOF
     tar zcf ceph-$finalvers.tar.gz ceph-$finalvers
 fi;
 
-if [ "$repo" == "stable" && "$arch" == "amd64" ]; then
+if [ "$repo" = "stable" -a "$arch" = "amd64" ]; then
     scp ceph-$vers.tar.gz sage@ceph.newdream.net:ceph.newdream.net/downloads
 fi
 

diff --git a/src/Makefile.am b/src/Makefile.am
index c32220e1b68f984b565965520a75bf43346aa0ca..a401252a635c73653a839c707130076fad5d44b7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -487,6 +487,7 @@ noinst_HEADERS = \
         crush/types.h\
        include/ClassLibrary.h\
         include/Context.h\
+       include/CompatSet.h\
         include/Distribution.h\
        include/LogEntry.h\
        include/assert.h\
@@ -681,6 +682,7 @@ noinst_HEADERS = \
         mon/PaxosService.h\
         mon/Session.h\
         mon/mon_types.h\
+       mount/canonicalize.c\
        mount/mtab.c\
         msg/Dispatcher.h\
         msg/FakeMessenger.h\