Changeset 9299891


Ignore:
Timestamp:
2008-05-21T04:41:55Z (16 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
783e9b7, de8e584
Parents:
23c4e64 (diff), 46d4230 (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 Debian 1.2-4 package changes.

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/changelog

    r23c4e64 r9299891  
    11bitlbee (1.2-4) unstable; urgency=low
    22
    3   * Not a real release, just a placeholder for the changelog.
    43  * Fixed init script to use the BITLBEE_OPTS variable, not an undefined
    5     DAEMON_OPT.
     4    DAEMON_OPT. (Closes: #474583)
    65  * Added dependency information to the init script. (Closes: #472567)
    7 
    8  -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 29 Mar 2008 21:10:33 +0000
     6  * Added bitlbee-dev package. Patch from RISKO Gergely <risko@debian.org>
     7    with some small modifications. (Closes: #473480)
     8
     9 -- Wilmer van der Gaast <wilmer@gaast.net>  Wed, 07 May 2008 22:40:40 -0700
    910
    1011bitlbee (1.2-3) unstable; urgency=low
  • debian/control

    r23c4e64 r9299891  
    1212 This program can be used as an IRC server which forwards everything you
    1313 say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
     14
     15Package: bitlbee-dev
     16Architecture: all
     17Depends: bitlbee (= ${binary:Version})
     18Description: An IRC to other chat networks gateway
     19 This program can be used as an IRC server which forwards everything you
     20 say to people on other chat networks: Jabber, ICQ, AIM, MSN and Yahoo.
     21 .
     22 This package holds development stuff for compiling plug-ins.
  • debian/rules

    r23c4e64 r9299891  
    1313build-arch: build-arch-stamp
    1414build-arch-stamp:
    15         if [ ! -d debian ]; then exit 1; fi
     15        [ -d debian ]
    1616        ./configure --debug=$(DEBUG) --prefix=/usr --etcdir=/etc/bitlbee --events=libevent
    1717        $(MAKE)
     
    2020
    2121clean:
    22         if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
    23         rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files
     22        [ "`whoami`" = "root" -a -d debian ]
     23        rm -rf build-arch-stamp debian/bitlbee debian/*.substvars debian/files debian/bitlbee-dev
    2424        -$(MAKE) distclean
    2525#       -$(MAKE) -C doc/ clean
     
    2727
    2828install-arch: build-arch
    29         if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
     29        [ "`whoami`" = "root" -a -d debian ]
    3030        mkdir -p debian/bitlbee/DEBIAN/
    3131        $(MAKE) install install-etc DESTDIR=`pwd`/debian/bitlbee
     
    3535        cp doc/user-guide/user-guide.html debian/bitlbee/usr/share/doc/bitlbee/
    3636
     37install-indep: install-arch
     38        [ "`whoami`" = "root" -a -d debian ]
     39        mkdir -p debian/bitlbee-dev/DEBIAN/
     40        $(MAKE) install-dev DESTDIR=`pwd`/debian/bitlbee-dev
     41
     42        mkdir -p debian/bitlbee-dev/usr/share/doc/bitlbee-dev/
     43
    3744binary-arch: build-arch install-arch
    38         if [ "`whoami`" != "root" -o ! -d debian ]; then exit 1; fi
     45        [ "`whoami`" = "root" -a -d debian ]
    3946
    4047        chmod 755 debian/post* debian/pre* debian/config debian/bitlbee.init
     
    5259                        doc/bitlbee/examples/* man/man8/bitlbee.8 man/man5/bitlbee.conf.5
    5360       
    54         chown -R root.root debian/bitlbee/
     61        chown -R root:root debian/bitlbee/
    5562        find debian/bitlbee/usr/share/ -type d -exec chmod 755 {} \;
    5663        find debian/bitlbee/usr/share/ -type f -exec chmod 644 {} \;
     
    7784        dpkg --build debian/bitlbee ..
    7885
    79 debug-build:
    80         BITLBEE_VERSION=\"`date +%Y%m%d`-`hostname`-debug\" debian/rules clean binary DEBUG=1
     86binary-indep: install-indep
     87        [ "`whoami`" = "root" -a -d debian ]
    8188
    82 binary: binary-arch
     89        chown -R root.root debian/bitlbee-dev/
     90        find debian/bitlbee-dev/usr/share/ -type d -exec chmod 755 {} \;
     91        find debian/bitlbee-dev/usr/share/ -type f -exec chmod 644 {} \;
     92
     93        cp debian/changelog debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
     94        gzip -9 debian/bitlbee-dev/usr/share/doc/bitlbee-dev/changelog.Debian
     95        cp debian/copyright debian/bitlbee-dev/usr/share/doc/bitlbee-dev/copyright
     96
     97        cd debian/bitlbee-dev; \
     98                find usr -type f -exec md5sum {} \; > DEBIAN/md5sums
     99
     100        dpkg-gencontrol -ldebian/changelog -isp -pbitlbee-dev -Pdebian/bitlbee-dev
     101
     102        dpkg --build debian/bitlbee-dev ..
     103
     104binary: binary-arch binary-indep
    83105build: build-arch
    84 install: install-arch
     106install: install-arch install-indep
    85107
    86 .PHONY: build-arch build clean binary-arch binary install-arch install
     108.PHONY: build-arch build clean binary-arch binary install-arch install binary-indep install-indep
Note: See TracChangeset for help on using the changeset viewer.