Changeset d419073


Ignore:
Timestamp:
2008-06-17T21:58:15Z (16 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:
5 edited

Legend:

Unmodified
Added
Removed
  • debian/bitlbee.init

    r7f69740 rd419073  
    4444       
    4545        start-stop-daemon --start --quiet --pidfile $PIDFILE \
    46                 -c bitlbee: \
    4746                --exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
    4847}
  • debian/changelog

    r7f69740 rd419073  
    1 bitlbee (1.2-5) UNRELEASED; urgency=low
     1bitlbee (1.2-6) UNRELEASED; urgency=low
    22
    33  * Add Homepage and Vcs-Bzr fields.
    44
    55 -- Jelmer Vernooij <jelmer@samba.org>  Sun, 11 May 2008 14:18:16 +0200
     6
     7bitlbee (1.2-5) unstable; urgency=low
     8
     9  * Add myself to uploaders.
     10  * Bump standards version to 3.8.0.
     11  * Fix FSF address.
     12  * Avoid changing uid from init script. (Closes: #474589)
     13
     14 -- Jelmer Vernooij <jelmer@samba.org>  Mon, 16 Jun 2008 00:53:20 +0200
    615
    716bitlbee (1.2-4) unstable; urgency=low
  • debian/control

    r7f69740 rd419073  
    33Priority: optional
    44Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
    5 Standards-Version: 3.5.9
     5Uploaders: Jelmer Vernooij <jelmer@samba.org>
     6Standards-Version: 3.8.0
    67Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf
    78Homepage: http://www.bitlbee.org/
    89Vcs-Bzr: http://code.bitlbee.org/bitlbee/
     10DM-Upload-Allowed: yes
    911
    1012Package: bitlbee
  • debian/copyright

    r7f69740 rd419073  
    2626  You should have received a copy of the GNU General Public License with
    2727  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
    28   if not, write to the Free Software Foundation, Inc., 59 Temple Place,
    29   Suite 330, Boston, MA  02111-1307  USA
     28  if not, write to the Free Software Foundation, Inc., 51 Franklin St,
     29  Fifth Floor, Boston, MA 02110-1301, USA.
    3030============================================================================
    3131
     
    4040
    4141 Copyright (C) 2000  Free Software Foundation, Inc.
    42      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     42        51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
    4343 Everyone is permitted to copy and distribute verbatim copies
    4444 of this license document, but changing it is not allowed.
  • debian/rules

    r7f69740 rd419073  
    2222        [ "`whoami`" = "root" -a -d debian ]
    2323        rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files debian/bitlbee-dev
    24         -$(MAKE) distclean
     24        $(MAKE) distclean
    2525#       -$(MAKE) -C doc/ clean
    2626                               
Note: See TracChangeset for help on using the changeset viewer.