From 945eb1ee5b118669387f415d1a45d766c6f79640 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 15 Jun 2008 23:20:20 +0200 Subject: Add myself to uploaders, bump standards version to 3.8.0. --- debian/changelog | 7 +++++++ debian/control | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f4b71762..074b2af8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +bitlbee (1.2-5) unstable; urgency=low + + * Add myself to uploaders. + * Bump standards version to 3.8.0. + + -- Jelmer Vernooij Sun, 15 Jun 2008 23:19:14 +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 8faa27b8..199df0a6 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,10 @@ Source: bitlbee Section: net Priority: optional Maintainer: Wilmer van der Gaast -Standards-Version: 3.5.9 +Uploaders: Jelmer Vernooij +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 +DM-Upload-Allowed: yes Package: bitlbee Architecture: any -- cgit v1.2.3 From 7601353f20781f1fb9bba7e61697bc984ed0fd20 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 15 Jun 2008 23:49:15 +0200 Subject: Fix FSF address. --- debian/changelog | 3 ++- debian/copyright | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 074b2af8..fc55b537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ bitlbee (1.2-5) unstable; urgency=low * Add myself to uploaders. * Bump standards version to 3.8.0. + * Fix FSF address. - -- Jelmer Vernooij Sun, 15 Jun 2008 23:19:14 +0200 + -- Jelmer Vernooij Sun, 15 Jun 2008 23:48:54 +0200 bitlbee (1.2-4) unstable; urgency=low 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. -- cgit v1.2.3 From e565ce246909cbb2aea9a4aa21377a8c0f5246fa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Jun 2008 00:30:08 +0200 Subject: Stop ignoring distclean exit code. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') 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 -- cgit v1.2.3 From f00e3ad082f84bd3e513bffa6ebe6800c4f66282 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Jun 2008 02:26:47 +0200 Subject: Avoid changing UID from init script (already done by BitlBee itself). --- debian/bitlbee.init | 1 - debian/changelog | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') 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 fc55b537..ff2b4071 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ 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 Sun, 15 Jun 2008 23:48:54 +0200 + -- Jelmer Vernooij Mon, 16 Jun 2008 00:53:20 +0200 bitlbee (1.2-4) unstable; urgency=low -- cgit v1.2.3