Reset build revision if data version increases

2 files changed, 5 insertions, 1 deletions

diff --git a/make.sh b/make.sh
index 57b6a6935..1cdb35e85 100755
--- a/make.sh
+++ b/make.sh
@@ -224,6 +224,9 @@ find "${PKG_DEST}" -type f -name '*.a' -print0 | while read -r -d $'\0' bin; do
     "${PKG_BASE}/util/arid" "${bin}"
 done
 
+if [[ -f "${PKG_STAT}/data-ver" ]] && dpkg --compare-versions $(cat "${PKG_DATA}/_metadata/version") gt $(cat "${PKG_STAT}/data-ver"); then
+    rm "${PKG_STAT}/dest-ver"
+fi
 cp -aL "${PKG_DATA}/_metadata/version" "${PKG_STAT}/data-ver"
 echo "${PKG_HASH}" >"${PKG_STAT}/data-md5"
 
diff --git a/package.sh b/package.sh
index 2d683a8ba..24ccad70d 100755
--- a/package.sh
+++ b/package.sh
@@ -11,7 +11,6 @@ export PKG_MAKE=$0
 export PKG_NAME=${1%_}
 
 export PKG_BASE=$(realpath "$(dirname "$0")")
-source "${PKG_BASE}/helper.sh"
 
 # when running fakeroot, we shouldn't use the previous build result
 # as we don't have the fakeroot session info anymore
@@ -22,6 +21,8 @@ else
     ./remake.sh "${PKG_NAME}"
 fi
 
+source "${PKG_BASE}/helper.sh"
+
 pkg: mkdir -p /DEBIAN
 ./control.sh "${PKG_NAME}" control >"$(pkg_ /DEBIAN/control)"