You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/08/01 13:41:52 UTC
svn commit: r1615073 - in /syncope/trunk: ./ deb/console/pom.xml
deb/core/pom.xml
Author: ilgrosso
Date: Fri Aug 1 11:41:52 2014
New Revision: 1615073
URL: http://svn.apache.org/r1615073
Log:
[OLINGO-535] Merge from 1_2_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/deb/console/pom.xml
syncope/trunk/deb/core/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1614894-1615072
Modified: syncope/trunk/deb/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/console/pom.xml?rev=1615073&r1=1615072&r2=1615073&view=diff
==============================================================================
--- syncope/trunk/deb/console/pom.xml (original)
+++ syncope/trunk/deb/console/pom.xml Fri Aug 1 11:41:52 2014
@@ -171,6 +171,14 @@ under the License.
<group>tomcat7</group>
</mapper>
</data>
+ <data>
+ <src>${basedir}/../../legal_ext</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/doc/apache-syncope-console</prefix>
+ </mapper>
+ </data>
</dataSet>
</configuration>
</execution>
Modified: syncope/trunk/deb/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/core/pom.xml?rev=1615073&r1=1615072&r2=1615073&view=diff
==============================================================================
--- syncope/trunk/deb/core/pom.xml (original)
+++ syncope/trunk/deb/core/pom.xml Fri Aug 1 11:41:52 2014
@@ -146,7 +146,6 @@ under the License.
<controlDir>${project.basedir}/src/deb/control</controlDir>
<deb>${project.build.directory}/apache-syncope-${project.version}.deb</deb>
<dataSet>
- <!-- Template example -->
<data>
<type>template</type>
<paths>
@@ -210,6 +209,14 @@ under the License.
<group>tomcat7</group>
</mapper>
</data>
+ <data>
+ <src>${basedir}/../../legal_ext</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/doc/apache-syncope</prefix>
+ </mapper>
+ </data>
</dataSet>
</configuration>
</execution>