From 58d38c7d3e2709cc84da8729998350536069cb45 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 21 Aug 2013 07:47:45 +0000
Subject: [PATCH] Partial fix for OPENDJ-1114 Improve the DEB package - copyright added - doc section added (to complete)
---
opends/build.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 175ffd0..1c2b6ba 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1492,8 +1492,9 @@
<getversionnumber property="VERSION_NUMBER_STRING" />
- <property name="prefix" value="/opt/opendj"/>
- <property name="release" value="1"/>
+ <property name="prefix" value="/opt/opendj"/>
+ <property name="release" value="1"/>
+ <property name="docprefix" value="/usr/share/doc/opendj"/>
<mkdir dir="${build.dir}/deb/control" />
@@ -1511,21 +1512,21 @@
</copy>
<!-- Debian files for preinst/postinstall/preuninstall/postuninstall -->
-
+
<copy todir="${build.dir}/deb/control">
<fileset dir="resource/debian/control"/>
</copy>
+ <copy file="resource/debian/copyright" tofile="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}/copyright" />
<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">
+ control="${build.dir}/deb/control" verbose="false">
<tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}"
includes="**/*"
- excludes="**/bat/**, **/QuickSetup.app/**, **/Uninstall.app/**, **/*ControlPanel.app*/**, **/*.bat*, **/*.exe*, bin/*, template/**/*,lib/_client-script.sh,lib/_script-util.sh,lib/_server-script.sh,lib/_mixed-script.sh,setup,uninstall,upgrade"
+ excludes="**/bat/**, **/*.app/**, **/*.bat*, **/*.exe*, bin/*, template/**/*, lib/*.sh, setup, uninstall, upgrade, legal-notices/**, copyright"
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"
+ <tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="lib/*.sh"
prefix="${prefix}" filemode="755" dirmode="755" />
<tarfileset dir="${package.dir}/${SHORT_NAME}-${VERSION_NUMBER_STRING}" includes="bin/*"
excludes="bin/README_WINDOWS.txt, **/bin/ControlPanel.app/"
@@ -1533,7 +1534,9 @@
<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" />
+ 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" />
</deb>
</target>
--
Gitblit v1.10.0