Debian changes (Stephan Wienczny).

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

build/build.xml

@@ -120,6 +120,7 @@
     <property name="webapp.dest.dir" value="${work.dir}/webapp"/>
 
     <property name="release.dest.dir" value="${target.dir}/release"/>
+    <property name="package.dest.dir" value="${release.dest.dir}"/>
     <property name="overwrite" value="false"/>
     <property name="deploy.jar.dir" value="${jar.dest.dir}"/>
     <property name="anttools.src.dir" value="${src.dir}/tools"/>
@@ -682,6 +683,9 @@
         <property name="release.name.src" value="${dist.prefix}_src"/>
         <!-- ie: wildfire_src_2_1_2 -->
         <property name="release.fullname.src" value="${dist.prefix}_src_${version.filename}"/>
+        <property name="package.dest.filename.zip" value="${package.dest.dir}/${release.fullname.src}.zip" />
+        <property name="package.dest.filename.tar" value="${package.dest.dir}/${release.fullname.src}.tar" />
+        <property name="package.dest.filename.tar.gz" value="${package.dest.filename.tar}.gz" />
         <property name="release.src.out.dir" value="${release.dest.dir}/${release.name.src}"/>
 
         <!-- ie: wildfire -->
@@ -750,8 +754,6 @@
             <fileset dir="${basedir}/build"/>
         </copy>
 
-        <property name="package.dest.dir" value="${release.dest.dir}"/>
-
         <if>
             <not>
                 <isset property="no.package"/>
@@ -759,11 +761,11 @@
             <then>
                 <parallel>
                     <!-- Source Packages -->
-                    <zip zipfile="${package.dest.dir}/${release.fullname.src}.zip"
+                    <zip zipfile="${package.dest.filename.zip}"
                          basedir="${release.src.out.dir}/.."
                          includes="${release.fullname.src}/**/*, ${release.name.src}/**/*"
                             />
-                    <tar tarfile="${package.dest.dir}/${release.fullname.src}.tar.gz"
+                    <tar tarfile="${package.dest.filename.tar.gz}"
                          basedir="${release.src.out.dir}/.."
                          includes="${release.fullname.src}/**/*, ${release.name.src}/**/*"
                          compression="gzip"
@@ -1536,46 +1538,52 @@
     <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}"/>
+    <property name="debian.work.dir" value="${work.dir}/debian"/>
     <tstamp>
         <format property="debian.builddate" pattern="EEE, dd MMM yyyy HH:mm:ss Z" locale="en"/>
     </tstamp>
 
-    <target name="installer-debian" depends="dist.bin" description="Creates a Debian package">
-        <mkdir dir="${debian.release.install_path}/${dist.prefix}"/>
-        <copy todir="${debian.release.install_path}/${dist.prefix}">
-            <fileset dir="${release.dest.dir}/${dist.prefix}">
-                <exclude name="**/*.bat"/>
-            </fileset>
-        </copy>
-
-        <copy todir="${debian.release.dir}/DEBIAN">
-            <fileset dir="${debian.dir}" includes="**/*"/>
+    <target name="installer-debian" depends="dist.src" description="Creates a Debian package">
+	<copy file="${package.dest.filename.tar.gz}" tofile="${debian.work.dir}/${dist.prefix}_${version}.orig.tar.gz"/>
+	
+	<!-- Unpack the sources -->	
+	<gunzip src="${package.dest.filename.tar.gz}"/>
+	<untar src="${package.dest.filename.tar}" dest="${debian.work.dir}"/>
+	
+	<!-- Copy the /debian/dir into workdir -->
+        <copy todir="${debian.work.dir}/${release.name.src}/debian">
+            <fileset dir="${debian.dir}/" includes="**/*"/>
             <filterset>
                 <filter token="builddate" value="${debian.builddate}"/>
                 <filter token="version" value="${debian.version}"/>
             </filterset>
         </copy>
-        <!-- Move the conf directory to /etc/wildfire and then make a sym link  -->
-        <mkdir dir="${debian.release.dir}/etc/${dist.prefix}"/>
-        <copy todir="${debian.release.dir}/etc/${dist.prefix}">
-            <fileset dir="${debian.release.install_path}/${dist.prefix}/conf"/>
-        </copy>
-        <delete dir="${debian.release.install_path}/${dist.prefix}/conf"/>
-        <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 -->
-        <mkdir dir="${debian.release.dir}/var/log/${dist.prefix}"/>
-        <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>
+	
+	<!-- Make the copied 'rules' executable -->
+	<chmod file="${debian.work.dir}/${release.name.src}/debian/rules" perm="755" />
+	
         <!-- Create the package -->
-        <exec executable="dpkg" failonerror="true">
-            <arg line="-b ${debian.release.dir} ${dist.prefix}_${debian.version}-i386.deb"/>
+        <exec executable="dpkg-buildpackage" dir="${debian.work.dir}/${release.name.src}" failonerror="true">
+            <!-- Allow building without root-privs -->
+            <arg line="-rfakeroot"/>
+            <!-- Don't sign source -->
+            <arg line="-us"/>
+            <!-- Don't sign changelog -->
+            <arg line="-uc"/>
         </exec>
-        <move file="${dist.prefix}_${debian.version}-i386.deb" todir="${release.dest.dir}"/>
+
+        <!-- Copy resulting files to target-dir -->
+        <mkdir dir="${release.dest.dir}/debian" />
+	<copy todir="${release.dest.dir}/debian">
+           <fileset dir="${debian.work.dir}">
+               <filename name="wildfire_*" />
+               <filename name="wildfire_src" negate="true" />
+           </fileset>
+        </copy>
+
+	<!-- Cleanup -->
         <delete dir="${debian.release.dir}"/>
