Changeset 4c03881


Ignore:
Timestamp:
2010-06-05T16:39:58Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4772500
Parents:
095a5f0
Message:

Remaining fixes: All looks good now, apt and dpkg seem to do the right
thing with the -common transition, etc.

Location:
debian
Files:
3 edited
5 moved

Legend:

Unmodified
Added
Removed
  • debian/bitlbee-common.config

    • Property mode changed from 100755 to 100644
  • debian/bitlbee.init

    • Property mode changed from 100755 to 100644
  • debian/bitlbee.postinst

    • Property mode changed from 100755 to 100644
  • debian/bitlbee.postrm

    • Property mode changed from 100755 to 100644
  • debian/bitlbee.prerm

    • Property mode changed from 100755 to 100644
  • debian/control

    r095a5f0 r4c03881  
    55Uploaders: Jelmer Vernooij <jelmer@samba.org>
    66Standards-Version: 3.8.4
    7 Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), debconf-2.0, po-debconf, libpurple-dev
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 7)
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
     
    1212Package: bitlbee
    1313Architecture: any
    14 Depends: ${shlibs:Depends}, adduser, net-tools, debianutils (>= 1.16), bitlbee-common (>= ${source:Version}), bitlbee-common (<< ${source:Version}.1~)
     14Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
     15Conflicts: bitlbee-libpurple
     16Replaces: bitlbee-libpurple
    1517Description: An IRC to other chat networks gateway
    1618 This program can be used as an IRC server which forwards everything you
     
    1921Package: bitlbee-libpurple
    2022Architecture: any
    21 Depends: ${shlibs:Depends}, adduser, net-tools, debianutils (>= 1.16), bitlbee-common (>= ${source:Version}), bitlbee-common (<< ${source:Version}.1~)
     23Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
     24Conflicts: bitlbee
     25Replaces: bitlbee
    2226Description: An IRC to other chat networks gateway
    2327 This program can be used as an IRC server which forwards everything you
     
    3438Package: bitlbee-common
    3539Architecture: all
    36 Replaces: bitlbee (<= 1.3)
     40Depends: ${misc:Depends}, net-tools
     41Replaces: bitlbee
    3742Description: An IRC to other chat networks gateway
    3843 This program can be used as an IRC server which forwards everything you
     
    4449Package: bitlbee-dev
    4550Architecture: all
    46 Depends: bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
     51Depends: ${misc:Depends}, bitlbee (>= ${source:Version}), bitlbee (<< ${source:Version}.1~)
    4752Description: An IRC to other chat networks gateway
    4853 This program can be used as an IRC server which forwards everything you
  • debian/rules

    r095a5f0 r4c03881  
    1111DEBUG ?= 0
    1212
    13 ifdef BITLBEE_VERSION
    14 BITLBEE_FORCE_VERSION=1
    15 else
     13ifndef BITLBEE_VERSION
    1614# Want to use the full package version number instead of just the release.
    1715BITLBEE_CONFIGURE_VERSION ?= BITLBEE_VERSION=\"$(shell dpkg-parsechangelog | grep ^Version: | awk '{print $$2}')\"
     
    6866        dh_installdebconf
    6967        dh_installinit
     68ifeq ($(DH_OPTIONS),-a)
     69        cp -a debian/bitlbee/etc debian/bitlbee-libpurple
     70endif
    7071        dh_installman
    7172        dh_strip
     
    7475        dh_fixperms
    7576        dh_installdeb
     77ifeq ($(DH_OPTIONS),-a)
     78        cp -a debian/bitlbee/DEBIAN/{post,pre}* debian/bitlbee-libpurple/DEBIAN
     79endif
    7680        dh_shlibdeps
    77 ifdef BITLBEE_FORCE_VERSION
     81ifdef BITLBEE_VERSION
    7882        dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0
    7983else
Note: See TracChangeset for help on using the changeset viewer.