[SCM] live-build branch, debian, updated. debian/3.0_a28-1-5-g89a66b4
Daniel Baumann
daniel at debian.org
Sat Aug 13 06:31:05 UTC 2011
The following commit has been merged in the debian branch:
commit 9a94a6d6d99eb0bb9c32b0ec2fb22932442f66d4
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Aug 8 21:19:44 2011 +0200
Using global version file rather than using copied information in functions/common.sh.
diff --git a/Makefile b/Makefile
index bdbaa53..cbb2478 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ build:
install:
# Installing shared data
mkdir -p $(DESTDIR)/usr/share/live/build
- cp -r cgi data examples functions scripts includes package-lists templates $(DESTDIR)/usr/share/live/build
+ cp -r cgi data examples functions scripts includes package-lists templates VERSION $(DESTDIR)/usr/share/live/build
cp -r share/* $(DESTDIR)/usr/share/live/build
# Installing executables
diff --git a/VERSION b/VERSION
index f5d60d5..fa688b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a28
+3.0~a28-1
diff --git a/functions/common.sh b/functions/common.sh
index b410cfc..327020a 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
PROGRAM="live-build"
-VERSION="3.0~a28-1"
+VERSION="$(cat ${LB_BASE}VERSION)"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/auto/scripts:${PATH}"
--
live-build
More information about the debian-live-changes
mailing list