diff options
| -rwxr-xr-x | debian/bitlbee.init | 1 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rwxr-xr-x | debian/rules | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/debian/bitlbee.init b/debian/bitlbee.init index 904ae5ea..f8fac49c 100755 --- a/debian/bitlbee.init +++ b/debian/bitlbee.init @@ -43,7 +43,6 @@ d_start() { chown bitlbee /var/run/bitlbee.pid start-stop-daemon --start --quiet --pidfile $PIDFILE \ - -c bitlbee: \ --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS } diff --git a/debian/changelog b/debian/changelog index 202571d4..a569f4f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ -bitlbee (1.2-5) UNRELEASED; urgency=low +bitlbee (1.2-6) UNRELEASED; urgency=low * Add Homepage and Vcs-Bzr fields. -- Jelmer Vernooij <jelmer@samba.org> Sun, 11 May 2008 14:18:16 +0200 +bitlbee (1.2-5) unstable; urgency=low + + * Add myself to uploaders. + * Bump standards version to 3.8.0. + * Fix FSF address. + * Avoid changing uid from init script. (Closes: #474589) + + -- Jelmer Vernooij <jelmer@samba.org> Mon, 16 Jun 2008 00:53:20 +0200 + bitlbee (1.2-4) unstable; urgency=low * Fixed init script to use the BITLBEE_OPTS variable, not an undefined diff --git a/debian/control b/debian/control index 47eb9a72..e6302c13 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,12 @@ Source: bitlbee Section: net Priority: optional Maintainer: Wilmer van der Gaast <wilmer@gaast.net> -Standards-Version: 3.5.9 +Uploaders: Jelmer Vernooij <jelmer@samba.org> +Standards-Version: 3.8.0 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf Homepage: http://www.bitlbee.org/ Vcs-Bzr: http://code.bitlbee.org/bitlbee/ +DM-Upload-Allowed: yes Package: bitlbee Architecture: any diff --git a/debian/copyright b/debian/copyright index 40a777a9..03db5c7a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -25,8 +25,8 @@ BitlBee License: You should have received a copy of the GNU General Public License with the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; - if not, write to the Free Software Foundation, Inc., 59 Temple Place, - Suite 330, Boston, MA 02111-1307 USA + if not, write to the Free Software Foundation, Inc., 51 Franklin St, + Fifth Floor, Boston, MA 02110-1301, USA. ============================================================================ @@ -39,7 +39,7 @@ The SGML-formatted documentation is written by Jelmer Vernooij Version 1.1, March 2000 Copyright (C) 2000 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/debian/rules b/debian/rules index 67cb79a3..661cf30e 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ build-arch-stamp: clean: [ "`whoami`" = "root" -a -d debian ] rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files debian/bitlbee-dev - -$(MAKE) distclean + $(MAKE) distclean # -$(MAKE) -C doc/ clean |