Merge branch 'master' of ssh://fleuret@login.idiap.ch/homes/fleuret/public/git/selector

diff --git a/Makefile b/Makefile
index d80b4cd..1768697 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ MAN_PATH = /usr/share/man/man1
 
 LDFLAGS=-lcurses
 
-REVISION_NUMBER=$(shell git log | grep ^commit | wc -l)
+REVISION_NUMBER=$(shell git log | grep ^commit | wc -l | sed -e "s/[^0-9]//g")
 
 ifeq ($(DEBUG),yes)
   OPTIMIZE_FLAG = -ggdb3 -DDEBUG

diff --git a/REVISION_NUMBER b/REVISION_NUMBER
new file mode 100644 (file)
index 0000000..dee261d
--- /dev/null
+++ b/REVISION_NUMBER
@@ -0,0 +1 @@
+140

diff --git a/mkdeb.sh b/mkdeb.sh
index 63e225e..51d023a 100755 (executable)
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -25,9 +25,7 @@
 # This script creates the Debian package. The way it does it is
 # probably not very conventional. I am open to suggestions.
 
-# Depends: ${shlibs:Depends}
-
-VERSION=1.0-R`git log|grep ^commit|wc -l`
+VERSION=1.0-R`git log | grep ^commit | wc -l | sed -e "s/[^0-9]//g"`
 PACKAGE=/tmp/selector_${VERSION}_i386.deb
 BIN_PATH="usr/bin"
 MAN_PATH="usr/share/man/man1"
@@ -39,7 +37,7 @@ for d in DEBIAN ${BIN_PATH} ${MAN_PATH}; do
     mkdir -p ${TMP}/${d}
 done
 
-LIB_DEPENDS=$(dpkg-shlibdeps -O ./selector|grep Depends|sed -e "s/^.*Depends=//")
+LIB_DEPENDS=$(dpkg-shlibdeps -O ./selector | grep Depends | sed -e "s/^.*Depends=//")
 
 cat > ${TMP}/DEBIAN/control <<EOF
 Package: selector