You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2012/05/29 14:47:05 UTC
svn commit: r1343702 - in /james/app/trunk: pom.xml
src/debian/control/conffiles src/debian/control/control
src/debian/control/copyright
Author: ieugen
Date: Tue May 29 12:47:05 2012
New Revision: 1343702
URL: http://svn.apache.org/viewvc?rev=1343702&view=rev
Log:
JAMES-1343
- deb is created in /usr/share/apache-james/
- things work as they should if you unpacked james into that dir.
- run $ mvn clean install -Pmake-deb to create
- run #dpkg -i apache-james_<version>_all.deb to install
- removing james via #aptitude remove apache-james fails after starting the service because of application created files
Removed:
james/app/trunk/src/debian/control/conffiles
Modified:
james/app/trunk/pom.xml
james/app/trunk/src/debian/control/control
james/app/trunk/src/debian/control/copyright
Modified: james/app/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/app/trunk/pom.xml?rev=1343702&r1=1343701&r2=1343702&view=diff
==============================================================================
--- james/app/trunk/pom.xml (original)
+++ james/app/trunk/pom.xml Tue May 29 12:47:05 2012
@@ -74,7 +74,7 @@
<james.system-property1>-Djames.message.usememorycopy=false</james.system-property1>
<james.system-properties>${james.system-property1}</james.system-properties>
<!-- this name is used for James's folders on Debian systems and james user -->
- <james.debian.user>james</james.debian.user>
+ <james.debian.user>apache-james</james.debian.user>
</properties>
@@ -895,9 +895,12 @@
<targetPath>${project.build.directory}/debian/control</targetPath>
</resource>
<resource>
+ <directory>src/main/app</directory>
+ <targetPath>${project.build.directory}/${project.artifactId}</targetPath>
+ </resource>
+ <resource>
<directory>src/main/resources</directory>
- <!-- override the destination directory for this resource -->
- <targetPath>${project.build.directory}/debian/resources</targetPath>
+ <targetPath>${project.build.directory}/${project.artifactId}/conf</targetPath>
<includes>
<include>**/*.*</include>
</includes>
@@ -916,28 +919,13 @@
</goals>
<configuration>
<deb>${project.build.directory}/${project.artifactId}_${project.version}_all.deb</deb>
+
<dataSet>
+ <!-- all files and dirs -->
<data>
- <src>${project.build.directory}/${project.build.finalName}.jar</src>
- <type>file</type>
- <mapper>
- <type>file</type>
- <prefix>/</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/usr/share/${project.artifactId}</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>644</filemode>
- </mapper>
- </data>
- <!-- all files and dirs -->
- <data>
- <src>${project.basedir}/src/main/app</src>
+ <src>${project.build.directory}/${project.artifactId}</src>
<type>directory</type>
- <includes>*</includes>
- <excludes>**/.svn</excludes>
+ <includes>**/*</includes>
<mapper>
<type>directory</type>
<prefix>/usr/share/${project.artifactId}</prefix>
@@ -945,30 +933,82 @@
<mapper>
<type>perm</type>
<prefix>/usr/share/${project.artifactId}</prefix>
- <user>root</user>
- <group>root</group>
<filemode>755</filemode>
</mapper>
</data>
- <!-- conf files - in the future: move them to /usr/share/james/conf ?? -->
- <data>
- <src>${project.build.directory}/debian/resources</src>
- <type>directory</type>
- <includes>*</includes>
- <excludes>**/.svn</excludes>
- <mapper>
- <type>directory</type>
- <prefix>/etc/${project.artifactId}</prefix>
- </mapper>
- <mapper>
- <type>perm</type>
- <prefix>/etc/${project.artifactId}</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>644</filemode>
- </mapper>
- </data>
- <!-- package documentation files (realease info, install, no javadoc) -->
+ <!-- add the generated jsw daemon and binaries -->
+ <data>
+ <src>${project.build.directory}/appassembler/bin</src>
+ <type>directory</type>
+ <includes>**/*</includes>
+ <mapper>
+ <type>directory</type>
+ <prefix>/usr/share/${project.artifactId}/bin</prefix>
+ </mapper>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/${project.artifactId}/bin</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.build.directory}/appassembler/jsw/james/bin</src>
+ <type>directory</type>
+ <includes>**/*</includes>
+ <mapper>
+ <type>directory</type>
+ <prefix>/usr/share/${project.artifactId}/bin</prefix>
+ </mapper>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/${project.artifactId}/bin</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.build.directory}/appassembler/jsw/james/lib</src>
+ <type>directory</type>
+ <includes>**/*</includes>
+ <excludes>libwrapper*</excludes>
+ <mapper>
+ <type>directory</type>
+ <prefix>/usr/share/${project.artifactId}/lib</prefix>
+ </mapper>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/${project.artifactId}/lib</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.build.directory}/appassembler/jsw/james/lib</src>
+ <type>directory</type>
+ <includes>libwrapper*</includes>
+ <mapper>
+ <type>directory</type>
+ <prefix>/usr/share/${project.artifactId}/bin</prefix>
+ </mapper>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/${project.artifactId}/bin</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
+ <data>
+ <src>${project.build.directory}/appassembler/jsw/james/conf</src>
+ <type>directory</type>
+ <includes>**/*</includes>
+ <mapper>
+ <type>directory</type>
+ <prefix>/usr/share/${project.artifactId}/conf</prefix>
+ </mapper>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/share/${project.artifactId}/conf</prefix>
+ <filemode>755</filemode>
+ </mapper>
+ </data>
+ <!-- package documentation files (realease info, install, no javadoc) -->
<data>
<src>${project.basedir}</src>
<type>directory</type>
@@ -980,8 +1020,6 @@
<mapper>
<type>perm</type>
<prefix>/usr/share/doc/${project.artifactId}</prefix>
- <user>root</user>
- <group>root</group>
<filemode>644</filemode>
</mapper>
</data>
@@ -995,8 +1033,6 @@
<mapper>
<type>perm</type>
<prefix>/usr/share/doc/${project.artifactId}</prefix>
- <user>root</user>
- <group>root</group>
<filemode>644</filemode>
</mapper>
</data>
@@ -1011,15 +1047,11 @@
<mapper>
<type>perm</type>
<prefix>/usr/share/${project.artifactId}/lib</prefix>
- <user>root</user>
- <group>root</group>
<filemode>644</filemode>
</mapper>
</data>
</dataSet>
<controlDir>${project.build.directory}/debian/control</controlDir>
- <changesIn>${project.basedir}README.txt</changesIn>
- <changesOut>${project.build.directory}/${project.build.finalName}.changes</changesOut>
</configuration>
</execution>
</executions>
Modified: james/app/trunk/src/debian/control/control
URL: http://svn.apache.org/viewvc/james/app/trunk/src/debian/control/control?rev=1343702&r1=1343701&r2=1343702&view=diff
==============================================================================
--- james/app/trunk/src/debian/control/control (original)
+++ james/app/trunk/src/debian/control/control Tue May 29 12:47:05 2012
@@ -1,10 +1,15 @@
+Source: apache-james
Package: ${artifactId}
Version: ${project.version}
-Section: mail
+Section: contrib/java
Priority: optional
-Architecture: all
-Depends: java6-runtime
Maintainer: Apache James Team <se...@james.apache.org>
+Uploaders: Ioan Eugen Stan <ie...@apache.org>
+Architecture: all
+Homepage: http://james.apache.org
+Depends: default-jre-headless | java6-runtime-headless | java-6-runtime
+Provides: imap-server, mail-transport-agent, pop3-server
+Conflicts: mail-transport-agent
Description: Hi-performance, modular and extensible Java based email server.
The Apache James Project delivers a rich set of open source modules and
libraries, written in Java, related to Internet mail communication which build
Modified: james/app/trunk/src/debian/control/copyright
URL: http://svn.apache.org/viewvc/james/app/trunk/src/debian/control/copyright?rev=1343702&r1=1343701&r2=1343702&view=diff
==============================================================================
--- james/app/trunk/src/debian/control/copyright (original)
+++ james/app/trunk/src/debian/control/copyright Tue May 29 12:47:05 2012
@@ -21,6 +21,3 @@ License: Apache-2.0
.
On Debian systems, the complete text of the Apache version 2.0 license
can be found in "/usr/share/common-licenses/Apache-2.0".
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org