Permalink
Browse files

Clear script variables when build for multi distros

  • Loading branch information...
1 parent a890411 commit 9f1782d823c44f6e16a80443aac9df903806a6ef @SokoloffA SokoloffA committed Oct 12, 2012
Showing with 22 additions and 4 deletions.
  1. +4 −0 distr/deb/debian/compat
  2. +4 −1 distr/deb/debian/control
  3. +14 −3 distr/deb/makeDeb.sh
@@ -1 +1,5 @@
+%if MULTIARCH yes
8
+%else
+7
+%endif
@@ -6,9 +6,12 @@ Source: razorqt
Section: x11
Priority: optional
Maintainer: %DEBFULLNAME% <%DEBEMAIL%>
-Build-Depends: debhelper (>= 8.0.0~), pkg-config,
+Build-Depends: pkg-config,
%if MULTIARCH yes
+ debhelper (>= 8.0.0~),
dpkg-dev (>= 1.16.0~),
+%else
+ debhelper (>= 7.0.50~),
%endif
cmake,
libqt4-dev (>= 4.6.0),
View
@@ -29,8 +29,12 @@ function debug
function setVariable
{
- VARIABLES="${VARIABLES}$2=$3\n"
- debug "set variable: $2 = $3"
+ shift
+ local VAR=$1
+ shift
+
+ VARIABLES="${VARIABLES}${VAR}=$*\n"
+ debug "set variable: ${VAR} = $*"
debug "variables $VARIABLES"
}
@@ -39,6 +43,12 @@ function getVariable
printf "$VARIABLES" | awk -F'=' "/${1}=/ {print(\$2)}"
}
+function clearVariables
+{
+ debug "clear variables: $VARIABLES"
+ VARIABLES=''
+}
+
function checkIf
{
shift
@@ -336,6 +346,7 @@ for RELEASE in ${RELEASE}; do
mkdir -p ${DIR}/debian/source
DATE=`date -R`
+ clearVariables
prepareFile ${DIR}/distr/deb/debian/control > ${DIR}/debian/control
for src in `find ${DIR}/distr/deb/debian -type f \! -name "control"`; do
@@ -350,7 +361,7 @@ for RELEASE in ${RELEASE}; do
ret=$?
[ $ret -eq 0 ] || exit $ret
else
- exit
+ mv ${DIR}/debian ${DIR}/${RELEASE}-debian
fi
done

0 comments on commit 9f1782d

Please sign in to comment.