Deb package: fix man page name and remove alsa-oss dependency.

resources/install/build.xml

@@ -1226,6 +1226,17 @@
         token="_APP_WEB_"
         value="${application.web}"/>
 
+    <!-- Prepare man page file -->
+    <copy file="${inst.resrc}/debian/sip-communicator.1.tmpl"
+        tofile="${inst.resrc}/debian/${package.name}.1"
+        overwrite="true"/>
+    <replace file="${inst.resrc}/debian/${package.name}.1"
+        token="_PACKAGE_NAME_"
+        value="${package.name}"/>
+    <replace file="${inst.resrc}/debian/${package.name}.1"
+        token="_APP_NAME_"
+        value="${application.name}"/>
+
     <!-- Prepare debian shortcuts -->
     <copy file="${inst.resrc}/debian/sip-communicator.desktop.tmpl"
         tofile="${inst.resrc}/debian/${package.name}.desktop"
@@ -1334,9 +1345,10 @@
             <include name="README.Debian"/>
             <include name="${package.name}.desktop"/>
             <include name="${package.name}.menu"/>
-            <!--include name="${package.name}-16.xpm"/>
+            <include name="${package.name}.1"/>
+            <include name="${package.name}-16.xpm"/>
             <include name="${package.name}-32.xpm"/>
-            <include name="${package.name}.svg"/-->
+            <include name="${package.name}.svg"/>
         </fileset>
     </delete>
 

resources/install/debian/control.tmpl

@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: _PACKAGE_NAME_
 Architecture: i386 amd64
-Depends: sun-java6-jre | openjdk-6-jre, libxalan2-java, alsa-oss
+Depends: sun-java6-jre | openjdk-6-jre, libxalan2-java
 Description: the Java VoIP and Instant Messaging client
  _APP_NAME_ is an application that allows you to do audio/video
  conversations over the Internet through the SIP protocol, as well as chat with

resources/install/debian/rules.tmpl

@@ -100,7 +100,7 @@ binary-arch: build install
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman debian/sip-communicator.1
+	dh_installman debian/_PACKAGE_NAME_.1
 	dh_link
 	dh_compress
 	dh_fixperms

resources/install/debian/sip-communicator.1.tmpl

@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH sip-communicator 1 "October 10, 2008"
+.TH _PACKAGE_NAME_ 1 "October 10, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,20 +16,20 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-sip-communicator \- the Java VoIP and Instant Messaging client
+_PACKAGE_NAME_ \- the Java VoIP and Instant Messaging client
 .SH SYNOPSIS
-.B sip-communicator
+.B _PACKAGE_NAME_
 .RI [ options ] " " [ uri-to-call ]
 .SH DESCRIPTION
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
-\fBSIP Communicator\fP is an audio/video Internet phone and instant messenger
+\fB_APP_NAME_\fP is an audio/video Internet phone and instant messenger
 that supports some of the most popular instant messaging and telephony
 protocols such as SIP, Jabber, AIM/ICQ, MSN, Yahoo! Messenger, Bonjour, IRC,
 RSS and soon others like IAX.
 .PP
-.RI "An optional " uri-to-call " expression can be specified to start a call from the command-line. If SIP Communicator is already running then the call is handled by the running application, except when it is explicitly told to allow multiple instance launch."
+.RI "An optional " uri-to-call " expression can be specified to start a call from the command-line. If _APP_NAME_ is already running then the call is handled by the running application, except when it is explicitly told to allow multiple instance launch."
 .SH OPTIONS
 .TP
 .BI "\-c, \-\-config=" DIR
@@ -57,16 +57,16 @@ Display the current version and exit.
 .TP
 .SH FILES
 .TP
-.I ~/.sip-communicator/contactlist.xml
+.I ~/._PACKAGE_NAME_/contactlist.xml
 .RS
 The IM contact-list.
 .RE
 .TP
-.I ~/.sip-communicator/sip-communicator.xml
+.I ~/._PACKAGE_NAME_/sip-communicator.xml
 .RS
 The main configuration file.
 .SH AUTHOR
-SIP Communicator was written by Emil Ivov <emcho@sip-communicator.org>.
+_APP_NAME_ was written by Emil Ivov <emcho@jitsi.org>.
 .PP
 This manual page was written by Martin Andre <mandre@dev.java.net>, for the
 Debian project (but may be used by others).

resources/install/debian/sip-communicator.sh.tmpl

@@ -23,9 +23,6 @@ COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/
 # set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's)
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
 
-# make LD_PRELOAD use libaoss so that java doesn't hog on the audio device.
-export LD_PRELOAD=/usr/lib/libaoss.so
-
 cd $SCDIR
 
 exec $COMMAND $*