Changeset f1cea66


Ignore:
Timestamp:
2010-06-07T23:50:42Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
d50e22f
Parents:
6ef9065 (diff), 560d0a0 (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 fixes that I missed in the previous merge.

Location:
debian
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/compat

    r6ef9065 rf1cea66  
    1 7
     16
  • debian/control

    r6ef9065 rf1cea66  
    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), po-debconf, libpurple-dev, debhelper (>= 7)
     7Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6)
    88Homepage: http://www.bitlbee.org/
    99Vcs-Bzr: http://code.bitlbee.org/bitlbee/
  • debian/rules

    r6ef9065 rf1cea66  
    2828        $(MAKE) -C debian/build-libpurple
    2929
     30        $(MAKE) -C doc
     31
    3032        touch build-stamp
    3133
     
    4345        dh_testdir
    4446        dh_testroot
    45         dh_prep
     47        dh_clean -k
    4648        dh_installdirs
    4749
     
    6163        dh_testroot
    6264
    63         dh_installdocs --link-doc=bitlbee-common
    6465        dh_installchangelogs doc/CHANGES
    6566        dh_installexamples
     67        dh_installdocs #--link-doc=bitlbee-common
     68        # TODO: Restore --link-doc up here and remove the hack below once
     69        # Hardy and Lenny are deprecated.
     70        for p in bitlbee bitlbee-libpurple bitlbee-dev; do rm -rf debian/$$p/usr/share/doc/$$p; ln -s bitlbee-common debian/$$p/usr/share/doc/$$p; done
    6671        dh_installdebconf
    6772        dh_installinit
     
    7681        dh_installdeb
    7782ifeq ($(DH_OPTIONS),-a)
    78         cp -a debian/bitlbee/DEBIAN/{post,pre}* debian/bitlbee-libpurple/DEBIAN
     83        cp -a debian/bitlbee/DEBIAN/post* debian/bitlbee/DEBIAN/pre* debian/bitlbee-libpurple/DEBIAN
    7984endif
    8085        dh_shlibdeps
    8186ifdef BITLBEE_VERSION
    82         echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars
    8387        dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0
    8488else
Note: See TracChangeset for help on using the changeset viewer.