From ae5dd4eea2a546a85db2f4c440c05c165ca10524 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 30 May 2013 13:49:50 +0000
Subject: [PATCH] Minor fix on deb packages. - added message when buildinfo is not found. - excluded .app / bat files.
---
opends/build.xml | 6 +++---
opends/resource/debian/control/postinst | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 45b9691..0892d25 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1396,10 +1396,10 @@
<replace dir="${build.dir}/deb/control/" token="@prefix@" value="${prefix}" />
<deb destfile="${package.dir}/${PKG_NAME}_${pkg_version_string}-${release}${pkg_version_qualifier}_all.deb"
- control="${build.dir}/deb/control">
+ control="${build.dir}/deb/control" verbose="false">
<tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
includes="**/*"
- excludes="bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
+ excludes="**/bat/**, **/QuickSetup.app/**, **/Uninstall.app/**, **/bin/ControlPanel.app/**, *.bat, bin/*,template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade"
prefix="${prefix}" filemode="644" dirmode="755" />
<tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
includes="lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh"
@@ -1409,7 +1409,7 @@
prefix="${prefix}" filemode="755" dirmode="755" />
<tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/README_WINDOWS.txt"
prefix="${prefix}" filemode="644" dirmode="755" />
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade,QuickSetup.app/Contents/MacOS/JavaApplicationStub,Uninstall.app/Contents/MacOS/JavaApplicationStub,bin/ControlPanel.app/Contents/MacOS/JavaApplicationStub"
+ <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade"
prefix="${prefix}" filemode="755" dirmode="755" />
<tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="template/**/*"
prefix="${prefix}" filemode="444" dirmode="744" />
diff --git a/opends/resource/debian/control/postinst b/opends/resource/debian/control/postinst
index fd3e6a8..9477b50 100644
--- a/opends/resource/debian/control/postinst
+++ b/opends/resource/debian/control/postinst
@@ -37,7 +37,8 @@
fi
else
# Invalid installation, could not find the buildinfo file.
- exit 0
+ echo "Invalid installation, could not find the build info file."
+ exit -1
fi
fi
# End post install script
--
Gitblit v1.10.0