Updated Debian package:

* Updated dependancies to put sun-jre as a first alternative where needed
* Updated application categories in sip-communicator.desktop file
* Put SC bundles and libraries in /usr/lib instead of /usr/share
* Added a verbose and help option to launch script and updated man page
  accordingly
* Remove subversion info files from native lib dir

8 files changed, 63 insertions, 34 deletions

diff --git a/resources/install/debian/changelog.tmpl b/resources/install/debian/changelog.tmpl
index 9374a5b..af8a413 100644
--- a/resources/install/debian/changelog.tmpl
+++ b/resources/install/debian/changelog.tmpl
@@ -4,6 +4,18 @@ sip-communicator (_VERSION_) unstable; urgency=low
 
  -- Martin Andre <mandre@dev.java.net>  _DATE_
 
+sip-communicator (1.0-alpha3-1) unstable; urgency=low
+
+  * Switching to alpha3 nightly builds
+  * Updated dependancies to put sun-jre as a first alternative where needed
+  * Updated application categories in sip-communicator.desktop file
+  * Put SC bundles and libraries in /usr/lib instead of /usr/share
+  * Added a verbose and help option to launch script and updated man page
+    accordingly
+  * Remove subversion info files from native lib dir
+
+ -- Martin Andre <mandre@dev.java.net>  Tue, 11 Dec 2007 15:27:06 +0900
+
 sip-communicator (1.0-alpha2-1) unstable; urgency=low
 
   * Switching to alpha2 nightly	builds
diff --git a/resources/install/debian/control b/resources/install/debian/control
index b834969..3a2d3e1 100644
--- a/resources/install/debian/control
+++ b/resources/install/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: sip-communicator
 Architecture: i386
-Depends: java-virtual-machine, java2-runtime, libxalan2-java, alsa-oss
+Depends: sun-java6-jre | sun-java5-jre | java-virtual-machine, sun-java6-jre | sun-java5-jre | java2-runtime, libxalan2-java, alsa-oss
 Description: the Java VoIP and Instant Messaging client
  SIP Communicator is an application that allows you to do audio/video
  conversations over the Internet through the SIP protocol, as well as chat with
diff --git a/resources/install/debian/dirs b/resources/install/debian/dirs
index dca9d1e..57b4824 100644
--- a/resources/install/debian/dirs
+++ b/resources/install/debian/dirs
@@ -4,7 +4,7 @@ usr/share/doc/sip-communicator
 usr/share/man/man1
 usr/share/menu
 usr/share/pixmaps
-usr/share/sip-communicator
-usr/share/sip-communicator/lib
-usr/share/sip-communicator/lib/bundle
-usr/share/sip-communicator/sc-bundles
+usr/lib/sip-communicator
+usr/lib/sip-communicator/lib
+usr/lib/sip-communicator/lib/bundle
+usr/lib/sip-communicator/sc-bundles
diff --git a/resources/install/debian/rules b/resources/install/debian/rules
index cdd2709..ce49641 100755
--- a/resources/install/debian/rules
+++ b/resources/install/debian/rules
@@ -49,28 +49,28 @@ install: build
 	cp debian/sip-communicator.desktop debian/sip-communicator/usr/share/applications/
 
 	# Copy all libs 
