[JM-765] Fixed up debian package build.

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

build/debian/openfire.conffiles

 /etc/openfire/openfire.xml
 /etc/openfire/security/keystore
 /etc/openfire/security/truststore
+/etc/openfire/security/client.truststore

build/debian/openfire.links

-/etc/openfire /usr/share/openfire/conf
-/etc/openfire/security /usr/share/openfire/resources/security
-/var/lib/openfire/embedded-db /usr/share/openfire/embedded-db
-/var/lib/openfire/plugins /usr/share/openfire/plugins
+/etc/openfire /usr/share/openfire/conf
+/etc/openfire/security /usr/share/openfire/resources/security
+/var/lib/openfire/embedded-db /usr/share/openfire/embedded-db
+/var/lib/openfire/plugins /usr/share/openfire/plugins
+/var/log/openfire /usr/share/openfire/logs

build/debian/openfire.postinst

-#! /bin/sh
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-	configure)
-		if ! getent passwd openfire >/dev/null; then
-			adduser --disabled-password  --quiet --system \
-			--home /var/lib/openfire \
-			--gecos "Openfire XMPP server" --group openfire
-		fi
- 
-		mkdir -p /var/log/openfire
-		mkdir -p /var/lib/openfire/embedded-db
-		chown -R openfire:openfire /var/lib/openfire
-		chown -R openfire:openfire /var/log/openfire
-		chown -R openfire:openfire /etc/openfire
-		chmod -R o-rwx /etc/openfire
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst 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
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+	configure)
+		if ! getent passwd openfire >/dev/null; then
+			adduser --disabled-password  --quiet --system \
+			--home /var/lib/openfire \
+			--gecos "Openfire XMPP server" --group openfire
+		fi
+ 
+		mkdir -p /var/log/openfire
+		mkdir -p /var/lib/openfire/embedded-db
+		chown -R openfire:openfire /usr/share/openfire
+		chown -R openfire:openfire /var/lib/openfire
+		chown -R openfire:openfire /var/log/openfire
+		chown -R openfire:openfire /etc/openfire
+		chmod -R o-rwx /etc/openfire
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst 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

build/debian/patches/10-logdir.patch

-diff -Nur openfire-3.3.0/src/conf/openfire.xml openfire-3.3.0.new/src/conf/openfire.xml
---- openfire-3.3.0/src/conf/openfire.xml	2007-04-12 11:00:10.000000000 +0200
-+++ openfire-3.3.0.new/src/conf/openfire.xml	2007-04-12 12:34:04.000000000 +0200
-@@ -50,4 +50,9 @@
-         <interface></interface>
-     </network>
-     -->
--</jive>
-\ Kein Zeilenumbruch am Dateiende.
-+
-+    <!-- Set the log directory to /var/log/openfire for the debian package. -->
-+    <log> 
-+        <directory>/var/log/openfire</directory> 
-+    </log> 
-+</jive>

build/debian/patches/11-unwritable-home.patch

-diff -Nur openfire-3.3.0/src/java/org/jivesoftware/util/JiveGlobals.java openfire-3.3.0.new/src/java/org/jivesoftware/util/JiveGlobals.java
---- openfire-3.3.0/src/java/org/jivesoftware/util/JiveGlobals.java	2007-04-12 12:36:59.000000000 +0200
-+++ openfire-3.3.0.new/src/java/org/jivesoftware/util/JiveGlobals.java	2007-04-12 12:38:40.000000000 +0200
-@@ -243,10 +243,10 @@
-         if (!mh.exists()) {
-             Log.error("Error - the specified home directory does not exist (" + pathname + ")");
-         }
--        else if (!mh.canRead() || !mh.canWrite()) {
-+        else if (!mh.canRead()) {
-                 Log.error("Error - the user running this application can not read " +
--                        "and write to the specified home directory (" + pathname + "). " +
--                        "Please grant the executing user read and write permissions.");
-+                        "to the specified home directory (" + pathname + "). " +
-+                        "Please grant the executing user read permissions.");
-         }
-         else {
-             home = pathname;