Make stage1 merge in "packaging" branch.

diff --git a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1 b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1
index 743ca591db9b201d94a066fb74908cff88444ed9..906d0ef862b6fceb346aa72d45d253ec555c8691 100755 (executable)
--- a/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1
+++ b/debian/buildnewlinuxpackage/buildnewlinuxpackage-stage1
@@ -15,6 +15,9 @@ git config --local user.name "Raspbian kernel package updater"
 git config --local user.email root@raspbian.org
 git config merge.conflictstyle diff3
 
+#merge any changes from "packaging" branch
+git merge --no-edit packaging
+
 #merge in existing packaging
 git merge buildnewlinuxpackage-deb || true