+	<delete dir="${debian.work.dir}"/>
     </target>
 
 </project>

build/debian/changelog

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

build/debian/compat

+5

build/debian/control

-Package: wildfire
-Version: @version@
+Source: wildfire
 Section: net
 Priority: optional
 Maintainer: Jive Software <webmaster@jivesoftware.com>
-Depends: sun-java5-jdk
+Build-Depends: debhelper (>= 5), sun-java5-jdk, ant
 Standards-Version: 3.7.2
-Installed-Size: 26726
+
+Package: wildfire
+Section: net
+Priority: optional
+Depends: sun-java5-jdk
 Architecture: all
 Description: A high performance XMPP (Jabber) server.
  Wildfire is an instant messaging server that implements the XMPP
@@ -14,4 +17,4 @@ Description: A high performance XMPP (Jabber) server.
  is 100% Java.
  .
  Wildfire is a professional Open Source project, led by Jive Software.
- 
\ No newline at end of file
+ 

build/debian/copyright

 This package was debianized by Jive Software 
-<webmaster@jivesoftware.com> on July 9, 2006.
- The source was downloaded from http://www.jivesoftware.org.
+<webmaster@jivesoftware.com> on March 12, 2007.
+ The source was downloaded from http://www.igniterealtime.org.
 
 Upstream author: Jive Software <webmaster@jivesoftware.com>
 
-This software is copyright (c) 2006 by Jive Software
+This software is copyright (c) 2007 by Jive Software
 
 You are free to distribute this software under the terms of
 the GNU General Public License. On Debian systems, the complete

build/debian/postinst

+/var/log/wildfire
+
+# move the
+
+/etc/wildfire
\ No newline at end of file

build/debian/rules

+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTINATION=${CURDIR}/debian/wildfire/
+
+build: build-stamp
+build-stamp: 
+	dh_testdir
+	dh_installdirs
+	
+	ant -f build/build.xml
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	
+	rm -f build-stamp configure-stamp install-stamp
+	
+	-ant -f build/build.xml clean
+	
+	dh_clean 
+
+install: install-stamp
+install-stamp:
+	mv $(CURDIR)/target/wildfire $(DESTINATION)/opt/
+	
+	# Move the conf-dir to etc an create a symlink back.
+	mv ${DESTINATION}/opt/wildfire/conf ${DESTINATION}/etc/wildfire
+	ln -s /etc/wildfire ${DESTINATION}/opt/wildfire/conf
+	
+	# Move the resource dir to etc and symlink back.
+	mv ${DESTINATION}/opt/wildfire/resources/security ${DESTINATION}/etc/wildfire/security
+	ln -s /etc/wildfire/security ${DESTINATION}/opt/wildfire/resources/security
+	
+	# Move the logs dir to /var/log an symlink back.
+	mv ${DESTINATION}/opt/wildfire/logs ${DESTINATION}/var/log/wildfire
+	ln -s /var/log/wildfire ${DESTINATION}/opt/wildfire/logs
+	
+	touch $@
+	
+
+# Build architecture-dependent files here.
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs changelog.html
+	dh_installdocs
+	dh_installexamples
+	dh_installdebconf	
+	dh_installinit
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary install configure

build/debian/wildfire.conffiles

+/etc/wildfire/wildfire.xml
+/etc/wildfire/security/keystore
+/etc/wildfire/security/truststore

build/debian/wildfire.default

+# Defaults for wildfire initscript
+# sourced by /etc/init.d/wildfire
+# installed at /etc/default/wildfire by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""

build/debian/wildfire.dirs

+/etc/
+/opt/wildfire
+/var/log/wildfire

build/debian/wildfire.init.d

+#! /bin/sh
+#
+#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+#		Modified for Debian 
+#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+#
+# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/java
+NAME=wildfire
+DESC=wildfire
+DAEMON_DIR=/opt/wildfire
+DAEMON_LIB=${DAEMON_DIR}/lib
+
+test -x $DAEMON || exit 0
+
+# Include wildfire defaults if available
+if [ -f /etc/default/wildfire ] ; then
+	. /etc/default/wildfire
+fi
+
+DAEMON_OPTS="-server -DwildfireHome=${DAEMON_DIR} \
+ -Dwildfire.lib.dir=${DAEMON_LIB} -classpath ${DAEMON_LIB}/startup.jar\
+ -jar ${DAEMON_LIB}/startup.jar $DAEMON_OPTS"
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --background \
+		--pidfile /var/run/$NAME.pid --make-pidfile \
+		--exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  restart|force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart".
+	#
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

build/debian/wildfire.postrm

+#!/bin/sh
+# postrm script for wildfire
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+     purge)
+	rm -Rf /opt/wildfire  
+        ;; 
+ 
+     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

src/bin/extra/wildfired

 #!/bin/sh
 
-# wildfired	Stops and starts the wildfire XMPP service
+# wildfired	stops and starts the wildfire XMPP service
 #
 # chkconfig: 2345 99 1
 # description: Used to start and stop the wildfire XMPP server
@@ -50,7 +50,7 @@ fi
 function execCommand() {
 	OLD_PWD=`pwd`
 	cd $WILDFIRE_HOME/bin
-	CMD="./wildfire $1"
+	CMD="./wildfire.sh $1"
 	su -c "$CMD" $WILDFIRE_USER &
 	sleep 1 # allows prompt to return
 	cd $OLD_PWD