Newlines.

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

Newlines.
git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7484 b35dd754-fafc-0310-a699-88a17e54d16e
abdc5f1e · Matt Tucker · matt · 758e25f6 · abdc5f1e · abdc5f1e
Commit abdc5f1e authored Mar 13, 2007 by Matt Tucker Committed by matt Mar 13, 2007
9 changed files
--- a/build/debian/changelog
+++ b/build/debian/changelog
-wildfire (@version@) unstable; urgency=medium
-
-  * 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
+wildfire (@version@) unstable; urgency=medium
+
+  * For full changelog, see http://www.igniterealtime.org/builds/wildfire/docs/latest/changelog.html
+
+ -- Jive Software <webmaster@jivesoftware.com>  @builddate@
--- a/build/debian/compat
+++ b/build/debian/compat
-5
+5
--- a/build/debian/postinst
+++ b/build/debian/postinst
-/var/log/wildfire
-
-# move the
-
+/var/log/wildfire
+
+# move the
+
 /etc/wildfire
\ No newline at end of file
--- a/build/debian/rules
+++ b/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
+#!/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
--- a/build/debian/wildfire.conffiles
+++ b/build/debian/wildfire.conffiles
-/etc/wildfire/wildfire.xml
-/etc/wildfire/security/keystore
-/etc/wildfire/security/truststore
+/etc/wildfire/wildfire.xml
+/etc/wildfire/security/keystore
+/etc/wildfire/security/truststore
--- a/build/debian/wildfire.default
+++ b/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=""
+# 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=""
--- a/build/debian/wildfire.dirs
+++ b/build/debian/wildfire.dirs
-/etc/
-/opt/wildfire
-/var/log/wildfire
+/etc/
+/opt/wildfire
+/var/log/wildfire
--- a/build/debian/wildfire.init.d
+++ b/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
+#! /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
--- a/build/debian/wildfire.postrm
+++ b/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
+#!/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