-	cp $(BASEDIR)/lib/*.jar debian/sip-communicator/usr/share/sip-communicator/lib/
-	cp $(BASEDIR)/resources/install/logging.properties debian/sip-communicator/usr/share/sip-communicator/lib/
-	cp $(BASEDIR)/lib/felix.client.run.properties debian/sip-communicator/usr/share/sip-communicator/lib/
-	cp -r $(BASEDIR)/lib/bundle debian/sip-communicator/usr/share/sip-communicator/lib/
+	cp $(BASEDIR)/lib/*.jar debian/sip-communicator/usr/lib/sip-communicator/lib/
+	cp $(BASEDIR)/resources/install/logging.properties debian/sip-communicator/usr/lib/sip-communicator/lib/
+	cp $(BASEDIR)/lib/felix.client.run.properties debian/sip-communicator/usr/lib/sip-communicator/lib/
+	cp -r $(BASEDIR)/lib/bundle debian/sip-communicator/usr/lib/sip-communicator/lib/
 
 	# Copy OS specific and native libs
-	cp $(BASEDIR)/lib/os-specific/linux/*.jar debian/sip-communicator/usr/share/sip-communicator/lib/
-	cp -r $(BASEDIR)/lib/native/linux debian/sip-communicator/usr/share/sip-communicator/lib/native
+	cp $(BASEDIR)/lib/os-specific/linux/*.jar debian/sip-communicator/usr/lib/sip-communicator/lib/
+	cp -r $(BASEDIR)/lib/native/linux debian/sip-communicator/usr/lib/sip-communicator/lib/native
 
 	# Copy SIP Communicator bundles
-	cp $(BASEDIR)/sc-bundles/*.jar debian/sip-communicator/usr/share/sip-communicator/sc-bundles
-	cp $(BASEDIR)/sc-bundles/os-specific/linux/*.jar debian/sip-communicator/usr/share/sip-communicator/sc-bundles
+	cp $(BASEDIR)/sc-bundles/*.jar debian/sip-communicator/usr/lib/sip-communicator/sc-bundles
+	cp $(BASEDIR)/sc-bundles/os-specific/linux/*.jar debian/sip-communicator/usr/lib/sip-communicator/sc-bundles
 	install -m 755 debian/sip-communicator.sh debian/sip-communicator/usr/bin/sip-communicator
 
-	# Remove all slicks, CVS info and unnecessary librairies.
-	rm debian/sip-communicator/usr/share/sip-communicator/sc-bundles/*-slick.jar
-	rm -rf debian/sip-communicator/usr/share/sip-communicator/lib/native/CVS
-	rm -rf debian/sip-communicator/usr/share/sip-communicator/lib/bundle/CVS
-	rm debian/sip-communicator/usr/share/sip-communicator/lib/bundle/junit.jar
+	# Remove all slicks, SVN info and unnecessary librairies.
+	rm debian/sip-communicator/usr/lib/sip-communicator/sc-bundles/*-slick.jar
+	rm -rf debian/sip-communicator/usr/lib/sip-communicator/lib/native/.svn
+	rm -rf debian/sip-communicator/usr/lib/sip-communicator/lib/bundle/.svn
+	rm debian/sip-communicator/usr/lib/sip-communicator/lib/bundle/junit.jar
 
 	# Make felix deploy its bundles in ~/.felix/sip-communicator.bin
-	sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" debian/sip-communicator/usr/share/sip-communicator/lib/felix.client.run.properties
+	sed -i -e "s/felix.cache.profiledir=sip-communicator.bin/felix.cache.profile=sip-communicator.bin/" debian/sip-communicator/usr/lib/sip-communicator/lib/felix.client.run.properties
 
 
 # Build i386 files here.
diff --git a/resources/install/debian/sip-communicator.1 b/resources/install/debian/sip-communicator.1
index 7293ce8..f25ce77 100644
--- a/resources/install/debian/sip-communicator.1
+++ b/resources/install/debian/sip-communicator.1
@@ -16,7 +16,7 @@
 .\" .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
+sip-communicator \- the Java VoIP and Instant Messaging client
 .SH SYNOPSIS
 .B sip-communicator
 .RI [ options ]
@@ -33,16 +33,16 @@ conversations over the Internet through the SIP protocol, as well as chat with
 your friends using some of the most popular instant messaging protocols such as
 SIP/SIMPLE, Jabber, AIM/ICQ, MSN, Yahoo, IRC and others.
 .SH OPTIONS
-.\" These programs follow the usual GNU command line syntax, with long
-.\" options starting with two dashes (`-').
-.\" A summary of options is included below.
-.\" For a complete description, see the Info files.
-.\" .TP
-.\" .B \-h, \-\-help
-.\" Show summary of options.
-.\" .TP
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-verbose
+SIP communicator logs are displayed in the console.
+.TP
 .B \-V, \-\-version
 Show version of program.
+.TP
 .SH FILES
 .TP
 .I ~/.sip-communicator/contactlist.xml
diff --git a/resources/install/debian/sip-communicator.desktop b/resources/install/debian/sip-communicator.desktop
index 50c38c2..e787867 100644
--- a/resources/install/debian/sip-communicator.desktop
+++ b/resources/install/debian/sip-communicator.desktop
@@ -5,6 +5,6 @@ GenericName=SIP Communicator
 Comment=VoIP and Instant Messaging client
 Icon=/usr/share/pixmaps/sip-communicator.svg
 Type=Application
-Categories=Application;Network;
+Categories=AudioVideo;Network;InstantMessaging;Chat;IRCClient;Telephony;VideoConference;Java;
 Exec=sip-communicator
 Terminal=false
diff --git a/resources/install/debian/sip-communicator.menu b/resources/install/debian/sip-communicator.menu
index 21718f3..57fde8c 100644
--- a/resources/install/debian/sip-communicator.menu
+++ b/resources/install/debian/sip-communicator.menu
@@ -1,5 +1,5 @@
 ?package(sip-communicator):needs="x11"                   \
-  section="Apps/Net"                                     \
+  section="Applications/Network/Communication"           \
   title="SIP Communicator"                               \
   longtitle="SIP Communicator, VoIP and IM client"       \
   command="/usr/bin/sip-communicator"                    \
diff --git a/resources/install/debian/sip-communicator.sh.tmpl b/resources/install/debian/sip-communicator.sh.tmpl
index 760ebb5..c370510 100644
--- a/resources/install/debian/sip-communicator.sh.tmpl
+++ b/resources/install/debian/sip-communicator.sh.tmpl
@@ -1,6 +1,13 @@
 #!/bin/bash
 
-TEMP=`getopt -o V --long version -n 'SIP Communicator' -- "$@"`
+function print_help() {
+	echo "SIP Communicator option summary"
+	echo -e "\t-h, --help\t show this help message"
+	echo -e "\t-v, --verbose\t verbose output"
+	echo -e "\t-V, --version\t show version"
+}
+
+TEMP=`getopt -o hVv -l help -l version -l verbose -n 'SIP Communicator' -- "$@"`
 
 if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
 
@@ -8,7 +15,9 @@ eval set -- "$TEMP"
 
 while true ; do
         case "$1" in
+				-h|--help) print_help; exit 0;;
                 -V|--version) echo "SIP Communicator version _SC_VERSION_"; exit 0;;
+                -v|--verbose) VERBOSE="yes" ; shift ;;
                 --) shift ; break ;;
                 *) echo "Internal error!" ; exit 1 ;;
         esac
@@ -16,8 +25,12 @@ done
 
 javabin=`which java`
 
-SCDIR=/usr/share/sip-communicator
+SCDIR=/usr/lib/sip-communicator
 LIBPATH=$SCDIR/lib
+CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$SCDIR/sc-bundles/util.jar
+FELIX_CONFIG=$LIBPATH/felix.client.run.properties
+LOG_CONFIG=$LIBPATH/logging.properties
+COMMAND="$javabin -classpath $CLASSPATH -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG org.apache.felix.main.Main"
 
 #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
@@ -32,6 +45,10 @@ cd $SCDIR
 
 if [ -f $javabin ]
 then
-        $javabin -classpath	"$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$SCDIR/sc-bundles/util.jar" -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
-        exit $?
+	if [ $VERBOSE ] ; then
+		exec $COMMAND
+	else
+		exec $COMMAND > /dev/null 2>&1
+	fi
+	exit $?
 fi