package version changes.

diff --git a/configure.ac b/configure.ac
index 1239134..a4d1f6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@
 m4_define([v_maj], [0])
 m4_define([v_min], [9])
 m4_define([v_mic], [9])
-m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
+#m4_define([v_rev], [060])
+m4_define([v_rev], m4_esyscmd([(cat ./debian/SVN_REV | grep 'Last Changed Rev' || echo 0) | awk '{printf("%s\n", $4);}' | tr -d ' :MSP\n']))
+#m4_define([v_rev], m4_esyscmd([(svnversion . | grep -v exported || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
 dnl m4_undefine([v_rev])

diff --git a/debian/rules b/debian/rules
index f305169..a5cdb95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_MAKE_CLEAN_TARGET := distclean
 DEB_DH_STRIP_ARGS := --dbg-package=libedje-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := 
 #DEB_SOURCE_VERSION := $(shell grep AC_INIT $(DEB_SRCDIR)/configure.ac | cut -d, -f2 | tr -d ' []')
-DEB_SOURCE_VERSION := 0.9.9.0
+DEB_SOURCE_VERSION := $(shell )
 CFLAGS += -fvisibility=hidden -ffast-math
 LDFLAGS += -fvisibility=hidden
 
@@ -17,8 +17,8 @@ build/libedje-doc::
 
 install/libedje-doc::
        tar jxf edje-*-doc.tar.bz2 -C $(DEB_SRCDIR)
-       cp -R $(DEB_SRCDIR)/edje-$(DEB_SOURCE_VERSION)-doc/doc/html debian/libedje-doc/usr/share/doc/libedje-doc/
-       rm -rf $(DEB_SRCDIR)/edje-$(DEB_SOURCE_VERSION)-doc/
+       cp -R $(DEB_SRCDIR)/`ls -d */ | grep edje-*-doc | tr -d ' :MSP/'`/doc/html debian/libedje-doc/usr/share/doc/libedje-doc/
+       rm -rf $(DEB_SRCDIR)/`ls -d */ | grep edje-*-doc | tr -d ' :MSP/'`/
 
 clean::
        [ ! -f Makefile ] || make distclean