Changeset d419073

Timestamp:

2008-06-17T21:58:15Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

da7b484

Parents:

7f69740 (diff), f00e3ad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging 1.2-5 Debian package.

Location:

debian

Files:

• bitlbee.init (modified) (1 diff)
• changelog (modified) (1 diff)
• control (modified) (1 diff)
• copyright (modified) (2 diffs)
• rules (modified) (1 diff)

debian/bitlbee.init

@@ -44 +44 @@
         
         start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                -c bitlbee: \
                 --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
 }

debian/changelog

@@ -1 @@
-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

debian/control

@@ -3 +3 @@
 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

debian/copyright

@@ -26 +26 @@
   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.
 ============================================================================
 
@@ -40 +40 @@
 
  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.

debian/rules

@@ -22 +22 @@
         [ "`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