Debian work.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4349 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -1189,13 +1189,13 @@
 	<property name="mac.dmg.dir" value="${basedir}/Wildfire" />
 	<property name="mac.dmg.file" value="${basedir}/wildfire.dmg" />
 	<property name="mac.dmg.template" value="${basedir}/build/osx/template.dmg" />
-	
+
 	<target name="mac.delete">
 		<delete dir="${mac.pkg.dir}" />
 		<delete dir="${mac.dmg.dir}" />
 		<delete file="${mac.dmg.file}" />
 	</target>
-	
+
 	<target name="mac.prepare" depends="mac.delete,jar">
 		<unzip src="${basedir}/build/osx/template.dmg.zip" dest="${basedir}/build/osx/" />
 		<copy file="${mac.dmg.template}" tofile="${basedir}/tmp.dmg" />
@@ -1211,7 +1211,7 @@
 			</fileset>
 		</copy>
 		<mkdir dir="${mac.pkg.dir}/System/Library/LaunchDaemons"/>
-		<copy file="${basedir}/build/osx/org.jivesoftware.wildfire.plist" 
+		<copy file="${basedir}/build/osx/org.jivesoftware.wildfire.plist"
 			todir="${mac.pkg.dir}/System/Library/LaunchDaemons"/>
 		<mkdir dir="${mac.dmg.dir}"/>
 		<exec executable="chown">
@@ -1225,11 +1225,11 @@
 			<fileset dir="${basedir}/build/osx/resources"/>
 		</chmod>
 	</target>
-	
+
 	<!-- Create a Mac OS X installer -->
 	<target name="mac.pkg" depends="mac.prepare">
 		<exec executable="/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker">
-			<arg value="-build"/> 
+			<arg value="-build"/>
 			<arg value="-proj" />
 			<arg value="${basedir}/build/osx/wildfire.pmproj"/>
 			<arg value="-p"/>
@@ -1238,7 +1238,7 @@
 			<arg value="-ds"/>
 		</exec>
 	</target>
-	
+
 	<target name="installer-mac" depends="mac.pkg" description="Creates a Mac OS X package">
 		<exec executable="hdiutil" failonerror="true">
 			<arg line="detach ${mac.dmg.dir} -quiet -force" />
@@ -1246,7 +1246,7 @@
         <exec executable="hdiutil" failonerror="true">
             <arg line="convert ${basedir}/tmp.dmg -format UDZO -o ${mac.dmg.file}"/>
         </exec>
-        <delete file="${basedir}/tmp.dmg"/>    
+        <delete file="${basedir}/tmp.dmg"/>
 	</target>
 
     <!-- Debian package ========================================================================= -->
@@ -1254,6 +1254,9 @@
     <property name="debian.release.dir" value="${target.dir}/debian" />
     <property name="debian.release.install_path" value="${debian.release.dir}/usr/bin" />
     <property name="debian.version" value="${version.major}.${version.minor}.${version.revision}"/>
+    <tstamp>
+        <format property="debian.builddate" pattern="EEE, dd MMM yyyy HH:mm:ss Z" locale="en"/>
+    </tstamp>
 
     <target name="installer-debian" depends="release" description="Creates a Debian package">
         <mkdir dir="${debian.release.install_path}/${dist.prefix}"/>
@@ -1267,7 +1270,7 @@
         <copy todir="${debian.release.dir}/DEBIAN">
             <fileset dir="${debian.dir}" includes="**/*" />
             <filterset>
-                <filter token="builddate" value="${builddate}"/>
+                <filter token="builddate" value="${debian.builddate}"/>
                 <filter token="version" value="${debian.version}"/>
             </filterset>
         </copy>
@@ -1279,6 +1282,14 @@
         <exec executable="ln" failonerror="true">
             <arg line="-s  /etc/${dist.prefix} ${debian.release.install_path}/${dist.prefix}/conf"/>
         </exec>
+        <!-- Move the logs directory to /var/log/wildfire and then make a sym link -->
+        <copy todir="${debian.release.dir}/var/log/${dist.prefix}">
+            <fileset dir="${debian.release.install_path}/${dist.prefix}/logs"/>
+        </copy>
+        <delete dir="${debian.release.install_path}/${dist.prefix}/logs"/>
+        <exec executable="ln" failonerror="true">
+            <arg line="-s  /var/log/${dist.prefix} ${debian.release.install_path}/${dist.prefix}/logs"/>
+        </exec>
         <!-- Create the package -->
         <exec executable="dpkg" failonerror="true">
             <arg line="-b ${debian.release.dir} ${dist.prefix}_${debian.version}-i386.deb"/>

build/debian/changelog

+wildfire (@version@) unstable; urgency=medium
+
+  * For full changelog, see http://www.jivesoftware.org/builds/wildfire/docs/latest/changelog.html
+
+ -- Jive Software <webmaster@jivesoftware.com> @builddate@
\ No newline at end of file

build/debian/control

@@ -13,5 +13,4 @@ Description: A high performance XMPP (Jabber) server.
  administration console, and a full plugin system. The server
  is 100% Java.
  .
- Wildfire is a professional Open Source project, led by Jive
- Software and the Wildfire community.  
+ Wildfire is a professional Open Source project, led by Jive Software.  
\ No newline at end of file