From 36a1cfbdb4292690ec4bd7f80d4cd479f191ebd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Tue, 1 Jun 2010 21:12:08 +0200 Subject: Fixed Debian packaging. diff --git a/BuildTools/GetBuildVersion.py b/BuildTools/GetBuildVersion.py new file mode 100755 index 0000000..9d7b29d --- /dev/null +++ b/BuildTools/GetBuildVersion.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python + +import sys +sys.path.append("SCons") +import Version + +assert(len(sys.argv) == 2) + +print Version.getBuildVersion(sys.argv[1]) diff --git a/Swift/Controllers/.gitignore b/Swift/Controllers/.gitignore new file mode 100644 index 0000000..83750b9 --- /dev/null +++ b/Swift/Controllers/.gitignore @@ -0,0 +1 @@ +BuildVersion.h diff --git a/Swift/Packaging/Debian/.gitignore b/Swift/Packaging/Debian/.gitignore new file mode 100644 index 0000000..33ec6c8 --- /dev/null +++ b/Swift/Packaging/Debian/.gitignore @@ -0,0 +1,2 @@ +swift-* +swift_* diff --git a/Swift/Packaging/Debian/README.Debian b/Swift/Packaging/Debian/README.Debian deleted file mode 100644 index 34c7bc5..0000000 --- a/Swift/Packaging/Debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -swift for Debian ----------------- - - - - -- Remko Tronçon Sat, 26 Sep 2009 11:08:32 +0200 diff --git a/Swift/Packaging/Debian/changelog b/Swift/Packaging/Debian/changelog deleted file mode 100644 index 2b48a24..0000000 --- a/Swift/Packaging/Debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -swift (0.1-1) unstable; urgency=low - - * Initial release (Closes: #nnnn) - - -- Remko Tronçon Sat, 26 Sep 2009 11:08:32 +0200 diff --git a/Swift/Packaging/Debian/compat b/Swift/Packaging/Debian/compat deleted file mode 100644 index 7f8f011..0000000 --- a/Swift/Packaging/Debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/Swift/Packaging/Debian/control b/Swift/Packaging/Debian/control deleted file mode 100644 index aaabfe7..0000000 --- a/Swift/Packaging/Debian/control +++ /dev/null @@ -1,13 +0,0 @@ -Source: swift -Section: x11 -Priority: optional -Maintainer: Remko Tronçon -Build-Depends: debhelper (>= 7) -Standards-Version: 3.8.0 -Homepage: http://swift.im - -Package: swift -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: XMPP Client. - The Swift IM client. diff --git a/Swift/Packaging/Debian/copyright b/Swift/Packaging/Debian/copyright deleted file mode 100644 index 8a965f1..0000000 --- a/Swift/Packaging/Debian/copyright +++ /dev/null @@ -1,24 +0,0 @@ -This package was debianized by Remko Tronçon on -Sat, 26 Sep 2009 11:08:32 +0200. - -It was downloaded from - -Upstream Author(s): - - - - -Copyright: - - - - -License: - - - -The Debian packaging is copyright 2009, Remko Tronçon and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. diff --git a/Swift/Packaging/Debian/cron.d.ex b/Swift/Packaging/Debian/cron.d.ex deleted file mode 100644 index 036c44a..0000000 --- a/Swift/Packaging/Debian/cron.d.ex +++ /dev/null @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the swift package -# -0 4 * * * root [ -x /usr/bin/swift_maintenance ] && /usr/bin/swift_maintenance diff --git a/Swift/Packaging/Debian/debian/.gitignore b/Swift/Packaging/Debian/debian/.gitignore new file mode 100644 index 0000000..f23b395 --- /dev/null +++ b/Swift/Packaging/Debian/debian/.gitignore @@ -0,0 +1 @@ +swift diff --git a/Swift/Packaging/Debian/debian/README.Debian b/Swift/Packaging/Debian/debian/README.Debian new file mode 100644 index 0000000..20fdf61 --- /dev/null +++ b/Swift/Packaging/Debian/debian/README.Debian @@ -0,0 +1,2 @@ +Swift for Debian +---------------- diff --git a/Swift/Packaging/Debian/debian/changelog b/Swift/Packaging/Debian/debian/changelog new file mode 100644 index 0000000..10236c0 --- /dev/null +++ b/Swift/Packaging/Debian/debian/changelog @@ -0,0 +1,5 @@ +swift (1.0beta1-1) unstable; urgency=low + + * Upstream release + + -- Remko Tronçon Sat, 26 Sep 2009 11:08:32 +0200 diff --git a/Swift/Packaging/Debian/debian/compat b/Swift/Packaging/Debian/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/Swift/Packaging/Debian/debian/compat @@ -0,0 +1 @@ +7 diff --git a/Swift/Packaging/Debian/debian/control b/Swift/Packaging/Debian/debian/control new file mode 100644 index 0000000..e7c3ead --- /dev/null +++ b/Swift/Packaging/Debian/debian/control @@ -0,0 +1,13 @@ +Source: swift +Section: x11 +Priority: optional +Maintainer: Remko Tronçon +Build-Depends: debhelper (>= 7), scons (>= 1.3.0), libssl-dev (>= 0.9.8n), libqt4-dev (>= 4.5.3), libexpat1-dev (>= 2.0.1), lintian (>= 2.4.1), libxss-dev (>= 1.2.0) +Standards-Version: 3.8.4 +Homepage: http://swift.im + +Package: swift +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: XMPP Client. + The Swift IM client. diff --git a/Swift/Packaging/Debian/debian/copyright b/Swift/Packaging/Debian/debian/copyright new file mode 100644 index 0000000..2547c75 --- /dev/null +++ b/Swift/Packaging/Debian/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Remko Tronçon + +License: + + Copyright (C) 2010 Kevin Smith and Remko Tronçon + + You are free to distribute this software under the terms of + the GNU General Public License version 3. + The complete text of the GNU General Public License can be + found in /usr/share/common-licenses/GPL-3 file. + + This software is subject to the OpenSSL license exception. diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules new file mode 100755 index 0000000..3ddac8a --- /dev/null +++ b/Swift/Packaging/Debian/debian/rules @@ -0,0 +1,36 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +configure: + +build: configure + +clean: + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + scons qt=/usr/share/qt4 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift/usr $(CURDIR) + +binary-indep: install +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installmenu + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/Swift/Packaging/Debian/debian/swift.menu b/Swift/Packaging/Debian/debian/swift.menu new file mode 100644 index 0000000..34aba2e --- /dev/null +++ b/Swift/Packaging/Debian/debian/swift.menu @@ -0,0 +1,3 @@ +?package(swift):needs="X11" section="Applications/Network/Communication"\ + title="Swift" command="/usr/bin/swift"\ + icon="/usr/share/pixmaps/swift.xpm" diff --git a/Swift/Packaging/Debian/dirs b/Swift/Packaging/Debian/dirs deleted file mode 100644 index ca882bb..0000000 --- a/Swift/Packaging/Debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/Swift/Packaging/Debian/docs b/Swift/Packaging/Debian/docs deleted file mode 100644 index e69de29..0000000 diff --git a/Swift/Packaging/Debian/emacsen-install.ex b/Swift/Packaging/Debian/emacsen-install.ex deleted file mode 100644 index 86ef53e..0000000 --- a/Swift/Packaging/Debian/emacsen-install.ex +++ /dev/null @@ -1,45 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/swift - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . - -FLAVOR=$1 -PACKAGE=swift - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -#FLAVORTEST=`echo $FLAVOR | cut -c-6` -#if [ ${FLAVORTEST} = xemacs ] ; then -# SITEFLAG="-no-site-file" -#else -# SITEFLAG="--no-site-file" -#fi -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cp ${FILES} ${ELCDIR} -cd ${ELCDIR} - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f *.el path.el - -exit 0 diff --git a/Swift/Packaging/Debian/emacsen-remove.ex b/Swift/Packaging/Debian/emacsen-remove.ex deleted file mode 100644 index dab7fb6..0000000 --- a/Swift/Packaging/Debian/emacsen-remove.ex +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/swift - -FLAVOR=$1 -PACKAGE=swift - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/swift.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff --git a/Swift/Packaging/Debian/emacsen-startup.ex b/Swift/Packaging/Debian/emacsen-startup.ex deleted file mode 100644 index e5eaae0..0000000 --- a/Swift/Packaging/Debian/emacsen-startup.ex +++ /dev/null @@ -1,25 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50swift.el -;; for the Debian swift package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The swift package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/swift"))) -;; If package-dir does not exist, the swift package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - (setq load-path (cons package-dir load-path)) - (autoload 'swift-mode "swift-mode" - "Major mode for editing swift files." t) - (add-to-list 'auto-mode-alist '("\\.swift$" . swift-mode)))) - diff --git a/Swift/Packaging/Debian/init.d.ex b/Swift/Packaging/Debian/init.d.ex deleted file mode 100644 index 9decc9b..0000000 --- a/Swift/Packaging/Debian/init.d.ex +++ /dev/null @@ -1,157 +0,0 @@ -#! /bin/sh -# -# skeleton example file to build /etc/init.d/ scripts. -# This file should be used to construct scripts for /etc/init.d. -# -# Written by Miquel van Smoorenburg . -# Modified for Debian -# by Ian Murdock . -# Further changes by Javier Fernandez-Sanguino -# -# 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/sbin/swift -NAME=swift -DESC=swift - -test -x $DAEMON || exit 0 - -LOGDIR=/var/log/swift -PIDFILE=/var/run/$NAME.pid -DODTIME=1 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -# Include swift defaults if available -if [ -f /etc/default/swift ] ; then - . /etc/default/swift -fi - -set -e - -running_pid() -{ - # Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` - # Is this the expected child? - [ "$cmd" != "$name" ] && return 1 - return 0 -} - -running() -{ -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - # Obtain the pid and check it against the binary name - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -force_stop() { -# Forcefully kill the process - [ ! -f "$PIDFILE" ] && return - if running ; then - kill -15 $pid - # Is it really dead? - [ -n "$DODTIME" ] && sleep "$DODTIME"s - if running ; then - kill -9 $pid - [ -n "$DODTIME" ] && sleep "$DODTIME"s - if running ; then - echo "Cannot kill $LABEL (pid=$pid)!" - exit 1 - fi - fi - fi - rm -f $PIDFILE - return 0 -} - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- $DAEMON_OPTS - if running ; then - echo "$NAME." - else - echo " ERROR." - fi - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec $DAEMON - echo "$NAME." - ;; - force-stop) - echo -n "Forcefully stopping $DESC: " - force_stop - if ! running ; then - echo "$NAME." - else - echo " ERROR." - fi - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # /var/run/$NAME.pid --exec $DAEMON - #;; - 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" except that it does nothing if the - # daemon isn't already running. - # check wether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON \ - && $0 restart \ - || exit 0 - ;; - restart) - echo -n "Restarting $DESC: " - start-stop-daemon --stop --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON - [ -n "$DODTIME" ] && sleep $DODTIME - start-stop-daemon --start --quiet --pidfile \ - /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS - echo "$NAME." - ;; - status) - echo -n "$LABEL is " - if running ; then - echo "running" - else - echo " not running." - exit 1 - fi - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/Swift/Packaging/Debian/init.d.lsb.ex b/Swift/Packaging/Debian/init.d.lsb.ex deleted file mode 100644 index 5427643..0000000 --- a/Swift/Packaging/Debian/init.d.lsb.ex +++ /dev/null @@ -1,296 +0,0 @@ -#!/bin/sh -# -# Example init.d script with LSB support. -# -# Please read this init.d carefully and modify the sections to -# adjust it to the program you want to run. -# -# Copyright (c) 2007 Javier Fernandez-Sanguino -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### BEGIN INIT INFO -# Provides: swift -# Required-Start: $network $local_fs -# Required-Stop: -# Should-Start: $named -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -DAEMON=/usr/sbin/swift # Introduce the server's location here -NAME=#PACKAGE # Introduce the short server's name here -DESC=#PACKAGE # Introduce a short description here -LOGDIR=/var/log/swift # Log directory to use - -PIDFILE=/var/run/$NAME.pid - -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -# Default options, these can be overriden by the information -# at /etc/default/$NAME -DAEMON_OPTS="" # Additional options given to the server - -DIETIME=10 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -#STARTTIME=2 # Time to wait for the server to start, in seconds - # If this value is set each time the server is - # started (on start or restart) the script will - # stall to try to determine if it is running - # If it is not set and the server takes time - # to setup a pid file the log message might - # be a false positive (says it did not start - # when it actually did) - -LOGFILE=$LOGDIR/$NAME.log # Server logfile -#DAEMONUSER=swift # Users to run the daemons as. If this value - # is set start-stop-daemon will chuid the server - -# Include defaults if available -if [ -f /etc/default/$NAME ] ; then - . /etc/default/$NAME -fi - -# Use this if you want the user to explicitly set 'RUN' in -# /etc/default/ -#if [ "x$RUN" != "xyes" ] ; then -# log_failure_msg "$NAME disabled, please adjust the configuration to your needs " -# log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it." -# exit 1 -#fi - -# Check that the user exists (if we set a user) -# Does the user exist? -if [ -n "$DAEMONUSER" ] ; then - if getent passwd | grep -q "^$DAEMONUSER:"; then - # Obtain the uid and gid - DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'` - DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'` - else - log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist." - exit 1 - fi -fi - - -set -e - -running_pid() { -# Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` - # Is this the expected server - [ "$cmd" != "$name" ] && return 1 - return 0 -} - -running() { -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -start_server() { -# Start the process using the wrapper - if [ -z "$DAEMONUSER" ] ; then - start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS - errcode=$? - else -# if we are using a daemonuser then change the user id - start-stop-daemon --start --quiet --pidfile $PIDFILE \ - --chuid $DAEMONUSER \ - --exec $DAEMON -- $DAEMON_OPTS - errcode=$? - fi - return $errcode -} - -stop_server() { -# Stop the process using the wrapper - if [ -z "$DAEMONUSER" ] ; then - killproc -p $PIDFILE $DAEMON - errcode=$? - else -# if we are using a daemonuser then look for process that match - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --user $DAEMONUSER \ - --exec $DAEMON - errcode=$? - fi - - return $errcode -} - -reload_server() { - [ ! -f "$PIDFILE" ] && return 1 - pid=pidofproc $PIDFILE # This is the daemon's pid - # Send a SIGHUP - kill -1 $pid - return $? -} - -force_stop() { -# Force the process to die killing it manually - [ ! -e "$PIDFILE" ] && return - if running ; then - kill -15 $pid - # Is it really dead? - sleep "$DIETIME"s - if running ; then - kill -9 $pid - sleep "$DIETIME"s - if running ; then - echo "Cannot kill $NAME (pid=$pid)!" - exit 1 - fi - fi - fi - rm -f $PIDFILE -} - - -case "$1" in - start) - log_daemon_msg "Starting $DESC " "$NAME" - # Check if it's running first - if running ; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if start_server ; then - # NOTE: Some servers might die some time after they start, - # this code will detect this issue if STARTTIME is set - # to a reasonable value - [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time - if running ; then - # It's ok, the server started and is running - log_end_msg 0 - else - # It is not running after we did start - log_end_msg 1 - fi - else - # Either we could not start it - log_end_msg 1 - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - if running ; then - # Only stop the server if we see it running - errcode=0 - stop_server || errcode=$? - log_end_msg $errcode - else - # If it's not running don't do anything - log_progress_msg "apparently not running" - log_end_msg 0 - exit 0 - fi - ;; - force-stop) - # First try to stop gracefully the program - $0 stop - if running; then - # If it's still running try to kill it more forcefully - log_daemon_msg "Stopping (force) $DESC" "$NAME" - errcode=0 - force_stop || errcode=$? - log_end_msg $errcode - fi - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - errcode=0 - stop_server || errcode=$? - # Wait some sensible amount, some server need this - [ -n "$DIETIME" ] && sleep $DIETIME - start_server || errcode=$? - [ -n "$STARTTIME" ] && sleep $STARTTIME - running || errcode=$? - log_end_msg $errcode - ;; - status) - - log_daemon_msg "Checking status of $DESC" "$NAME" - if running ; then - log_progress_msg "running" - log_end_msg 0 - else - log_progress_msg "apparently not running" - log_end_msg 1 - exit 1 - fi - ;; - # Use this if the daemon cannot reload - reload) - log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon" - log_warning_msg "cannot re-read the config file (use restart)." - ;; - # And this if it cann - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # log_daemon_msg "Reloading $DESC configuration files" "$NAME" - # if running ; then - # reload_server - # if ! running ; then - # Process died after we tried to reload - # log_progress_msg "died on reload" - # log_end_msg 1 - # exit 1 - # fi - # else - # log_progress_msg "server is not running" - # log_end_msg 1 - # exit 1 - # fi - #;; - - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/Swift/Packaging/Debian/manpage.1.ex b/Swift/Packaging/Debian/manpage.1.ex deleted file mode 100644 index 77c64b9..0000000 --- a/Swift/Packaging/Debian/manpage.1.ex +++ /dev/null @@ -1,59 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" 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 SWIFT SECTION "September 26, 2009" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -swift \- program to do something -.SH SYNOPSIS -.B swift -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B swift -and -.B bar -commands. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBswift\fP is a program that... -.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 -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. -.SH AUTHOR -swift was written by . -.PP -This manual page was written by Remko Tronçon , -for the Debian project (and may be used by others). diff --git a/Swift/Packaging/Debian/manpage.sgml.ex b/Swift/Packaging/Debian/manpage.sgml.ex deleted file mode 100644 index 3c4ae71..0000000 --- a/Swift/Packaging/Debian/manpage.sgml.ex +++ /dev/null @@ -1,154 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - September 26, 2009"> - - SECTION"> - swift@swift.im"> - - SWIFT"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - 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. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (and may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - diff --git a/Swift/Packaging/Debian/manpage.xml.ex b/Swift/Packaging/Debian/manpage.xml.ex deleted file mode 100644 index 2db693a..0000000 --- a/Swift/Packaging/Debian/manpage.xml.ex +++ /dev/null @@ -1,291 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A typical entry -in a Makefile or Makefile.am is: - -DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" - -manpage.1: manpage.xml - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The XSL files are in -docbook-xsl. A description of the parameters you can use can be found in the -docbook-xsl-doc-* packages. Please remember that if you create the nroff -version in one of the debian/rules file targets (such as build), you will need -to include xsltproc and docbook-xsl in your Build-Depends control field. -Alternatively use the xmlto command/package. That will also automatically -pull in xsltproc and docbook-xsl. - -Notes for using docbook2x: docbook2x-man does not automatically create the -AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as - ... . - -To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections -read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be -found in the docbook-xsl-doc-html package. - -Validation can be done using: `xmllint -''-noout -''-valid manpage.xml` - -General documentation about man-pages and man-page-formatting: -man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ - ---> - - - - - - - - - - - - - -]> - - - - &dhtitle; - &dhpackage; - - - &dhfirstname; - &dhsurname; - Wrote this manpage for the Debian system. -
- &dhemail; -
- - - - 2007 - &dhusername; - - - This manual page was written for the Debian system - (and may be used by others). - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU General Public License, - Version 2 or (at your option) any later version published by - the Free Software Foundation. - On Debian systems, the complete text of the GNU General Public - License can be found in - /usr/share/common-licenses/GPL. - - - - &dhucpackage; - &dhsection; - - - &dhpackage; - program to do something - - - - &dhpackage; - - - - - - - - - this - - - - - - - - this - that - - - - - &dhpackage; - - - - - - - - - - - - - - - - - - - DESCRIPTION - This manual page documents briefly the - &dhpackage; and bar - commands. - This manual page was written for the Debian distribution - because the original program does not have a manual page. - Instead, it has documentation in the GNU - info - 1 - format; see below. - &dhpackage; is a program that... - - - OPTIONS - The program follows 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 - 1 - files. - - - - - - - Does this and that. - - - - - - - Show summary of options. - - - - - - - Show version of program. - - - - - - FILES - - - /etc/foo.conf - - The system-wide configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - ${HOME}/.foo.conf - - The per-user configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - - - ENVIONMENT - - - FOO_CONF - - If used, the defined file is used as configuration - file (see also ). - - - - - - DIAGNOSTICS - The following diagnostics may be issued - on stderr: - - - Bad configuration file. Exiting. - - The configuration file seems to contain a broken configuration - line. Use the option, to get more info. - - - - - &dhpackage; provides some return codes, that can - be used in scripts: - - Code - Diagnostic - - 0 - Program exited successfully. - - - 1 - The configuration file seems to be broken. - - - - - - BUGS - The program is currently limited to only work - with the foobar library. - The upstreams BTS can be found - at . - - - SEE ALSO - - - bar - 1 - , - baz - 1 - , - foo.conf - 5 - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - info - 1 - system. - - - diff --git a/Swift/Packaging/Debian/menu.ex b/Swift/Packaging/Debian/menu.ex deleted file mode 100644 index 8d654b2..0000000 --- a/Swift/Packaging/Debian/menu.ex +++ /dev/null @@ -1,2 +0,0 @@ -?package(swift):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ - title="swift" command="/usr/bin/swift" diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh new file mode 100755 index 0000000..20695b3 --- /dev/null +++ b/Swift/Packaging/Debian/package.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +VERSION=`../../../GetBuildVersion.py swift` +DIRNAME=swift-$VERSION + +rm -rf $DIRNAME +git clone ../../../.git $DIRNAME +ln -s Swift/Packaging/Debian/debian $DIRNAME/debian + +cd $DIRNAME +echo $PWD +dpkg-buildpackage -rfakeroot -i -I diff --git a/Swift/Packaging/Debian/postinst.ex b/Swift/Packaging/Debian/postinst.ex deleted file mode 100644 index 1718654..0000000 --- a/Swift/Packaging/Debian/postinst.ex +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# postinst script for swift -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - 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 diff --git a/Swift/Packaging/Debian/postrm.ex b/Swift/Packaging/Debian/postrm.ex deleted file mode 100644 index 3d15250..0000000 --- a/Swift/Packaging/Debian/postrm.ex +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# postrm script for swift -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|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 diff --git a/Swift/Packaging/Debian/preinst.ex b/Swift/Packaging/Debian/preinst.ex deleted file mode 100644 index 2378ce4..0000000 --- a/Swift/Packaging/Debian/preinst.ex +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# preinst script for swift -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst 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 diff --git a/Swift/Packaging/Debian/prerm.ex b/Swift/Packaging/Debian/prerm.ex deleted file mode 100644 index ec32b31..0000000 --- a/Swift/Packaging/Debian/prerm.ex +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# prerm script for swift -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm 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 diff --git a/Swift/Packaging/Debian/rules b/Swift/Packaging/Debian/rules deleted file mode 100755 index d9b65f0..0000000 --- a/Swift/Packaging/Debian/rules +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/make -f - -#export DH_VERBOSE=1 - -configure: configure-stamp -configure-stamp: - dh_testdir - touch $@ - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - scons qt=/usr/share/qt4 -c - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - scons swift_version=$(SWIFT_VERSION) qt=/usr/share/qt4 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift/usr - -binary-indep: install -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/Swift/Packaging/Debian/swift.debhelper.log b/Swift/Packaging/Debian/swift.debhelper.log deleted file mode 100644 index 11ef6d3..0000000 --- a/Swift/Packaging/Debian/swift.debhelper.log +++ /dev/null @@ -1,2 +0,0 @@ -dh_prep -dh_installdirs diff --git a/Swift/Packaging/Debian/swift.default.ex b/Swift/Packaging/Debian/swift.default.ex deleted file mode 100644 index 34fb83f..0000000 --- a/Swift/Packaging/Debian/swift.default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for swift initscript -# sourced by /etc/init.d/swift -# installed at /etc/default/swift by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/Swift/Packaging/Debian/swift.doc-base.EX b/Swift/Packaging/Debian/swift.doc-base.EX deleted file mode 100644 index b9b9f07..0000000 --- a/Swift/Packaging/Debian/swift.doc-base.EX +++ /dev/null @@ -1,20 +0,0 @@ -Document: swift -Title: Debian swift Manual -Author: -Abstract: This manual describes what swift is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/swift/swift.sgml.gz - -Format: postscript -Files: /usr/share/doc/swift/swift.ps.gz - -Format: text -Files: /usr/share/doc/swift/swift.text.gz - -Format: HTML -Index: /usr/share/doc/swift/html/index.html -Files: /usr/share/doc/swift/html/*.html diff --git a/Swift/Packaging/Debian/watch.ex b/Swift/Packaging/Debian/watch.ex deleted file mode 100644 index fbe2cdd..0000000 --- a/Swift/Packaging/Debian/watch.ex +++ /dev/null @@ -1,23 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php swift-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/swift-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/swift-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for devscripts >= 2.9 -# http://sf.net/swift/swift-(.*)\.tar\.gz - -# Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html swift-(.*)\.tar\.gz diff --git a/Swift/Packaging/swift.desktop b/Swift/Packaging/swift.desktop deleted file mode 100644 index 4cdc28e..0000000 --- a/Swift/Packaging/swift.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] - -# Desktop Entry specification version -Version=1.0 - -Type=Application -Name=Swift -GenericName=Jabber/XMPP Client -Comment=Client for the Jabber/XMPP network -Icon=swift -Exec=swift -Terminal=false -Categories=Network;InstantMessaging;Qt; diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index f266ffe..97017f4 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -138,6 +138,8 @@ if env["PLATFORM"] == "darwin" : if env.get("SWIFT_INSTALLDIR", "") : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram) + env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "../resources/logo/logo-icon-16.xpm") + env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "applications"), "../resources/swift.desktop") if env["PLATFORM"] == "win32" : if env["DIST"] : diff --git a/Swift/resources/logo/logo-icon-16.png b/Swift/resources/logo/logo-icon-16.png new file mode 100644 index 0000000..a4dcfc0 Binary files /dev/null and b/Swift/resources/logo/logo-icon-16.png differ diff --git a/Swift/resources/logo/logo-icon-16.xpm b/Swift/resources/logo/logo-icon-16.xpm new file mode 100644 index 0000000..95ac93b --- /dev/null +++ b/Swift/resources/logo/logo-icon-16.xpm @@ -0,0 +1,51 @@ +/* XPM */ +static char *logo_icon___[] = { +/* columns rows colors chars-per-pixel */ +"16 16 29 1", +" c #000000", +". c #020202", +"X c #040404", +"o c #050505", +"O c #0A0A0A", +"+ c #0E0E0E", +"@ c #161616", +"# c #1B1B1B", +"$ c #1C1C1C", +"% c #232323", +"& c #282828", +"* c #2B2B2B", +"= c #2F2F2F", +"- c #323232", +"; c #343434", +": c #3A3A3A", +"> c #3F3F3F", +", c #474747", +"< c #505050", +"1 c #535353", +"2 c #5E5E5E", +"3 c #636363", +"4 c #6B6B6B", +"5 c #767676", +"6 c #7F7F7F", +"7 c #838383", +"8 c #878787", +"9 c #949494", +"0 c None", +/* pixels */ +"0000 X;000000000", +"0000000<83>00000", +"00000000+698*000", +"000000000:457000", +"000000000-,<2000", +"00000000X@%-,*00", +"0000000 O$## ", +"0000 000", +"0 00", +"0 00000000 0", +"0000000000 00", +"0000000000 00", +"0000000000 000", +"000000000 00000", +"00000000 000000", +"0000000 00000000" +}; diff --git a/Swift/resources/swift.desktop b/Swift/resources/swift.desktop new file mode 100644 index 0000000..4cdc28e --- /dev/null +++ b/Swift/resources/swift.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] + +# Desktop Entry specification version +Version=1.0 + +Type=Application +Name=Swift +GenericName=Jabber/XMPP Client +Comment=Client for the Jabber/XMPP network +Icon=swift +Exec=swift +Terminal=false +Categories=Network;InstantMessaging;Qt; -- cgit v0.10.2-6-g49f6