From aedaf5652dd9b728942b9f30836458fe80a423c1 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 22 Aug 2013 09:38:01 +0000
Subject: [PATCH] OPENDJ-1114 Improve the debian package - Original data are copied under build/deb/ folder as the process to build the deb package implies to modify the source. - Opendj init script has been modified. Indeed, under debian OS (and others) the /var/run/ folder is deleted at reboot, deleting by the same way our pid file, making the service wobbly. - As linux distro use the same opendj file, a new folder was created under resource to store the shared file between them. - At last, modified post/prem/specFile as well as the fact to create a symlink on an existing one throws an error. (same when you try to remove one from no-existing)
---
opends/build.xml | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 1c2b6ba..6f7f666 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1462,7 +1462,7 @@
<copy file="resource/rpm/excludedFiles" tofile="${build.dir}/rpm/SOURCES/excludedFiles" />
<replace file="${build.dir}/rpm/SOURCES/excludedFiles" token="# [[ excludedListFiles ]]" value="${excludedRPMFiles}" />
- <copy file="resource/rpm/opendj" tofile="${build.dir}/rpm/SOURCES/opendj" />
+ <copy file="resource/sysv/opendj" tofile="${build.dir}/rpm/SOURCES/opendj" />
<rpm specfile="specFile"
topdir="${build.dir}/rpm"
@@ -1492,9 +1492,10 @@
<getversionnumber property="VERSION_NUMBER_STRING" />
- <property name="prefix" value="/opt/opendj"/>
- <property name="release" value="1"/>
- <property name="docprefix" value="/usr/share/doc/opendj"/>
+ <property name="prefix" value="/opt/opendj"/>
+ <property name="release" value="1"/>
+ <property name="docprefix" value="/usr/share/doc/opendj"/>
+ <property name="build.deb.dir" value="${build.dir}/deb/${SHORT_NAME}-${VERSION_NUMBER_STRING}"/>
<mkdir dir="${build.dir}/deb/control" />
@@ -1510,33 +1511,34 @@
<filter token="description" value="${PRODUCT_NAME}"/>
</filterset>
</copy>
-
- <!-- Debian files for preinst/postinstall/preuninstall/postuninstall -->
- <copy todir="${build.dir}/deb/control">
- <fileset dir="resource/debian/control"/>
+ <copy todir="${build.deb.dir}">
+ <fileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"/>
</copy>
- <copy file="resource/debian/copyright" tofile="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}/copyright" />
+ <copy file="resource/debian/copyright" tofile="${build.deb.dir}/copyright" />
+ <copy file="resource/sysv/opendj" tofile="${build.deb.dir}/opendj" />
<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" verbose="false">
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
+ <tarfileset dir="${build.deb.dir}"
includes="**/*"
- excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright"
+ excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright, README, bin/README_WINDOWS.txt, example-plugin.zip, opendj"
prefix="${prefix}" filemode="644" dirmode="755" />
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="lib/*.sh"
+ <tarfileset dir="${build.deb.dir}" includes="lib/*.sh"
prefix="${prefix}" filemode="755" dirmode="755" />
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/*"
+ <tarfileset dir="${build.deb.dir}" includes="bin/*"
excludes="bin/README_WINDOWS.txt, **/bin/ControlPanel.app/"
prefix="${prefix}" filemode="755" dirmode="755" />
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="setup,uninstall,upgrade"
+ <tarfileset dir="${build.deb.dir}" includes="setup,uninstall,upgrade"
prefix="${prefix}" filemode="755" dirmode="755" />
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="template/**/*"
+ <tarfileset dir="${build.deb.dir}" includes="template/**/*"
prefix="${prefix}" filemode="444" dirmode="744" />
- <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="legal-notices/**, copyright"
- prefix="${docprefix}" filemode="755" dirmode="744" />
+ <tarfileset dir="${build.deb.dir}" includes="legal-notices/**, copyright, README, example-plugin.zip"
+ prefix="${docprefix}" filemode="644" dirmode="755" />
+ <tarfileset dir="${build.deb.dir}" includes="opendj"
+ prefix="/etc/init.d" filemode="755" dirmode="755" />
</deb>
</target>
--
Gitblit v1.10.0