Changeset 560d0a0

Timestamp:

2010-06-06T19:01:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f1cea66

Parents:

bc49ec2

Message:

Some more fixes to make this work with older distros (Hardy's stuck with
debhelper 6) and on de code.b.o build bot (a substvars file I wasn't using
anymore caused troubles).

Location:

debian

Files:

• compat (modified) (1 diff)
• control (modified) (1 diff)
• rules (modified) (3 diffs)

debian/compat

@@ -1 @@
-7
+6

debian/control

@@ -5 +5 @@
 Uploaders: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.8.4
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 7)
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | libnss-dev (>= 1.6), po-debconf, libpurple-dev, debhelper (>= 6)
 Homepage: http://www.bitlbee.org/
 Vcs-Bzr: http://code.bitlbee.org/bitlbee/

debian/rules

@@ -45 +45 @@
         dh_testdir
         dh_testroot
-        dh_prep
+        dh_clean -k
         dh_installdirs
 
@@ -63 +63 @@
         dh_testroot
 
-        dh_installdocs --link-doc=bitlbee-common
         dh_installchangelogs doc/CHANGES
         dh_installexamples
+        dh_installdocs #--link-doc=bitlbee-common
+        # TODO: Restore --link-doc up here and remove the hack below once
+        # Hardy and Lenny are deprecated.
+        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
         dh_installdebconf
         dh_installinit
@@ -82 +85 @@
         dh_shlibdeps
 ifdef BITLBEE_VERSION
-        echo source:Version=1:$(BITLBEE_VERSION)-0 > debian/substvars
         dh_gencontrol -- -v1:$(BITLBEE_VERSION)-0  -Vbee:Version=1:$(BITLBEE_VERSION)-0
 else